fixes

Author: paulb777

.github/workflows/storage.yml

@@ -108,17 +108,17 @@ jobs:
  # 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.

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 => '../../'

FirebaseStorageObjC.podspec

@@ -52,7 +52,8 @@ Objective C Implementations for FirebaseStorage. This pod should not be directly
  unit_tests.platforms = {
  :ios => ios_deployment_target,
  :osx => osx_deployment_target,
- :tvos => tvos_deployment_target
+ :tvos => tvos_deployment_target,
+ :watchos => watchos_deployment_target,
  }
  unit_tests.source_files = [
  'FirebaseStorage/Tests/Unit/*.[mh]',

FirebaseStorageSwift/Tests/ObjCIntegration/ObjCAPITests.m

@@ -1,4 +1,4 @@
-// Copyright 2022 LLC Google
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

scripts/build.sh

@@ -537,7 +537,7 @@ case "$product-$platform-$method" in
  if check_secrets; then
  # Integration tests are only run on iOS to minimize flake failures.
  RunXcodebuild \
- -workspace 'gen/FirebaseStorageObjc/FirebaseStorageObjC.xcworkspace' \
+ -workspace 'gen/FirebaseStorageObjc/FirebaseStorage.xcworkspace' \
  -scheme "FirebaseStorage-Unit-objcintegration" \
  "${ios_flags[@]}" \
  "${xcb_flags[@]}" \