Stop requiring pods to be static frameworks (#6557)

Author: paulb777

AddNewPod.md

@@ -13,8 +13,6 @@ detailed instructions. Some Firebase specific guidance below:
 * `s.deployment_target` - Ideally should include ios, osx, and tvos. See
 [FirebaseCore.podspec](FirebaseCore.podspec) for the current Firebase minimum version settings.
 
-* `s.static_framework` - By default, Firebase pods should be static frameworks.
-
 * `s.dependency` - Dependencies on other Firebase pods and pods in this repo should specify a
 version and allow minor version updates - like `s.dependency 'FirebaseCore', '~> 6.6'`. When
 initially defined, choose the most recently released minor version of the dependency.

FirebaseABTesting.podspec

@@ -25,7 +25,6 @@ Firebase Cloud Messaging and Firebase Remote Config in your app.
   s.tvos.deployment_target = '10.0'
 
   s.cocoapods_version = '>= 1.4.0'
-  s.static_framework = true
   s.prefix_header_file = false
 
   base_dir = "FirebaseABTesting/Sources/"

FirebaseAppDistribution.podspec

@@ -18,7 +18,6 @@ iOS SDK for App Distribution for Firebase.
   s.ios.deployment_target = '10.0'
 
   s.cocoapods_version = '>= 1.4.0'
-  s.static_framework = true
   s.prefix_header_file = false
 
   base_dir = "FirebaseAppDistribution/Sources/"

FirebaseAuth.podspec

@@ -23,7 +23,6 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.watchos.deployment_target = '6.0'
 
   s.cocoapods_version = '>= 1.4.0'
-  s.static_framework = true
   s.prefix_header_file = false
 
   source = 'FirebaseAuth/Sources/'

FirebaseCore.podspec

@@ -22,7 +22,6 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
   s.watchos.deployment_target = '6.0'
 
   s.cocoapods_version = '>= 1.4.0'
-  s.static_framework = true
   s.prefix_header_file = false
 
   s.source_files = [
@@ -54,20 +53,27 @@ Firebase Core includes FIRApp and FIROptions which provide central configuration
   }
   s.test_spec 'unit' do |unit_tests|
     unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
-    unit_tests.source_files = 'FirebaseCore/Tests/Unit/**/*.[mh]'
+    unit_tests.source_files = [
+      'FirebaseCore/Tests/Unit/**/*.[mh]',
+      'SharedTestUtilities/FIROptionsMock.[mh]',
+    ]
     unit_tests.requires_app_host = true
     unit_tests.dependency 'OCMock'
     unit_tests.resources = 'FirebaseCore/Tests/Unit/Resources/GoogleService-Info.plist'
   end
 
   s.test_spec 'swift-unit' do |swift_unit_tests|
     swift_unit_tests.platforms = {:ios => '8.0', :osx => '10.11', :tvos => '10.0'}
-    swift_unit_tests.source_files = 'FirebaseCore/Tests/SwiftUnit/**/*.swift',
-                                    'FirebaseCore/Tests/SwiftUnit/**/*.h',
-                                    'FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/*'
-    swift_unit_tests.resources = 'FirebaseCore/Tests/Unit/Resources/GoogleService-Info.plist'
+    swift_unit_tests.source_files = [
+      'FirebaseCore/Tests/SwiftUnit/**/*.swift',
+      'FirebaseCore/Tests/SwiftUnit/**/*.h',
+      'FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/*',
+      'SharedTestUtilities/FIROptionsMock.[mh]',
+    ]
     swift_unit_tests.pod_target_xcconfig = {
       'SWIFT_OBJC_BRIDGING_HEADER' => '$(PODS_TARGET_SRCROOT)/FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h'
     }
+    swift_unit_tests.dependency 'OCMock'
+    swift_unit_tests.resources = 'FirebaseCore/Tests/Unit/Resources/GoogleService-Info.plist'
   end
 end

FirebaseCore/CHANGELOG.md

@@ -2,6 +2,9 @@
 - [changed] Update minimum iOS version to iOS 10 except for Analytics which is now iOS 9. (#4847)
 - [changed] Update minimum macOS version to 10.12.
 - [added] Swift Package Manager support for Firebase Messaging. (#5641)
+- [changed] The pods developed in this repo are no longer hard coded to be built as static
+  frameworks. Instead, their linkage will be controlled by the Podfile. Use the Podfile
+  option `use_frameworks! :linkage => :static` to get the Firebase 6.x linkage behavior. (#2022)
 
 # Firebase 6.33.0
 - [fixed] Swift Package Manager - Define system framework and system library dependencies. This

FirebaseCore/Tests/SwiftUnit/FirebaseAppTests.swift

@@ -23,6 +23,7 @@ private extension Constants {
 class FirebaseAppTests: XCTestCase {
   override func setUp() {
     super.setUp()
+    FIROptionsMock.mockFIROptions()
   }
 
   override func tearDown() {

FirebaseCore/Tests/SwiftUnit/FirebaseCore-unit-Bridging-Header.h

@@ -14,3 +14,4 @@
 
 #import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
 #import "FirebaseCore/Tests/SwiftUnit/SwiftTestingUtilities/ExceptionCatcher.h"
+#import "SharedTestUtilities/FIROptionsMock.h"

FirebaseCore/Tests/Unit/FIRAppTest.m

@@ -19,8 +19,8 @@
 #import "FirebaseCore/Sources/Private/FIRAppInternal.h"
 #import "FirebaseCore/Sources/Private/FIRCoreDiagnosticsConnector.h"
 #import "FirebaseCore/Sources/Private/FIROptionsInternal.h"
-
 #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h"
+#import "SharedTestUtilities/FIROptionsMock.h"
 
 NSString *const kFIRTestAppName1 = @"test_app_name_1";
 NSString *const kFIRTestAppName2 = @"test-app-name-2";
@@ -68,9 +68,7 @@ - (void)setUp {
   _observerMock = OCMObserverMock();
   _mockCoreDiagnosticsConnector = OCMClassMock([FIRCoreDiagnosticsConnector class]);
 
-#if SWIFT_PACKAGE
-  [self mockFIROptions];
-#endif
+  [FIROptionsMock mockFIROptions];
 
   OCMStub(ClassMethod([self.mockCoreDiagnosticsConnector logCoreTelemetryWithOptions:[OCMArg any]]))
       .andDo(^(NSInvocation *invocation){

FirebaseCore/Tests/Unit/FIRBundleUtilTest.m

@@ -16,6 +16,7 @@
 
 #import "FirebaseCore/Sources/FIRBundleUtil.h"
 #import "GoogleUtilities/Environment/Private/GULAppEnvironmentUtil.h"
+#import "SharedTestUtilities/FIROptionsMock.h"
 
 static NSString *const kResultPath = @"resultPath";
 static NSString *const kResourceName = @"resourceName";