Merge branch 'master' into firestore-master

Author: wilhuff

Firebase/Core/FIRLogger.m

@@ -27,6 +27,7 @@
 FIRLoggerService kFIRLoggerAdMob = @"[Firebase/AdMob]";
 FIRLoggerService kFIRLoggerAnalytics = @"[Firebase/Analytics]";
 FIRLoggerService kFIRLoggerAuth = @"[Firebase/Auth]";
+FIRLoggerService kFIRLoggerCrash = @"[Firebase/Crash]";
 FIRLoggerService kFIRLoggerMLKit = @"[Firebase/MLKit]";
 FIRLoggerService kFIRLoggerPerf = @"[Firebase/Performance]";
 FIRLoggerService kFIRLoggerRemoteConfig = @"[Firebase/RemoteConfig]";

Firebase/Core/Private/FIRLogger.h

@@ -29,6 +29,7 @@ extern FIRLoggerService kFIRLoggerABTesting;
 extern FIRLoggerService kFIRLoggerAdMob;
 extern FIRLoggerService kFIRLoggerAnalytics;
 extern FIRLoggerService kFIRLoggerAuth;
+extern FIRLoggerService kFIRLoggerCrash;
 extern FIRLoggerService kFIRLoggerCore;
 extern FIRLoggerService kFIRLoggerMLKit;
 extern FIRLoggerService kFIRLoggerPerf;

FirebaseAuth.podspec

@@ -63,7 +63,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.ios.framework = 'SafariServices'
   s.dependency 'FirebaseAuthInterop', '~> 1.0'
   s.dependency 'FirebaseCore', '~> 6.0'
-  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 5.6'
-  s.dependency 'GoogleUtilities/Environment', '~> 5.6'
+  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 5.8'
+  s.dependency 'GoogleUtilities/Environment', '~> 5.8'
   s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
 end

FirebaseMessaging.podspec

@@ -41,9 +41,9 @@ device, and it is completely free.
   s.dependency 'FirebaseAnalyticsInterop', '~> 1.1'
   s.dependency 'FirebaseCore', '~> 6.0'
   s.dependency 'FirebaseInstanceID', '~> 4.0'
-  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 5.6'
-  s.dependency 'GoogleUtilities/Reachability', '~> 5.6'
-  s.dependency 'GoogleUtilities/Environment', '~> 5.6'
-  s.dependency 'GoogleUtilities/UserDefaults', '~> 5.6'
+  s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 5.8'
+  s.dependency 'GoogleUtilities/Reachability', '~> 5.8'
+  s.dependency 'GoogleUtilities/Environment', '~> 5.8'
+  s.dependency 'GoogleUtilities/UserDefaults', '~> 5.8'
   s.dependency 'Protobuf', '~> 3.1'
 end

GoogleUtilities.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '5.6.0'
+  s.version          = '5.8.0'
   s.summary          = 'Google Utilities for iOS (plus community support for macOS and tvOS)'
 
   s.description      = <<-DESC

GoogleUtilities/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Unreleased
+
+# 5.7.0
+-  Restore to 5.5.0 tag after increased App Store warnings. (#2807)
+
+# 5.6.0
 - `GULAppDelegateSwizzler`: support of remote notification methods. (#2698)
 - `GULAppDelegateSwizzler`: tvOS support. (#2698)
 

Releases/update-versions.py

@@ -163,6 +163,7 @@ def UpdateTags(version_data, firebase_version, first=False):
     LogOrRun("git push --delete origin '{}'".format(firebase_version))
     LogOrRun("git tag --delete  '{}'".format(firebase_version))
   LogOrRun("git tag '{}'".format(firebase_version))
+  LogOrRun("git push origin '{}'".format(firebase_version))
   for pod, version in version_data.items():
     name = pod[len('Firebase'):]
     tag = '{}-{}'.format(name, version)
@@ -204,9 +205,9 @@ def PushPodspecs(version_data):
 
     podspec = '{}.podspec'.format(pod)
     json = os.path.join(tmp_dir, '{}.json'.format(podspec))
-    os.system('pod ipc spec {} > {}'.format(podspec, json))
-    LogOrRun('pod repo push {} {}{}'.format(GetCpdcInternal(), json,
-                                            warnings_ok))
+    LogOrRun('pod ipc spec {} > {}'.format(podspec, json))
+    LogOrRun('pod repo push --skip-tests {} {}{}'.format(GetCpdcInternal(),
+                                                         json, warnings_ok))
   os.system('rm -rf {}'.format(tmp_dir))
 
 

ZipBuilder/FirebaseSDKs.proto

@@ -32,6 +32,13 @@ message SDK {
 
   // Whether or not to strip the i386 architecture from the build.
   bool strip_i386 = 8;
+
+  // List of build targets. For internal use only.
+  repeated string build_target = 9;
+
+  // Whether or not to strip both the i386 and armv7 architectures from the
+  // build. All SDKs that use this flag are built internally so this should be ignored.
+  bool strip_32bits = 10;
 }
 
 // Any extra build flags needed to build the SDK. For internal use only.

ZipBuilder/README.md

@@ -1,7 +1,74 @@
 # Firebase Zip File Builder
 
 This project builds the Firebase iOS Zip file for distribution.
-More instructions to come.
+
+## Overview
+
+This is a small Swift Package Manager project that allows users to package a Firebase iOS Zip file. With no launch
+arguments, it will use the most recent public versions of all SDKs included in the zip file.
+
+It was designed to fail fast with an explanation of what went wrong, so you can fix issues or dig in without having to dig
+too deep into the code.
+
+## Requirements
+
+In order to build the Zip file, you will need:
+
+- Xcode 10.1
+- CocoaPods
+- An internet connection to fetch CocoaPods
+
+## Running the Tool
+
+You can run the tool with `swift run ZipBuilder [ARGS]` or generate an Xcode project with
+`swift package generate-xcodeproj` and run within Xcode.
+
+In the near future, releases will be built via a builder server instead of on the release engineer's machine, making these
+instructions more of a reference to understand what's going on instead of how to build it yourself.
+
+## Launch Arguments
+
+See `main.swift` and the `LaunchArgs` struct for information on specific launch arguments.
+
+You can pass in launch arguments with Xcode by clicking "ZipBuilder" beside the Run/Stop buttons, clicking "Edit
+Scheme" and adding them in the "Arguments Passed On Launch" section.
+
+### Common Arguments
+
+These arguments assume you're running the command from the `ZipBuilder` directory.
+
+**Required** arguments:
+- `-templateDir $(pwd)/Template`
+  - This should always be the same.
+- `-coreDiagnosticsDir <PATH_TO_FirebaseCoreDiagnostics.framework>`
+  - Needed to overwrite the existing Core Diagnostics framework.
+
+Optional comon arguments:
+- `-updatePodRepo false`
+  - This is for speedups when `pod repo update` has already been run recently.
+
+For release engineers (Googlers packaging an upcoming Firebase release) these commands should also be used:
+-  `-customSpecRepos sso://cpdc-internal/firebase`
+  - This pulls the latest podspecs from the CocoaPods staging area.
+- `-releasingSDKs <PATH_TO_current.textproto>` and
+- `-existingVersions <PATH_TO_all_firebase_ios_sdks.textproto>`
+  - Validates the version numbers fetched from CocoaPods staging against the expected released versions from these
+    textprotos.
+
+Putting them all together, here's a common command to build a releaseable Zip file:
+
+```
+swift run ZipBuilder -templateDir $(pwd)/Template -updatePodRepo false \
+-coreDiagnosticsDir /private/tmp/tmpUqBxKN/FirebaseCoreDiagnostics.framework \
+-releasingSDKs <PATH_TO_current.textproto> \
+-existingVersions <PATH_TO_all_firebase_ios_sdks.textproto> \
+-customSpecRepos sso://cpdc-internal/firebase
+```
+
+## Debugging
+
+You can generate an Xcode project for the tool by running `swift package generate-xcodeproj` in this directory.
+See the above instructions for adding Launch Arguments to the Xcode build.
 
 ## Priorities
 

ZipBuilder/Sources/ZipBuilder/FirebaseSDKs.pb.swift

@@ -106,6 +106,19 @@ struct ZipBuilder_SDK {
     set {_uniqueStorage()._stripI386 = newValue}
   }
 
+  /// List of build targets. For internal use only.
+  var buildTarget: [String] {
+    get {return _storage._buildTarget}
+    set {_uniqueStorage()._buildTarget = newValue}
+  }
+
+  /// Whether or not to strip both the i386 and armv7 architectures from the
+  /// build. For internal use only.
+  var strip32Bits: Bool {
+    get {return _storage._strip32Bits}
+    set {_uniqueStorage()._strip32Bits = newValue}
+  }
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
   init() {}
@@ -171,6 +184,8 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
     6: .standard(proto: "nightly_mpm_pattern"),
     7: .standard(proto: "open_source"),
     8: .standard(proto: "strip_i386"),
+    9: .standard(proto: "build_target"),
+    10: .standard(proto: "strip_32bits"),
   ]
 
   fileprivate class _StorageClass {
@@ -182,6 +197,8 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
     var _nightlyMpmPattern: [String] = []
     var _openSource: Bool = false
     var _stripI386: Bool = false
+    var _buildTarget: [String] = []
+    var _strip32Bits: Bool = false
 
     static let defaultInstance = _StorageClass()
 
@@ -196,6 +213,8 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
       _nightlyMpmPattern = source._nightlyMpmPattern
       _openSource = source._openSource
       _stripI386 = source._stripI386
+      _buildTarget = source._buildTarget
+      _strip32Bits = source._strip32Bits
     }
   }
 
@@ -219,6 +238,8 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
         case 6: try decoder.decodeRepeatedStringField(value: &_storage._nightlyMpmPattern)
         case 7: try decoder.decodeSingularBoolField(value: &_storage._openSource)
         case 8: try decoder.decodeSingularBoolField(value: &_storage._stripI386)
+        case 9: try decoder.decodeRepeatedStringField(value: &_storage._buildTarget)
+        case 10: try decoder.decodeSingularBoolField(value: &_storage._strip32Bits)
         default: break
         }
       }
@@ -251,6 +272,12 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
       if _storage._stripI386 != false {
         try visitor.visitSingularBoolField(value: _storage._stripI386, fieldNumber: 8)
       }
+      if !_storage._buildTarget.isEmpty {
+        try visitor.visitRepeatedStringField(value: _storage._buildTarget, fieldNumber: 9)
+      }
+      if _storage._strip32Bits != false {
+        try visitor.visitSingularBoolField(value: _storage._strip32Bits, fieldNumber: 10)
+      }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -268,6 +295,8 @@ extension ZipBuilder_SDK: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement
         if _storage._nightlyMpmPattern != rhs_storage._nightlyMpmPattern {return false}
         if _storage._openSource != rhs_storage._openSource {return false}
         if _storage._stripI386 != rhs_storage._stripI386 {return false}
+        if _storage._buildTarget != rhs_storage._buildTarget {return false}
+        if _storage._strip32Bits != rhs_storage._strip32Bits {return false}
         return true
       }
       if !storagesAreEqual {return false}