Stop flooding Swift Package Manager projects with Firebase test schemes

firebase · Jun 7, 2021 · 2b04d4a · 2b04d4a
1 parent 500ea2d
commit 2b04d4a
Show file tree

Hide file tree

Showing 39 changed files with 62 additions and 32 deletions.
diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh ABTestingUnit iOS spm
 
@@ -50,7 +50,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh ABTestingUnit ${{ matrix.target }} spm
 

diff --git a/.github/workflows/app_check.yml b/.github/workflows/app_check.yml
@@ -43,7 +43,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppCheckUnit iOS spm ${{ matrix.diagnostic }}
     - name: Upload raw logs if failed

diff --git a/.github/workflows/appdistribution.yml b/.github/workflows/appdistribution.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh AppDistributionUnit iOS spm
 

diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -73,7 +73,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh AuthUnit ${{ matrix.target }} spm
 

diff --git a/.github/workflows/core-diagnostics.yml b/.github/workflows/core-diagnostics.yml
@@ -36,7 +36,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh CoreUnit iOS spm
 

diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -35,7 +35,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh CoreUnit iOS spm
 
@@ -49,7 +49,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh CoreUnit ${{ matrix.target }} spm
 

diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml
@@ -38,7 +38,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseCrashlytics iOS spmbuildonly
 
@@ -52,7 +52,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseCrashlytics ${{ matrix.target }} spmbuildonly
 

diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
@@ -48,7 +48,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnit iOS spm
 
@@ -62,7 +62,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnit ${{ matrix.target }} spm
 

diff --git a/.github/workflows/dynamiclinks.yml b/.github/workflows/dynamiclinks.yml
@@ -31,7 +31,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseDynamicLinks iOS spmbuildonly
 

diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
@@ -200,7 +200,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Build Test
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore iOS spmbuildonly
     - name: Swift Build
@@ -216,7 +216,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Build Test
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore ${{ matrix.target }} spmbuildonly
     - name: Swift Build

diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml
@@ -43,7 +43,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFunctions iOS spmbuildonly
     - name: Combine Unit Tests
@@ -59,7 +59,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFunctions ${{ matrix.target }} spmbuildonly
 

diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml
@@ -52,7 +52,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseInAppMessaging-Beta iOS spmbuildonly
 

diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml
@@ -45,7 +45,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseInstallations iOS spmbuildonly
 
@@ -59,7 +59,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseInstallations ${{ matrix.target }} spmbuildonly
 

diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
@@ -63,7 +63,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh MessagingUnit ${{ matrix.target }} spm
 
@@ -77,7 +77,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh MessagingUnit ${{ matrix.target }} spm
 

diff --git a/.github/workflows/mlmodeldownloader.yml b/.github/workflows/mlmodeldownloader.yml
@@ -59,7 +59,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseMLModelDownloaderUnit iOS spm
 
@@ -73,7 +73,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseMLModelDownloaderUnit ${{ matrix.target }} spm
 

diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml
@@ -65,7 +65,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigUnit iOS spm
 
@@ -79,7 +79,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh RemoteConfigUnit ${{ matrix.target }} spm
 

diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS spm
 
@@ -34,7 +34,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       # TODO (#7785) Change to Firebase-Package when #7785 is resolved.
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift-Beta iOS-device spmbuildonly
@@ -52,6 +52,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.test }} ${{ matrix.target }} spm
diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -48,7 +48,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: iOS Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh StorageUnit iOS spm
     - name: Swift Build
@@ -64,7 +64,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Initialize xcodebuild
-      run: xcodebuild -list
+      run: scripts/setup_spm_tests.sh
     - name: Unit Tests
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh StorageUnit ${{ matrix.target }} spm
     - name: Swift Build

diff --git a/.gitignore b/.gitignore
@@ -73,7 +73,8 @@ scripts/code_coverage_report/*/Package.resolved
 scripts/code_coverage_report/*/.build
 
 # Bad sorts get generated if the package .xcscheme is not regenerated.
-.swiftpm/xcode/xcshareddata/xcschemes/Firebase-Package.xcscheme
+# Anything committed to xcshareddata gets propagated to clients. (#8167)
+.swiftpm/xcode/xcshareddata/
 
 # Mint package manager
 Mint

diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Firebase 8.2.0
+- [fixed] Stop flooding Swift Package Manager projects with Firebase test schemes. (#8167)
+
 # Firebase 8.0.0
 - [removed] The deprecated Firebase InstanceID has been removed. Use Firebase Installations to manage
   app instance and use Firebase Messaging to manage FCM registration token instead. (#7970)

diff --git a/README.md b/README.md
@@ -148,6 +148,7 @@ Alternatively disable signing in each target:
 * Add `CODE_SIGNING_REQUIRED` setting with a value of `NO`
 
 ### Swift Package Manager
+* To enable test schemes: `./scripts/setup_spm_tests.sh`
 * `open Package.swift` or double click `Package.swift` in Finder.
 * Xcode will open the project
   * Choose a scheme for a library to build or test suite to run

diff --git a/scripts/setup_spm_tests.sh b/scripts/setup_spm_tests.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+# Copyright 2021 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Move schemes into place to run Swift Package Manager tests
+# These cannot be stored in the correct location because they cause 
+# clutter for SDK clients.
+# Details in https://github.com/firebase/firebase-ios-sdk/issues/8167 and
+# https://forums.swift.org/t/swiftpm-and-library-unit-testing/26255/21
+
+mkdir -p .swiftpm/xcode/xcshareddata/xcschemes
+cp scripts/spm_test_schemes/* .swiftpm/xcode/xcshareddata/xcschemes/
+xcodebuild -list
diff --git a/...areddata/xcschemes/ABTestingUnit.xcscheme → ...s/spm_test_schemes/ABTestingUnit.xcscheme b/...areddata/xcschemes/ABTestingUnit.xcscheme → ...s/spm_test_schemes/ABTestingUnit.xcscheme
diff --git a/...hareddata/xcschemes/AppCheckUnit.xcscheme → ...ts/spm_test_schemes/AppCheckUnit.xcscheme b/...hareddata/xcschemes/AppCheckUnit.xcscheme → ...ts/spm_test_schemes/AppCheckUnit.xcscheme
diff --git a/...data/xcschemes/AppCheckUnitSwift.xcscheme → ...m_test_schemes/AppCheckUnitSwift.xcscheme b/...data/xcschemes/AppCheckUnitSwift.xcscheme → ...m_test_schemes/AppCheckUnitSwift.xcscheme
diff --git a/...ta/xcschemes/AppDistributionUnit.xcscheme → ...test_schemes/AppDistributionUnit.xcscheme b/...ta/xcschemes/AppDistributionUnit.xcscheme → ...test_schemes/AppDistributionUnit.xcscheme
diff --git a/.../xcshareddata/xcschemes/AuthUnit.xcscheme → scripts/spm_test_schemes/AuthUnit.xcscheme b/.../xcshareddata/xcschemes/AuthUnit.xcscheme → scripts/spm_test_schemes/AuthUnit.xcscheme
diff --git a/.../xcshareddata/xcschemes/CoreUnit.xcscheme → scripts/spm_test_schemes/CoreUnit.xcscheme b/.../xcshareddata/xcschemes/CoreUnit.xcscheme → scripts/spm_test_schemes/CoreUnit.xcscheme
diff --git a/...hareddata/xcschemes/DatabaseUnit.xcscheme → ...ts/spm_test_schemes/DatabaseUnit.xcscheme b/...hareddata/xcschemes/DatabaseUnit.xcscheme → ...ts/spm_test_schemes/DatabaseUnit.xcscheme
diff --git a/...es/FirebaseMLModelDownloaderUnit.xcscheme → ...es/FirebaseMLModelDownloaderUnit.xcscheme b/...es/FirebaseMLModelDownloaderUnit.xcscheme → ...es/FirebaseMLModelDownloaderUnit.xcscheme
diff --git a/...mes/FirestoreTestingSupportTests.xcscheme → ...mes/FirestoreTestingSupportTests.xcscheme b/...mes/FirestoreTestingSupportTests.xcscheme → ...mes/FirestoreTestingSupportTests.xcscheme
diff --git a/...a/xcschemes/FunctionsCombineUnit.xcscheme → ...est_schemes/FunctionsCombineUnit.xcscheme b/...a/xcschemes/FunctionsCombineUnit.xcscheme → ...est_schemes/FunctionsCombineUnit.xcscheme
diff --git a/...areddata/xcschemes/MessagingUnit.xcscheme → ...s/spm_test_schemes/MessagingUnit.xcscheme b/...areddata/xcschemes/MessagingUnit.xcscheme → ...s/spm_test_schemes/MessagingUnit.xcscheme
diff --git a/...ddata/xcschemes/RemoteConfigUnit.xcscheme → ...pm_test_schemes/RemoteConfigUnit.xcscheme b/...ddata/xcschemes/RemoteConfigUnit.xcscheme → ...pm_test_schemes/RemoteConfigUnit.xcscheme
diff --git a/...shareddata/xcschemes/StorageUnit.xcscheme → ...pts/spm_test_schemes/StorageUnit.xcscheme b/...shareddata/xcschemes/StorageUnit.xcscheme → ...pts/spm_test_schemes/StorageUnit.xcscheme
diff --git a/.../xcschemes/analytics-import-test.xcscheme → ...st_schemes/analytics-import-test.xcscheme b/.../xcschemes/analytics-import-test.xcscheme → ...st_schemes/analytics-import-test.xcscheme
diff --git a/...ddata/xcschemes/objc-import-test.xcscheme → ...pm_test_schemes/objc-import-test.xcscheme b/...ddata/xcschemes/objc-import-test.xcscheme → ...pm_test_schemes/objc-import-test.xcscheme
diff --git a/...cshareddata/xcschemes/swift-test.xcscheme → scripts/spm_test_schemes/swift-test.xcscheme b/...cshareddata/xcschemes/swift-test.xcscheme → scripts/spm_test_schemes/swift-test.xcscheme
diff --git a/...hareddata/xcschemes/version-test.xcscheme → ...ts/spm_test_schemes/version-test.xcscheme b/...hareddata/xcschemes/version-test.xcscheme → ...ts/spm_test_schemes/version-test.xcscheme