Skip armv7 for iOS11+ AppCheck (#7983)

Author: paulb777

ReleaseTooling/CarthageJSON/FirebaseAppCheckBinary.json

@@ -0,0 +1,2 @@
+{
+}

ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift

@@ -26,7 +26,6 @@ public let shared = Manifest(
     Pod("FirebaseCoreDiagnostics"),
     Pod("FirebaseCore"),
     Pod("FirebaseInstallations"),
-    Pod("FirebaseInstanceID"),
     Pod("GoogleAppMeasurement", isClosedSource: true, platforms: ["ios"]),
     Pod("FirebaseAnalytics", isClosedSource: true, platforms: ["ios"], zip: true),
     Pod("FirebaseAnalyticsSwift", isBeta: true, platforms: ["ios"]),

ReleaseTooling/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -502,15 +502,14 @@ enum CocoaPodUtils {
       podfile += "\n"
     }
 
-    // If we're using local pods, explicitly add FirebaseInstanceID, FirebaseInstallations,
+    // If we're using local pods, explicitly add FirebaseInstallations,
     // and any Google* podspecs if they exist and there are no explicit versions in the Podfile.
     // Note there are versions for local podspecs if we're doing the secondary install for module
     // map building.
     if !versionsSpecified, let localURL = localPodspecPath {
       let podspecs = try! FileManager.default.contentsOfDirectory(atPath: localURL.path)
       for podspec in podspecs {
-        if podspec == "FirebaseInstanceID.podspec" ||
-          podspec == "FirebaseInstallations.podspec" ||
+        if podspec == "FirebaseInstallations.podspec" ||
           podspec == "FirebaseCoreDiagnostics.podspec" ||
           podspec == "FirebaseCore.podspec" ||
           podspec == "FirebaseRemoteConfig.podspec" ||

ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift

@@ -184,7 +184,18 @@ struct FrameworkBuilder {
     let distributionFlag = setCarthage ? "-DFIREBASE_BUILD_CARTHAGE" :
       "-DFIREBASE_BUILD_ZIP_FILE"
     let cFlags = "OTHER_CFLAGS=$(value) \(distributionFlag)"
-    let archs = targetPlatform.archs.map { $0.rawValue }.joined(separator: " ")
+
+    var archs = targetPlatform.archs.map { $0.rawValue }.joined(separator: " ")
+    // The 32 bit archs do not build for iOS 11.
+    // TODO: Make a more robust solution if we need to support more of a mix between iOS 11 and
+    // under.
+    if framework == "FirebaseAppCheck" {
+      if targetPlatform == .iOSDevice {
+        archs = "arm64"
+      } else if targetPlatform == .iOSSimulator {
+        archs = "x86_64 arm64"
+      }
+    }
 
     var args = ["build",
                 "-configuration", "release",
@@ -815,6 +826,12 @@ struct FrameworkBuilder {
         archs.removeAll(where: { $0 == .arm64 })
       }
 
+      // lipo doesn't work if only one architecture.
+      if archs.count == 1 {
+        slices[archs.first!] = binary
+        continue
+      }
+
       // Loop through the architectures and strip out each by using `lipo`.
       for arch in archs {
         // Create the path where the thin slice will reside, ensure it's non-existent.

ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift

@@ -212,7 +212,20 @@ struct ZipBuilder {
         platformPods.map { $0.name.components(separatedBy: "/").first }.contains($0.key)
       }
 
-      for (podName, podInfo) in podsToBuild {
+      // Build in a sorted order to make the build deterministic and to avoid exposing random
+      // build order bugs.
+      // Also AppCheck must be built after other pods so that its restricted architecture
+      // selection does not restrict any of its dependencies.
+      var sortedPods = podsToBuild.keys.sorted()
+      sortedPods.removeAll(where: { value in
+        value == "FirebaseAppCheck"
+      })
+      sortedPods.append("FirebaseAppCheck")
+
+      for podName in sortedPods {
+        guard let podInfo = podsToBuild[podName] else {
+          continue
+        }
         if podName == "Firebase" {
           // Don't build the Firebase pod.
         } else if podInfo.isSourcePod {
@@ -322,7 +335,7 @@ struct ZipBuilder {
                                            frameworksToAssemble: frameworks,
                                            firebasePod: firebasePod)
     var carthageDir: URL?
-    if let carthageFrameworks = carthageFrameworks {
+    if let carthageFrameworks = carthageFrameworks, carthageFrameworks.count > 0 {
       carthageDir = try assembleDistributions(withPackageKind: "CarthageFirebase",
                                               podsToInstall: podsToInstall,
                                               installedPods: installedPods,
@@ -377,7 +390,7 @@ struct ZipBuilder {
     let analyticsDir: URL
     do {
       // This returns the Analytics directory and a list of framework names that Analytics requires.
-      /// Example: ["FirebaseInstanceID", "GoogleAppMeasurement", "nanopb", <...>]
+      /// Example: ["FirebaseInstallations, "GoogleAppMeasurement", "nanopb", <...>]
       let (dir, frameworks) = try installAndCopyFrameworks(forPod: "FirebaseAnalytics",
                                                            withInstalledPods: installedPods,
                                                            rootZipDir: zipDir,

SymbolCollisionTest/Podfile

@@ -22,7 +22,6 @@ target 'SymbolCollisionTest' do
     pod 'FirebaseFirestore', :path => '../'
     pod 'FirebaseFunctions', :path => '../'
     pod 'FirebaseInAppMessaging', :path => '../'
-    pod 'FirebaseInstanceID', :path => '../'
     pod 'FirebaseInstallations', :path => '../'
     pod 'FirebaseMessaging', :path => '../'
     pod 'FirebasePerformance', :path => '../'