Made Firebase 7.0 RC0 here

Author: paulb777

ZipBuilder/Sources/FirebaseManifest/FirebaseManifest.swift

@@ -20,35 +20,35 @@ import Foundation
 /// Version should be updated every release.
 /// The version and releasing fields of the non-Firebase pods should be reviewed every release.
 public let shared = Manifest(
-  version: "6.99.0",
+  version: "7.0.0",
   pods: [
-    Pod("GoogleUtilities", isFirebase: false, podVersion: "6.99.9999", releasing: true),
-    Pod("GoogleDataTransport", isFirebase: false, podVersion: "6.999.990", releasing: true),
+    Pod("GoogleUtilities", isFirebase: false, podVersion: "7.0.0", releasing: false),
+    Pod("GoogleDataTransport", isFirebase: false, podVersion: "8.0.0", releasing: true),
 
     Pod("FirebaseCoreDiagnostics"),
     Pod("FirebaseCore"),
     Pod("FirebaseInstallations"),
     Pod("FirebaseInstanceID"),
-    Pod("FirebaseAnalytics", isClosedSource: true),
     Pod("GoogleAppMeasurement", isClosedSource: true),
+    Pod("FirebaseAnalytics", isClosedSource: true),
     Pod("FirebaseABTesting"),
-    Pod("FirebaseAppDistribution"),
+    Pod("FirebaseAppDistribution", isBeta: true),
     Pod("FirebaseAuth"),
     Pod("FirebaseCrashlytics"),
     Pod("FirebaseDatabase"),
     Pod("FirebaseDynamicLinks"),
     Pod("FirebaseFirestore", allowWarnings: true),
-    Pod("FirebaseFirestoreSwift"),
+    Pod("FirebaseFirestoreSwift", isBeta: true),
     Pod("FirebaseFunctions"),
-    Pod("FirebaseInAppMessaging"),
+    Pod("FirebaseInAppMessaging", isBeta: true),
     Pod("FirebaseMessaging"),
-    Pod("FirebasePerformance"),
+    Pod("FirebasePerformance", isClosedSource: true),
     Pod("FirebaseRemoteConfig"),
     Pod("FirebaseStorage"),
-    Pod("FirebaseStorageSwift"),
-    Pod("FirebaseMLCommon", isClosedSource: true),
-    Pod("FirebaseMLModelInterpreter", isClosedSource: true),
-    Pod("FirebaseMLVision", isClosedSource: true),
+    Pod("FirebaseStorageSwift", isBeta: true),
+    Pod("FirebaseMLCommon", isClosedSource: true, isBeta: true),
+    Pod("FirebaseMLModelInterpreter", isClosedSource: true, isBeta: true),
+    Pod("FirebaseMLVision", isClosedSource: true, isBeta: true),
     Pod("Firebase", allowWarnings: true),
   ]
 )
@@ -63,19 +63,22 @@ public struct Manifest {
 public struct Pod {
   public let name: String
   public let isClosedSource: Bool
+  public let isBeta: Bool
   public let isFirebase: Bool
   public let allowWarnings: Bool // Allow validation warnings. Ideally these should all be false
   public let podVersion: String? // Non-Firebase pods have their own version
   public let releasing: Bool // Non-Firebase pods may not release
 
   init(_ name: String,
        isClosedSource: Bool = false,
+       isBeta: Bool = false,
        isFirebase: Bool = true,
        allowWarnings: Bool = false,
        podVersion: String? = nil,
        releasing: Bool = true) {
     self.name = name
     self.isClosedSource = isClosedSource
+    self.isBeta = isBeta
     self.isFirebase = isFirebase
     self.allowWarnings = allowWarnings
     self.podVersion = podVersion
@@ -85,4 +88,13 @@ public struct Pod {
   public func podspecName() -> String {
     return isClosedSource ? "\(name).podspec.json" : "\(name).podspec"
   }
+
+  /// Closed source pods do not validate on Xcode 12 until they support the ARM simulator slice.
+  public func skipImportValidation() -> String {
+    if isClosedSource || name == "Firebase" {
+      return "-skip-import-validation"
+    } else {
+      return ""
+    }
+  }
 }

ZipBuilder/Sources/FirebaseReleaser/InitializeRelease.swift

@@ -20,22 +20,24 @@ import FirebaseManifest
 import Utils
 
 struct InitializeRelease {
-  static func setupRepo(gitRoot: URL) {
+  static func setupRepo(gitRoot: URL) -> String {
     let manifest = FirebaseManifest.shared
-    createReleaseBranch(path: gitRoot, version: manifest.version)
+    let branch = createReleaseBranch(path: gitRoot, version: manifest.version)
     updatePodspecs(path: gitRoot, manifest: manifest)
     updatePodfiles(path: gitRoot, version: manifest.version)
+    return branch
   }
 
   /// The branch is based on the minor version to represent this is the branch for subsequent
   /// patches.
-  private static func createReleaseBranch(path: URL, version: String) {
+  private static func createReleaseBranch(path: URL, version: String) -> String {
     let versionParts = version.split(separator: ".")
     let minorVersion = "\(versionParts[0]).\(versionParts[1])"
     let branch = "release-\(minorVersion)"
     Shell.executeCommand("git checkout master", workingDir: path)
     Shell.executeCommand("git pull", workingDir: path)
     Shell.executeCommand("git checkout -b \(branch)", workingDir: path)
+    return branch
   }
 
   /// Update the podspec versions.
@@ -45,10 +47,10 @@ struct InitializeRelease {
         if pod.name == "Firebase" {
           updateFirebasePodspec(path: path, manifest: manifest)
         } else {
-          let version = pod.podVersion ?? manifest.version
+          let version = pod.podVersion ??
+            (pod.isBeta ? manifest.version + "-beta" : manifest.version)
           Shell.executeCommand("sed -i.bak -e \"s/\\(\\.version.*=[[:space:]]*'\\).*'/\\1" +
-            "\(version)'/\" \(pod.name).podspec",
-            workingDir: path)
+            "\(version)'/\" \(pod.name).podspec", workingDir: path)
         }
       }
     }
@@ -62,12 +64,13 @@ struct InitializeRelease {
     } catch {
       fatalError("Could not read Firebase podspec. \(error)")
     }
-    let version = manifest.version
+    let firebaseVersion = manifest.version
     for firebasePod in manifest.pods {
       if !firebasePod.isFirebase {
         continue
       }
       let pod = firebasePod.name
+      let version = firebasePod.isBeta ? firebaseVersion + "-beta" : firebaseVersion
       if pod == "Firebase" {
         // Replace version in string like s.version = '6.9.0'
         guard let range = contents.range(of: "s.version") else {

ZipBuilder/Sources/FirebaseReleaser/Push.swift

@@ -22,8 +22,6 @@ import Utils
 struct Push {
   static func cpdc(gitRoot: URL) {
     let cpdcLocation = findCpdc(gitRoot: gitRoot)
-    print (cpdcLocation)
-
     let manifest = FirebaseManifest.shared
 
     for pod in manifest.pods {
@@ -33,7 +31,8 @@ struct Push {
       let warningsOK = pod.allowWarnings ? " --allow-warnings" : ""
 
       Shell.executeCommand("pod repo push --skip-tests --use-json \(warningsOK) \(cpdcLocation) " +
-        "\(pod.podspecName()) --sources=sso://cpdc-internal/firebase.git,https://cdn.cocoapods.org")
+                            pod.skipImportValidation() + " \(pod.podspecName()) " + "--sources=sso://cpdc-internal/firebase.git,https://cdn.cocoapods.org",
+                           workingDir: gitRoot)
     }
   }
 

ZipBuilder/Sources/FirebaseReleaser/main.swift

@@ -17,6 +17,7 @@
 import Foundation
 
 import ArgumentParser
+import FirebaseManifest
 import Utils
 
 struct FirebaseReleaser: ParsableCommand {
@@ -30,10 +31,16 @@ struct FirebaseReleaser: ParsableCommand {
           help: "Log without executing the shell commands")
   var logOnly: Bool
 
+  /// Set this option when starting a release.
   @Option(default: false,
           help: "Initialize the release branch")
   var initBranch: Bool
 
+  /// Set this option to update podspecs only.
+  @Option(default: false,
+          help: "Initialize the release branch")
+  var pushOnly: Bool
+
   mutating func validate() throws {
     guard FileManager.default.fileExists(atPath: gitRoot.path) else {
       throw ValidationError("git-root does not exist: \(gitRoot.path)")
@@ -45,9 +52,17 @@ struct FirebaseReleaser: ParsableCommand {
       Shell.setLogOnly()
     }
     if initBranch {
-      InitializeRelease.setupRepo(gitRoot: gitRoot)
+      let branch = InitializeRelease.setupRepo(gitRoot: gitRoot)
+      let version = FirebaseManifest.shared.version
+      Shell.executeCommand("git commit -am \"Update versions for Release \(version)\"",
+                           workingDir: gitRoot)
+      Shell.executeCommand("git push origin \(branch)", workingDir: gitRoot)
+      Shell.executeCommand("git branch --set-upstream-to=origin/\(branch) \(branch)",
+                           workingDir: gitRoot)
       Tags.create(gitRoot: gitRoot)
       Push.cpdc(gitRoot: gitRoot)
+    } else if pushOnly {
+      Push.cpdc(gitRoot: gitRoot)
     }
   }