Swift Package Manager and M1 Support

.gitignore

@@ -97,6 +97,4 @@ Client/Assets/*.js.LICENSE.txt
 # L10n
 /firefoxios-l10n
 /ios-l10n-scripts
-
-# Glean 
-sdk_generator.sh
+/shavar-prod-lists

Account/FxAPushMessageHandler.swift

@@ -6,8 +6,8 @@ import Shared
 import SwiftyJSON
 import SyncTelemetry
 import Account
-import SwiftKeychainWrapper
 import os.log
+import FxAClient
 
 private let log = Logger.syncLogger
 
@@ -31,7 +31,7 @@ extension FxAPushMessageHandler {
     /// This method then decrypts it according to the content-encoding (aes128gcm or aesgcm)
     /// and then effects changes on the logged in account.
     @discardableResult func handle(userInfo: [AnyHashable: Any]) -> PushMessageResult {
-        let keychain = KeychainWrapper.sharedAppContainerKeychain
+        let keychain = MZKeychainWrapper.sharedClientAppContainerKeychain
         guard let pushReg = keychain.object(forKey: KeychainKey.fxaPushRegistration) as? PushRegistration else {
             return deferMaybe(PushMessageError.accountError)
         }
@@ -57,7 +57,7 @@ extension FxAPushMessageHandler {
 
         guard let string = plaintext else {
             // The app will detect this missing, and re-register. see AppDelegate+PushNotifications.swift.
-            keychain.removeObject(forKey: KeychainKey.apnsToken, withAccessibility: .afterFirstUnlock)
+            keychain.removeObject(forKey: KeychainKey.apnsToken, withAccessibility: MZKeychainItemAccessibility.afterFirstUnlock)
             return deferMaybe(PushMessageError.notDecrypted)
         }
 

Account/SyncAuthState.swift

@@ -6,7 +6,7 @@ import Foundation
 import Shared
 import XCGLogger
 import SwiftyJSON
-import MozillaAppServices
+import FxAClient
 
 
 public let FxAClientErrorDomain = "org.mozilla.fxa.error"

Client.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,14 +1,140 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "AStar",
+        "repositoryURL": "https://github.com/Dev1an/A-Star",
+        "state": {
+          "branch": null,
+          "revision": "036256f9a8d1dda44085a2b92fa58199446a8339",
+          "version": "3.0.0-beta-1"
+        }
+      },
+      {
+        "package": "Fuzi",
+        "repositoryURL": "https://github.com/nbhasin2/Fuzi.git",
+        "state": {
+          "branch": "master",
+          "revision": "04170682baf5c013a41270963c689c87ba0d1374",
+          "version": null
+        }
+      },
+      {
+        "package": "GCDWebServer",
+        "repositoryURL": "https://github.com/nbhasin2/GCDWebServer.git",
+        "state": {
+          "branch": "master",
+          "revision": "14f9eedb296c5b71fec971d8256ef3bfc20a2245",
+          "version": null
+        }
+      },
+      {
+        "package": "Glean",
+        "repositoryURL": "https://github.com/mozilla/glean-swift",
+        "state": {
+          "branch": null,
+          "revision": "e8fef341610de380b55cd5a057f9a3adf7cebb44",
+          "version": "43.0.2"
+        }
+      },
       {
         "package": "Adjust",
-        "repositoryURL": "https://github.com/adjust/ios_sdk",
+        "repositoryURL": "https://github.com/adjust/ios_sdk.git",
         "state": {
           "branch": null,
           "revision": "43c5bb5eb8f77c72da856637dac5c46087c27848",
           "version": "4.29.6"
         }
+      },
+      {
+        "package": "KIF",
+        "repositoryURL": "https://github.com/kif-framework/KIF.git",
+        "state": {
+          "branch": null,
+          "revision": "709adbc64f2d8d40d48136cdd56b0a706010904b",
+          "version": "3.8.6"
+        }
+      },
+      {
+        "package": "MappaMundi",
+        "repositoryURL": "https://github.com/nbhasin2/MappaMundi.git",
+        "state": {
+          "branch": "master",
+          "revision": "7fcd2b7910550227088480490ac19ea66044b3d1",
+          "version": null
+        }
+      },
+      {
+        "package": "MozillaRustComponentsSwift",
+        "repositoryURL": "https://github.com/skhamis/rust-components-swift",
+        "state": {
+          "branch": "update-for-fxios",
+          "revision": "1f1aba21157b0da730a5f3c7029bfca448cbec5e",
+          "version": null
+        }
+      },
+      {
+        "package": "SDWebImage",
+        "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git",
+        "state": {
+          "branch": null,
+          "revision": "7ef9a314b12c1a31edb0d09d41fcba93143fe772",
+          "version": "5.4.0"
+        }
+      },
+      {
+        "package": "Sentry",
+        "repositoryURL": "https://github.com/getsentry/sentry-cocoa.git",
+        "state": {
+          "branch": null,
+          "revision": "bb3c1d852980432907cd314e4fa984fc9a78c9f3",
+          "version": "4.4.3"
+        }
+      },
+      {
+        "package": "SnapKit",
+        "repositoryURL": "https://github.com/SnapKit/SnapKit.git",
+        "state": {
+          "branch": null,
+          "revision": "d458564516e5676af9c70b4f4b2a9178294f1bc6",
+          "version": "5.0.1"
+        }
+      },
+      {
+        "package": "SwiftProtobuf",
+        "repositoryURL": "https://github.com/apple/swift-protobuf.git",
+        "state": {
+          "branch": null,
+          "revision": "7e2c5f3cbbeea68e004915e3a8961e20bd11d824",
+          "version": "1.18.0"
+        }
+      },
+      {
+        "package": "SwiftyJSON",
+        "repositoryURL": "https://github.com/SwiftyJSON/SwiftyJSON",
+        "state": {
+          "branch": null,
+          "revision": "b3dcd7dbd0d488e1a7077cb33b00f2083e382f07",
+          "version": "5.0.1"
+        }
+      },
+      {
+        "package": "Telemetry",
+        "repositoryURL": "https://github.com/mozilla-mobile/telemetry-ios",
+        "state": {
+          "branch": null,
+          "revision": "68f2d813320c9fda2fb4aee4548c64293500200a",
+          "version": "2.0.0"
+        }
+      },
+      {
+        "package": "XCGLogger",
+        "repositoryURL": "https://github.com/DaveWoodCom/XCGLogger.git",
+        "state": {
+          "branch": null,
+          "revision": "a9c4667b247928a29bdd41be2ec2c8d304215a54",
+          "version": "7.0.1"
+        }
       }
     ]
   },

Client.xcodeproj/xcshareddata/xcschemes/Firefox.xcscheme

@@ -26,9 +26,18 @@
       buildConfiguration = "Firefox"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       language = "en"
-      region = "US"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      region = "US">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F84B21BD1A090F8100AAB793"
+            BuildableName = "Client.app"
+            BlueprintName = "Client"
+            ReferencedContainer = "container:Client.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -134,17 +143,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "F84B21BD1A090F8100AAB793"
-            BuildableName = "Client.app"
-            BlueprintName = "Client"
-            ReferencedContainer = "container:Client.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Firefox"
@@ -173,8 +171,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Firefox"

Client.xcodeproj/xcshareddata/xcschemes/FirefoxBeta.xcscheme

@@ -3,7 +3,7 @@
    LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
-      parallelizeBuildables = "NO"
+      parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
@@ -26,9 +26,18 @@
       buildConfiguration = "FirefoxBeta"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
       language = "en"
-      region = "US"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      region = "US">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "F84B21BD1A090F8100AAB793"
+            BuildableName = "Client.app"
+            BlueprintName = "Client"
+            ReferencedContainer = "container:Client.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -134,17 +143,6 @@
             </SkippedTests>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "F84B21BD1A090F8100AAB793"
-            BuildableName = "Client.app"
-            BlueprintName = "Client"
-            ReferencedContainer = "container:Client.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "FirefoxBeta"
@@ -173,8 +171,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "FirefoxBeta"

Client/Application/AppDelegate+PushNotifications.swift

@@ -8,7 +8,7 @@ import Sync
 import XCGLogger
 import UserNotifications
 import Account
-import SwiftKeychainWrapper
+import FxAClient
 
 private let log = Logger.browserLogger
 
@@ -52,7 +52,7 @@ extension AppDelegate {
         NotificationCenter.default.addObserver(forName: .constellationStateUpdate, object: nil, queue: nil) { notification in
             if let newState = notification.userInfo?["newState"] as? ConstellationState {
                 if newState.localDevice?.pushEndpointExpired ?? false {
-                    KeychainWrapper.sharedAppContainerKeychain.removeObject(forKey: KeychainKey.apnsToken, withAccessibility: .afterFirstUnlock)
+                    MZKeychainWrapper.sharedClientAppContainerKeychain.removeObject(forKey: KeychainKey.apnsToken, withAccessibility: MZKeychainItemAccessibility.afterFirstUnlock)
                     NotificationCenter.default.post(name: .RegisterForPushNotifications, object: nil)
                 }
             }
@@ -61,8 +61,8 @@ extension AppDelegate {
         // Use sync event as a periodic check for the apnsToken.
         // The notification service extension can clear this token if there is an error, and the main app can detect this and re-register.
         NotificationCenter.default.addObserver(forName: .ProfileDidStartSyncing, object: nil, queue: .main) { _ in
-            let kc = KeychainWrapper.sharedAppContainerKeychain
-            if kc.object(forKey: KeychainKey.apnsToken, withAccessibility: .afterFirstUnlock) == nil {
+            let kc = MZKeychainWrapper.sharedClientAppContainerKeychain
+            if kc.object(forKey: KeychainKey.apnsToken, withAccessibility: MZKeychainItemAccessibility.afterFirstUnlock) == nil {
                 NotificationCenter.default.post(name: .RegisterForPushNotifications, object: nil)
             }
         }

Client/Application/AppDelegate.swift

@@ -8,7 +8,6 @@ import AVFoundation
 import XCGLogger
 import MessageUI
 import SDWebImage
-import SwiftKeychainWrapper
 import SyncTelemetry
 import LocalAuthentication
 import SyncTelemetry

Client/Application/NavigationRouter.swift

@@ -4,7 +4,7 @@
 
 import Foundation
 import Shared
-import MozillaAppServices
+import Glean
 
 struct FxALaunchParams {
     var query: [String: String]

Client/Configuration/Common.xcconfig

@@ -12,7 +12,6 @@ DEVELOPMENT_TEAM = 43AQ936H96
 ENABLE_BITCODE = NO
 ENABLE_TESTABILITY = YES;
 ENABLE_STRICT_OBJC_MSGSEND = YES;
-FRAMEWORK_SEARCH_PATHS = $(PROJECT_DIR)/Carthage/Build/iOS
 GCC_DYNAMIC_NO_PIC = NO;
 HEADER_SEARCH_PATHS = $(inherited) /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include $(SRCROOT) $(SDKROOT)/usr/include/libxml2
 INCLUDE_SETTINGS_BUNDLE = NO

Client/Experiments/Experiments.swift

@@ -3,7 +3,7 @@
 // file, You can obtain one at http://mozilla.org/MPL/2.0
 
 import Foundation
-import MozillaAppServices
+import Nimbus
 import Shared
 import XCGLogger