From 75e6fa67da5ed4356a5515c05df03a90c8d05984 Mon Sep 17 00:00:00 2001 From: Garvan Keeley Date: Wed, 6 Feb 2019 11:11:58 -0500 Subject: [PATCH 1/2] Prepare iOS projects for megazording (remove file conflicts). Splitting up the iOS megazording, this would be the first step(s) 1) rename files of the same name in the two projects, 2) Create SerialQueue.swift to remove `let queue = DispatchQueue(...)` duplicate def'n. The megazord will not include these files and instead have its own SerialQueue.swift (with `let queue = ...`) and all code will use that instance of `queue`. --- .../ios/FxAClient.xcodeproj/project.pbxproj | 22 +++++++++++-------- .../{Errors.swift => CommonErrors.swift} | 0 ...Free.swift => String+Free_FxAClient.swift} | 0 .../ios/FxAClient/FirefoxAccount.swift | 3 --- .../ios/FxAClient/SerialQueue.swift | 9 ++++++++ .../ios/Logins.xcodeproj/project.pbxproj | 18 ++++++++------- .../Errors/{Errors.swift => LockError.swift} | 8 ------- ...ng+Free.swift => String+Free_Logins.swift} | 0 .../logins/ios/Logins/LoginsStorage.swift | 3 --- .../logins/ios/Logins/SerialQueue.swift | 8 +++++++ 10 files changed, 40 insertions(+), 31 deletions(-) rename components/fxa-client/ios/FxAClient/Errors/{Errors.swift => CommonErrors.swift} (100%) rename components/fxa-client/ios/FxAClient/Extensions/{String+Free.swift => String+Free_FxAClient.swift} (100%) create mode 100644 components/fxa-client/ios/FxAClient/SerialQueue.swift rename components/logins/ios/Logins/Errors/{Errors.swift => LockError.swift} (80%) rename components/logins/ios/Logins/Extensions/{String+Free.swift => String+Free_Logins.swift} (100%) create mode 100644 components/logins/ios/Logins/SerialQueue.swift diff --git a/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj b/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj index 55850e93b0..9f36006b46 100644 --- a/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj +++ b/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj @@ -11,13 +11,14 @@ CE9D202520914D0D00F1C8FA /* FxAClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CE9D202320914D0D00F1C8FA /* FxAClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; CE9D203120914D2600F1C8FA /* FirefoxAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9D202B20914D2600F1C8FA /* FirefoxAccount.swift */; }; CE9D203520914D2600F1C8FA /* fxa.h in Headers */ = {isa = PBXBuildFile; fileRef = CE9D202F20914D2600F1C8FA /* fxa.h */; settings = {ATTRIBUTES = (Public, ); }; }; - CECB395420B5B92500DB3ED4 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECB395220B5B77E00DB3ED4 /* Errors.swift */; }; + CECB395420B5B92500DB3ED4 /* CommonErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECB395220B5B77E00DB3ED4 /* CommonErrors.swift */; }; CECB395D20B5BE0200DB3ED4 /* RustPointer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECB395B20B5BE0200DB3ED4 /* RustPointer.swift */; }; CEE1087620C5ADF9007048AC /* FxAError.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE1087520C5ADF9007048AC /* FxAError.swift */; }; - D5C6DB0020DDBA7C009ACDD2 /* String+Free.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C6DAFF20DDBA7C009ACDD2 /* String+Free.swift */; }; EBA8770C21F5FD5D004F63F0 /* base.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EBA8770921F5FD5D004F63F0 /* base.xcconfig */; }; EBA8770D21F5FD5D004F63F0 /* debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EBA8770A21F5FD5D004F63F0 /* debug.xcconfig */; }; EBA8770E21F5FD5D004F63F0 /* release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EBA8770B21F5FD5D004F63F0 /* release.xcconfig */; }; + EBE26B3C220B399D00D1D99A /* SerialQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B3B220B399D00D1D99A /* SerialQueue.swift */; }; + EBE26B42220B3DF700D1D99A /* String+Free_FxAClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B41220B3DF700D1D99A /* String+Free_FxAClient.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -27,13 +28,14 @@ CE9D202420914D0D00F1C8FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CE9D202B20914D2600F1C8FA /* FirefoxAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirefoxAccount.swift; sourceTree = ""; }; CE9D202F20914D2600F1C8FA /* fxa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fxa.h; sourceTree = ""; }; - CECB395220B5B77E00DB3ED4 /* Errors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = ""; }; + CECB395220B5B77E00DB3ED4 /* CommonErrors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonErrors.swift; sourceTree = ""; }; CECB395B20B5BE0200DB3ED4 /* RustPointer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RustPointer.swift; sourceTree = ""; }; CEE1087520C5ADF9007048AC /* FxAError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FxAError.swift; sourceTree = ""; }; - D5C6DAFF20DDBA7C009ACDD2 /* String+Free.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Free.swift"; sourceTree = ""; }; EBA8770921F5FD5D004F63F0 /* base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = base.xcconfig; sourceTree = ""; }; EBA8770A21F5FD5D004F63F0 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = ""; }; EBA8770B21F5FD5D004F63F0 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = ""; }; + EBE26B3B220B399D00D1D99A /* SerialQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialQueue.swift; sourceTree = ""; }; + EBE26B41220B3DF700D1D99A /* String+Free_FxAClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Free_FxAClient.swift"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -78,6 +80,7 @@ CE9D202420914D0D00F1C8FA /* Info.plist */, CE9D202B20914D2600F1C8FA /* FirefoxAccount.swift */, CE9D202F20914D2600F1C8FA /* fxa.h */, + EBE26B3B220B399D00D1D99A /* SerialQueue.swift */, ); path = FxAClient; sourceTree = ""; @@ -93,7 +96,7 @@ CECB394F20B5B77E00DB3ED4 /* Extensions */ = { isa = PBXGroup; children = ( - D5C6DAFF20DDBA7C009ACDD2 /* String+Free.swift */, + EBE26B41220B3DF700D1D99A /* String+Free_FxAClient.swift */, ); path = Extensions; sourceTree = ""; @@ -101,7 +104,7 @@ CECB395120B5B77E00DB3ED4 /* Errors */ = { isa = PBXGroup; children = ( - CECB395220B5B77E00DB3ED4 /* Errors.swift */, + CECB395220B5B77E00DB3ED4 /* CommonErrors.swift */, CEE1087520C5ADF9007048AC /* FxAError.swift */, ); path = Errors; @@ -207,7 +210,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "sh ./build_ffi.sh"; + shellScript = "sh ./build_ffi.sh\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -217,8 +220,9 @@ buildActionMask = 2147483647; files = ( CECB395D20B5BE0200DB3ED4 /* RustPointer.swift in Sources */, - CECB395420B5B92500DB3ED4 /* Errors.swift in Sources */, - D5C6DB0020DDBA7C009ACDD2 /* String+Free.swift in Sources */, + EBE26B3C220B399D00D1D99A /* SerialQueue.swift in Sources */, + EBE26B42220B3DF700D1D99A /* String+Free_FxAClient.swift in Sources */, + CECB395420B5B92500DB3ED4 /* CommonErrors.swift in Sources */, CE9D203120914D2600F1C8FA /* FirefoxAccount.swift in Sources */, CEE1087620C5ADF9007048AC /* FxAError.swift in Sources */, ); diff --git a/components/fxa-client/ios/FxAClient/Errors/Errors.swift b/components/fxa-client/ios/FxAClient/Errors/CommonErrors.swift similarity index 100% rename from components/fxa-client/ios/FxAClient/Errors/Errors.swift rename to components/fxa-client/ios/FxAClient/Errors/CommonErrors.swift diff --git a/components/fxa-client/ios/FxAClient/Extensions/String+Free.swift b/components/fxa-client/ios/FxAClient/Extensions/String+Free_FxAClient.swift similarity index 100% rename from components/fxa-client/ios/FxAClient/Extensions/String+Free.swift rename to components/fxa-client/ios/FxAClient/Extensions/String+Free_FxAClient.swift diff --git a/components/fxa-client/ios/FxAClient/FirefoxAccount.swift b/components/fxa-client/ios/FxAClient/FirefoxAccount.swift index cd059f1398..ebbc3f2a15 100644 --- a/components/fxa-client/ios/FxAClient/FirefoxAccount.swift +++ b/components/fxa-client/ios/FxAClient/FirefoxAccount.swift @@ -5,9 +5,6 @@ import Foundation import UIKit -// We use a serial queue to protect access to the rust object. -let queue = DispatchQueue(label: "com.fxaclient") - open class FxAConfig { public enum Server: String { case Release = "https://accounts.firefox.com" diff --git a/components/fxa-client/ios/FxAClient/SerialQueue.swift b/components/fxa-client/ios/FxAClient/SerialQueue.swift new file mode 100644 index 0000000000..bc29e94636 --- /dev/null +++ b/components/fxa-client/ios/FxAClient/SerialQueue.swift @@ -0,0 +1,9 @@ + /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +import Foundation + +// We use a serial queue to protect access to the rust object. +let queue = DispatchQueue(label: "com.fxaclient") + diff --git a/components/logins/ios/Logins.xcodeproj/project.pbxproj b/components/logins/ios/Logins.xcodeproj/project.pbxproj index 648a42075d..01e57bea8a 100644 --- a/components/logins/ios/Logins.xcodeproj/project.pbxproj +++ b/components/logins/ios/Logins.xcodeproj/project.pbxproj @@ -11,9 +11,9 @@ CDFA91EE2153568E0074CABF /* RustPasswordAPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CDFA91ED2153568E0074CABF /* RustPasswordAPI.h */; settings = {ATTRIBUTES = (Public, ); }; }; CE9D202520914D0D00F1C8FA /* Logins.h in Headers */ = {isa = PBXBuildFile; fileRef = CE9D202320914D0D00F1C8FA /* Logins.h */; settings = {ATTRIBUTES = (Public, ); }; }; CE9D203120914D2600F1C8FA /* LoginsStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9D202B20914D2600F1C8FA /* LoginsStorage.swift */; }; - CECB395420B5B92500DB3ED4 /* Errors.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECB395220B5B77E00DB3ED4 /* Errors.swift */; }; + CECB395420B5B92500DB3ED4 /* LockError.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECB395220B5B77E00DB3ED4 /* LockError.swift */; }; CEE1087620C5ADF9007048AC /* LoginStoreError.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE1087520C5ADF9007048AC /* LoginStoreError.swift */; }; - D5C6DB0020DDBA7C009ACDD2 /* String+Free.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C6DAFF20DDBA7C009ACDD2 /* String+Free.swift */; }; + D5C6DB0020DDBA7C009ACDD2 /* String+Free_Logins.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5C6DAFF20DDBA7C009ACDD2 /* String+Free_Logins.swift */; }; D819A4A821B861D6004EE6F3 /* liblogins_ffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D819A4A721B861D6004EE6F3 /* liblogins_ffi.a */; }; D819A4AF21B87468004EE6F3 /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D819A4AE21B87467004EE6F3 /* libsqlcipher.a */; }; EB348E432204EA0C00788CD3 /* LoginsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB348E422204EA0C00788CD3 /* LoginsTests.swift */; }; @@ -37,9 +37,9 @@ CE9D202320914D0D00F1C8FA /* Logins.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Logins.h; sourceTree = ""; }; CE9D202420914D0D00F1C8FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CE9D202B20914D2600F1C8FA /* LoginsStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginsStorage.swift; sourceTree = ""; }; - CECB395220B5B77E00DB3ED4 /* Errors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = ""; }; + CECB395220B5B77E00DB3ED4 /* LockError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockError.swift; sourceTree = ""; }; CEE1087520C5ADF9007048AC /* LoginStoreError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginStoreError.swift; sourceTree = ""; }; - D5C6DAFF20DDBA7C009ACDD2 /* String+Free.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Free.swift"; sourceTree = ""; }; + D5C6DAFF20DDBA7C009ACDD2 /* String+Free_Logins.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Free_Logins.swift"; sourceTree = ""; }; D819A4A721B861D6004EE6F3 /* liblogins_ffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblogins_ffi.a; path = ../../../target/universal/release/liblogins_ffi.a; sourceTree = ""; }; D819A4AE21B87467004EE6F3 /* libsqlcipher.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsqlcipher.a; path = ../../../libs/ios/universal/sqlcipher/lib/libsqlcipher.a; sourceTree = ""; }; EB348E402204EA0C00788CD3 /* LoginsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LoginsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -48,6 +48,7 @@ EBA8770621F5FB9A004F63F0 /* base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = base.xcconfig; sourceTree = ""; }; EBA8770721F5FB9A004F63F0 /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = ""; }; EBA8770821F5FB9A004F63F0 /* release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = ""; }; + EBE26B3D220B3A1600D1D99A /* SerialQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialQueue.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -103,6 +104,7 @@ CE9D202420914D0D00F1C8FA /* Info.plist */, CE9D202B20914D2600F1C8FA /* LoginsStorage.swift */, CDB5AAEC21535E7F00B66D7E /* LoginRecord.swift */, + EBE26B3D220B3A1600D1D99A /* SerialQueue.swift */, ); path = Logins; sourceTree = ""; @@ -119,7 +121,7 @@ CECB394F20B5B77E00DB3ED4 /* Extensions */ = { isa = PBXGroup; children = ( - D5C6DAFF20DDBA7C009ACDD2 /* String+Free.swift */, + D5C6DAFF20DDBA7C009ACDD2 /* String+Free_Logins.swift */, ); path = Extensions; sourceTree = ""; @@ -127,7 +129,7 @@ CECB395120B5B77E00DB3ED4 /* Errors */ = { isa = PBXGroup; children = ( - CECB395220B5B77E00DB3ED4 /* Errors.swift */, + CECB395220B5B77E00DB3ED4 /* LockError.swift */, CEE1087520C5ADF9007048AC /* LoginStoreError.swift */, ); path = Errors; @@ -270,8 +272,8 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - CECB395420B5B92500DB3ED4 /* Errors.swift in Sources */, - D5C6DB0020DDBA7C009ACDD2 /* String+Free.swift in Sources */, + CECB395420B5B92500DB3ED4 /* LockError.swift in Sources */, + D5C6DB0020DDBA7C009ACDD2 /* String+Free_Logins.swift in Sources */, CE9D203120914D2600F1C8FA /* LoginsStorage.swift in Sources */, CDB5AAED21535E7F00B66D7E /* LoginRecord.swift in Sources */, CEE1087620C5ADF9007048AC /* LoginStoreError.swift in Sources */, diff --git a/components/logins/ios/Logins/Errors/Errors.swift b/components/logins/ios/Logins/Errors/LockError.swift similarity index 80% rename from components/logins/ios/Logins/Errors/Errors.swift rename to components/logins/ios/Logins/Errors/LockError.swift index 392f562bd4..f280c5cf9c 100644 --- a/components/logins/ios/Logins/Errors/Errors.swift +++ b/components/logins/ios/Logins/Errors/LockError.swift @@ -4,14 +4,6 @@ import Foundation -enum PointerError: Error { - case pointerConsumed -} - -enum ResultError: Error { - case empty -} - enum LockError: Error { /// Indicates that lock/unlock pairs were mismatched case mismatched diff --git a/components/logins/ios/Logins/Extensions/String+Free.swift b/components/logins/ios/Logins/Extensions/String+Free_Logins.swift similarity index 100% rename from components/logins/ios/Logins/Extensions/String+Free.swift rename to components/logins/ios/Logins/Extensions/String+Free_Logins.swift diff --git a/components/logins/ios/Logins/LoginsStorage.swift b/components/logins/ios/Logins/LoginsStorage.swift index 04e8bb6937..19d8ffdb76 100644 --- a/components/logins/ios/Logins/LoginsStorage.swift +++ b/components/logins/ios/Logins/LoginsStorage.swift @@ -20,9 +20,6 @@ open class SyncUnlockInfo { } } -// We use a serial queue to protect access to the rust object. -let queue = DispatchQueue(label: "org.mozilla.sync15.logins") - open class LoginsStorage { private var raw: UInt64 = 0 let dbPath: String diff --git a/components/logins/ios/Logins/SerialQueue.swift b/components/logins/ios/Logins/SerialQueue.swift new file mode 100644 index 0000000000..4254632831 --- /dev/null +++ b/components/logins/ios/Logins/SerialQueue.swift @@ -0,0 +1,8 @@ + /* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +import Foundation + +// We use a serial queue to protect access to the rust object. +let queue = DispatchQueue(label: "org.mozilla.sync15.logins") From dc0122fee2c54f0dbae6f0e79d453e1067461a86 Mon Sep 17 00:00:00 2001 From: Garvan Keeley Date: Wed, 6 Feb 2019 12:18:03 -0500 Subject: [PATCH 2/2] Put common files in `components/support/ios/` --- .../ios/FxAClient.xcodeproj/project.pbxproj | 16 ++++++++-------- .../logins/ios/Logins.xcodeproj/project.pbxproj | 10 ++++++++-- components/logins/ios/Logins/SerialQueue.swift | 8 -------- .../Errors => support/ios}/CommonErrors.swift | 0 .../FxAClient => support/ios}/SerialQueue.swift | 2 +- 5 files changed, 17 insertions(+), 19 deletions(-) delete mode 100644 components/logins/ios/Logins/SerialQueue.swift rename components/{fxa-client/ios/FxAClient/Errors => support/ios}/CommonErrors.swift (100%) rename components/{fxa-client/ios/FxAClient => support/ios}/SerialQueue.swift (82%) diff --git a/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj b/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj index 9f36006b46..477c9bc713 100644 --- a/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj +++ b/components/fxa-client/ios/FxAClient.xcodeproj/project.pbxproj @@ -11,14 +11,14 @@ CE9D202520914D0D00F1C8FA /* FxAClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CE9D202320914D0D00F1C8FA /* FxAClient.h */; settings = {ATTRIBUTES = (Public, ); }; }; CE9D203120914D2600F1C8FA /* FirefoxAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE9D202B20914D2600F1C8FA /* FirefoxAccount.swift */; }; CE9D203520914D2600F1C8FA /* fxa.h in Headers */ = {isa = PBXBuildFile; fileRef = CE9D202F20914D2600F1C8FA /* fxa.h */; settings = {ATTRIBUTES = (Public, ); }; }; - CECB395420B5B92500DB3ED4 /* CommonErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECB395220B5B77E00DB3ED4 /* CommonErrors.swift */; }; CECB395D20B5BE0200DB3ED4 /* RustPointer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECB395B20B5BE0200DB3ED4 /* RustPointer.swift */; }; CEE1087620C5ADF9007048AC /* FxAError.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE1087520C5ADF9007048AC /* FxAError.swift */; }; EBA8770C21F5FD5D004F63F0 /* base.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EBA8770921F5FD5D004F63F0 /* base.xcconfig */; }; EBA8770D21F5FD5D004F63F0 /* debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EBA8770A21F5FD5D004F63F0 /* debug.xcconfig */; }; EBA8770E21F5FD5D004F63F0 /* release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = EBA8770B21F5FD5D004F63F0 /* release.xcconfig */; }; - EBE26B3C220B399D00D1D99A /* SerialQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B3B220B399D00D1D99A /* SerialQueue.swift */; }; EBE26B42220B3DF700D1D99A /* String+Free_FxAClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B41220B3DF700D1D99A /* String+Free_FxAClient.swift */; }; + EBE26B49220B4D0200D1D99A /* CommonErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B48220B4D0200D1D99A /* CommonErrors.swift */; }; + EBE26B4B220B4DE300D1D99A /* SerialQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B4A220B4DE300D1D99A /* SerialQueue.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -28,14 +28,14 @@ CE9D202420914D0D00F1C8FA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; CE9D202B20914D2600F1C8FA /* FirefoxAccount.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirefoxAccount.swift; sourceTree = ""; }; CE9D202F20914D2600F1C8FA /* fxa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fxa.h; sourceTree = ""; }; - CECB395220B5B77E00DB3ED4 /* CommonErrors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommonErrors.swift; sourceTree = ""; }; CECB395B20B5BE0200DB3ED4 /* RustPointer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RustPointer.swift; sourceTree = ""; }; CEE1087520C5ADF9007048AC /* FxAError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FxAError.swift; sourceTree = ""; }; EBA8770921F5FD5D004F63F0 /* base.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = base.xcconfig; sourceTree = ""; }; EBA8770A21F5FD5D004F63F0 /* debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = ""; }; EBA8770B21F5FD5D004F63F0 /* release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = ""; }; - EBE26B3B220B399D00D1D99A /* SerialQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialQueue.swift; sourceTree = ""; }; EBE26B41220B3DF700D1D99A /* String+Free_FxAClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Free_FxAClient.swift"; sourceTree = ""; }; + EBE26B48220B4D0200D1D99A /* CommonErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CommonErrors.swift; path = ../../../../support/ios/CommonErrors.swift; sourceTree = ""; }; + EBE26B4A220B4DE300D1D99A /* SerialQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SerialQueue.swift; path = ../../../support/ios/SerialQueue.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -80,7 +80,7 @@ CE9D202420914D0D00F1C8FA /* Info.plist */, CE9D202B20914D2600F1C8FA /* FirefoxAccount.swift */, CE9D202F20914D2600F1C8FA /* fxa.h */, - EBE26B3B220B399D00D1D99A /* SerialQueue.swift */, + EBE26B4A220B4DE300D1D99A /* SerialQueue.swift */, ); path = FxAClient; sourceTree = ""; @@ -104,7 +104,7 @@ CECB395120B5B77E00DB3ED4 /* Errors */ = { isa = PBXGroup; children = ( - CECB395220B5B77E00DB3ED4 /* CommonErrors.swift */, + EBE26B48220B4D0200D1D99A /* CommonErrors.swift */, CEE1087520C5ADF9007048AC /* FxAError.swift */, ); path = Errors; @@ -220,9 +220,9 @@ buildActionMask = 2147483647; files = ( CECB395D20B5BE0200DB3ED4 /* RustPointer.swift in Sources */, - EBE26B3C220B399D00D1D99A /* SerialQueue.swift in Sources */, + EBE26B4B220B4DE300D1D99A /* SerialQueue.swift in Sources */, EBE26B42220B3DF700D1D99A /* String+Free_FxAClient.swift in Sources */, - CECB395420B5B92500DB3ED4 /* CommonErrors.swift in Sources */, + EBE26B49220B4D0200D1D99A /* CommonErrors.swift in Sources */, CE9D203120914D2600F1C8FA /* FirefoxAccount.swift in Sources */, CEE1087620C5ADF9007048AC /* FxAError.swift in Sources */, ); diff --git a/components/logins/ios/Logins.xcodeproj/project.pbxproj b/components/logins/ios/Logins.xcodeproj/project.pbxproj index 01e57bea8a..608b5e54f8 100644 --- a/components/logins/ios/Logins.xcodeproj/project.pbxproj +++ b/components/logins/ios/Logins.xcodeproj/project.pbxproj @@ -18,6 +18,8 @@ D819A4AF21B87468004EE6F3 /* libsqlcipher.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D819A4AE21B87467004EE6F3 /* libsqlcipher.a */; }; EB348E432204EA0C00788CD3 /* LoginsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EB348E422204EA0C00788CD3 /* LoginsTests.swift */; }; EB348E452204EA0C00788CD3 /* Logins.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE9D202020914D0D00F1C8FA /* Logins.framework */; }; + EBE26B47220B4CE400D1D99A /* CommonErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B46220B4CE400D1D99A /* CommonErrors.swift */; }; + EBE26B4D220B4DF100D1D99A /* SerialQueue.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBE26B4C220B4DF100D1D99A /* SerialQueue.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -48,7 +50,8 @@ EBA8770621F5FB9A004F63F0 /* base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = base.xcconfig; sourceTree = ""; }; EBA8770721F5FB9A004F63F0 /* debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = debug.xcconfig; sourceTree = ""; }; EBA8770821F5FB9A004F63F0 /* release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = release.xcconfig; sourceTree = ""; }; - EBE26B3D220B3A1600D1D99A /* SerialQueue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SerialQueue.swift; sourceTree = ""; }; + EBE26B46220B4CE400D1D99A /* CommonErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = CommonErrors.swift; path = ../../../../support/ios/CommonErrors.swift; sourceTree = ""; }; + EBE26B4C220B4DF100D1D99A /* SerialQueue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SerialQueue.swift; path = ../../../support/ios/SerialQueue.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -104,7 +107,7 @@ CE9D202420914D0D00F1C8FA /* Info.plist */, CE9D202B20914D2600F1C8FA /* LoginsStorage.swift */, CDB5AAEC21535E7F00B66D7E /* LoginRecord.swift */, - EBE26B3D220B3A1600D1D99A /* SerialQueue.swift */, + EBE26B4C220B4DF100D1D99A /* SerialQueue.swift */, ); path = Logins; sourceTree = ""; @@ -129,6 +132,7 @@ CECB395120B5B77E00DB3ED4 /* Errors */ = { isa = PBXGroup; children = ( + EBE26B46220B4CE400D1D99A /* CommonErrors.swift */, CECB395220B5B77E00DB3ED4 /* LockError.swift */, CEE1087520C5ADF9007048AC /* LoginStoreError.swift */, ); @@ -275,8 +279,10 @@ CECB395420B5B92500DB3ED4 /* LockError.swift in Sources */, D5C6DB0020DDBA7C009ACDD2 /* String+Free_Logins.swift in Sources */, CE9D203120914D2600F1C8FA /* LoginsStorage.swift in Sources */, + EBE26B47220B4CE400D1D99A /* CommonErrors.swift in Sources */, CDB5AAED21535E7F00B66D7E /* LoginRecord.swift in Sources */, CEE1087620C5ADF9007048AC /* LoginStoreError.swift in Sources */, + EBE26B4D220B4DF100D1D99A /* SerialQueue.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/components/logins/ios/Logins/SerialQueue.swift b/components/logins/ios/Logins/SerialQueue.swift deleted file mode 100644 index 4254632831..0000000000 --- a/components/logins/ios/Logins/SerialQueue.swift +++ /dev/null @@ -1,8 +0,0 @@ - /* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -import Foundation - -// We use a serial queue to protect access to the rust object. -let queue = DispatchQueue(label: "org.mozilla.sync15.logins") diff --git a/components/fxa-client/ios/FxAClient/Errors/CommonErrors.swift b/components/support/ios/CommonErrors.swift similarity index 100% rename from components/fxa-client/ios/FxAClient/Errors/CommonErrors.swift rename to components/support/ios/CommonErrors.swift diff --git a/components/fxa-client/ios/FxAClient/SerialQueue.swift b/components/support/ios/SerialQueue.swift similarity index 82% rename from components/fxa-client/ios/FxAClient/SerialQueue.swift rename to components/support/ios/SerialQueue.swift index bc29e94636..579354c94a 100644 --- a/components/fxa-client/ios/FxAClient/SerialQueue.swift +++ b/components/support/ios/SerialQueue.swift @@ -5,5 +5,5 @@ import Foundation // We use a serial queue to protect access to the rust object. -let queue = DispatchQueue(label: "com.fxaclient") +let queue = DispatchQueue(label: "com.mozilla.rustappservices")