Make all Storage APIs available via Swift (#9443)

Author: paulb777

.github/workflows/storage.yml

@@ -85,40 +85,41 @@ jobs:
  - name: Setup project and Build for Catalyst
  run: scripts/test_catalyst.sh FirebaseStorageObjC test FirebaseStorageObjC-Unit-unit
 
- quickstart:
- # Don't run on private repo unless it is a PR.
- if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
- env:
- plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
- signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
- runs-on: macos-11
- steps:
- - uses: actions/checkout@v2
- - name: Setup quickstart
- run: scripts/setup_quickstart.sh storage
- - name: Install Secret GoogleService-Info.plist
- run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
- quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
- - name: Test objc quickstart
- run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true)
- - name: Test swift quickstart
- run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true swift)
+# TODO: Restore Quickstart when ported for Firebase 9.
+ # quickstart:
+ # # Don't run on private repo unless it is a PR.
+ # if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
+ # env:
+ # plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+ # signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+ # runs-on: macos-11
+ # steps:
+ # - uses: actions/checkout@v2
+ # - name: Setup quickstart
+ # run: scripts/setup_quickstart.sh storage
+ # - name: Install Secret GoogleService-Info.plist
+ # run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
+ # quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
+ # - name: Test objc quickstart
+ # run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true)
+ # - name: Test swift quickstart
+ # run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true swift)
 
  pod-lib-lint:
  # Don't run on private repo unless it is a PR.
  if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
  runs-on: macos-11
-
  strategy:
  matrix:
  target: [ios, tvos, macos, watchos]
+ podspec: [Storage, StorageObjC]
  steps:
  - uses: actions/checkout@v2
  - name: Setup Bundler
  run: scripts/setup_bundler.sh
  - name: Build and test
  run: |
- scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseStorage.podspec --test-specs=unit --platforms=${{ matrix.target }}
+ scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb Firebase${{ matrix.podspec }}.podspec --test-specs=unit --platforms=${{ matrix.target }}
 
  storage-cron-only:
  # Don't run on private repo.

CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile

@@ -27,6 +27,7 @@ target 'CocoapodsIntegrationTest' do
  pod 'FirebaseMessagingInterop', :path => '../'
  pod 'FirebasePerformance', :path => '../'
  pod 'FirebaseStorage', :path => '../'
+ pod 'FirebaseStorageObjC', :path => '../'
 end
 
 # Using the new speed-enhancing features available with CocoaPods 1.7+

Example/watchOSSample/Podfile

@@ -8,13 +8,16 @@ target 'SampleWatchAppWatchKitExtension' do
  platform :watchos, '7.0'
 
  pod 'FirebaseCore', :path => '../../'
+ pod 'FirebaseCoreInternal', :path => '../../'
  pod 'FirebaseMessaging', :path => '../../'
  pod 'FirebaseCoreDiagnostics', :path => '../../'
  pod 'FirebaseInstallations', :path => '../../'
  pod 'FirebaseStorage', :path => '../../'
  pod 'FirebaseRemoteConfig', :path => '../../'
  pod 'FirebaseABTesting', :path => '../../'
  pod 'FirebaseDatabase', :path => '../../'
+ pod 'FirebaseAppCheckInterop', :path => '../../'
+ pod 'FirebaseAuthInterop', :path => '../../'
 
  pod 'Firebase/Messaging', :path => '../../'
  pod 'Firebase/Storage', :path => '../../'

FirebaseAppCheckInterop.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseAppCheckInterop'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'Interfaces that allow other Firebase SDKs to use AppCheck functionality.'
 
  s.description = <<-DESC

FirebaseAuthInterop.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseAuthInterop'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'Interfaces that allow other Firebase SDKs to use Auth functionality.'
 
  s.description = <<-DESC

FirebaseCombineSwift/Tests/Unit/FirebaseApp+Tests.swift

@@ -39,8 +39,6 @@ extension FirebaseApp {
 
  static func appForStorageUnitTestsWithName(name: String) -> FirebaseApp {
  let app = FirebaseApp(instanceWithName: name, options: appOptions())
- let registrants = NSMutableSet(object: FIRStorageComponent.self)
- app.container = FirebaseComponentContainer(app: app, registrants: registrants)
  return app
  }
 }

FirebaseCombineSwift/Tests/Unit/FirebaseCombine-unit-Bridging-Header.h

@@ -15,9 +15,6 @@
 #import "SharedTestUtilities/FIRComponentTestUtilities.h"
 #import "SharedTestUtilities/FIROptionsMock.h"
 
-// Firebase Storage
-#import "FirebaseStorage/Sources/FIRStorageComponent.h"
-
 // Firebase Core
 #import "FirebaseCore/Internal/FirebaseCoreInternal.h"
 

FirebaseCore/Sources/FIRApp.m

@@ -836,7 +836,10 @@ + (void)registerSwiftComponents {
  SEL componentsToRegisterSEL = @selector(componentsToRegister);
  // Dictionary of class names that conform to `FIRLibrary` and their user agents. These should only
  // be SDKs that are written in Swift but still visible to ObjC.
- NSDictionary<NSString *, NSString *> *swiftLibs = @{@"FIRFunctionsComponent" : @"fire-fun"};
+ NSDictionary<NSString *, NSString *> *swiftLibs = @{
+ @"FIRFunctionsComponent" : @"fire-fun",
+ @"FIRStorageComponent" : @"fire-str",
+ };
  for (NSString *className in swiftLibs.allKeys) {
  Class klass = NSClassFromString(className);
  if (klass && [klass respondsToSelector:componentsToRegisterSEL]) {

FirebaseCoreInternal.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseCoreInternal'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'APIs only for Firebase internal usage'
 
  s.description = <<-DESC

FirebaseMessagingInterop.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = 'FirebaseMessagingInterop'
- s.version = '8.12.0'
+ s.version = '8.13.0'
  s.summary = 'Interfaces that allow other Firebase SDKs to use Messaging functionality.'
 
  s.description = <<-DESC