From 158ccd089d0d9fc040df6c67f05630ff76cfda3a Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 19 Oct 2020 13:09:12 -0700 Subject: [PATCH 1/9] cherry-pick recent release process changes to release branch (#6775) * CocoaPods CI update (#6751) * Finish port of update-versions.py (#6758) * Some Release tooling cleanup (#6761) * Rename ReleaseTooling (#6772) * Address two comments from last week's PRs (#6774) * Source updates for ReleaseTooling rename (#6773) --- .github/workflows/zip.yml | 6 +- .gitignore | 6 +- .travis.yml | 36 +-- AddNewPod.md | 3 +- .../Cocoapods1_6_1_frameworks/Podfile | 24 -- .../Cocoapods1_6_1_staticLibs/Gemfile | 5 - .../Cocoapods1_6_1_staticLibs/Podfile | 22 -- .../Cocoapods1_7_0_frameworks/Gemfile | 5 - .../Cocoapods1_7_0_frameworks/Podfile | 23 -- .../Gemfile | 5 - .../Cocoapods1_7_0_staticLibs/Gemfile | 6 - .../Cocoapods1_7_0_staticLibs/Podfile | 22 -- .../Gemfile | 2 +- .../Podfile | 0 .../Gemfile | 2 +- .../Podfile | 0 Dangerfile | 4 +- {ZipBuilder => ReleaseTooling}/.gitignore | 0 .../CarthageJSON/FirebaseABTestingBinary.json | 0 .../CarthageJSON/FirebaseAdMobBinary.json | 0 .../CarthageJSON/FirebaseAnalyticsBinary.json | 0 .../FirebaseAppDistributionBinary.json | 0 .../CarthageJSON/FirebaseAuthBinary.json | 0 .../CarthageJSON/FirebaseCrashBinary.json | 0 .../FirebaseCrashlyticsBinary.json | 0 .../CarthageJSON/FirebaseDatabaseBinary.json | 0 .../FirebaseDynamicLinksBinary.json | 0 .../CarthageJSON/FirebaseFirestoreBinary.json | 0 .../CarthageJSON/FirebaseFunctionsBinary.json | 0 .../FirebaseGoogleSignInBinary.json | 0 .../FirebaseInAppMessagingBinary.json | 0 .../FirebaseInAppMessagingDisplayBinary.json | 0 .../CarthageJSON/FirebaseInvitesBinary.json | 0 .../FirebaseMLModelInterpreterBinary.json | 0 .../CarthageJSON/FirebaseMLVisionBinary.json | 0 .../CarthageJSON/FirebaseMessagingBinary.json | 0 .../FirebasePerformanceBinary.json | 0 .../CarthageJSON/FirebaseProtobufBinary.json | 0 .../FirebaseRemoteConfigBinary.json | 0 .../CarthageJSON/FirebaseStorageBinary.json | 0 {ZipBuilder => ReleaseTooling}/Package.swift | 4 +- {ZipBuilder => ReleaseTooling}/README.md | 8 +- .../FirebaseManifest/FirebaseManifest.swift | 2 +- .../Sources/FirebaseManifest/Pod.swift | 0 .../FirebaseReleaser/InitializeRelease.swift | 0 .../Sources/FirebaseReleaser/Push.swift | 5 +- .../Sources/FirebaseReleaser/Tags.swift | 44 ++- .../Sources/FirebaseReleaser/main.swift | 2 + .../Sources/Utils/FileManager+Utils.swift | 0 .../Sources/Utils/ShellUtils.swift | 0 .../Sources/Utils/URL+Utils.swift | 0 .../Sources/ZipBuilder/CarthageUtils.swift | 0 .../Sources/ZipBuilder/CocoaPodUtils.swift | 0 .../Sources/ZipBuilder/FirebaseBuilder.swift | 2 +- .../Sources/ZipBuilder/FrameworkBuilder.swift | 0 .../Sources/ZipBuilder/HashCalculator.swift | 0 .../Sources/ZipBuilder/LaunchArgs.swift | 7 +- .../Sources/ZipBuilder/ModuleMapBuilder.swift | 0 .../Sources/ZipBuilder/ResourcesManager.swift | 0 .../Sources/ZipBuilder/Zip.swift | 0 .../Sources/ZipBuilder/ZipBuilder.swift | 0 .../Sources/ZipBuilder/main.swift | 0 .../Template/FrameworkMaker.entitlements | 0 .../FrameworkMaker.xcodeproj/project.pbxproj | 0 .../Template/Info.plist | 0 .../Template/README.md | 2 +- .../Template/dummy_Firebase_lib | Bin .../ZipBuilderV2Plan.md | 0 Releases/Manifests/5.10.0.json | 5 - Releases/Manifests/5.11.0.json | 7 - Releases/Manifests/5.12.0.json | 6 - Releases/Manifests/5.13.0 | 6 - Releases/Manifests/5.13.0.json | 6 - Releases/Manifests/5.14.0.json | 8 - Releases/Manifests/5.15.0.json | 7 - Releases/Manifests/5.16.0.json | 10 - Releases/Manifests/5.17.0.json | 8 - Releases/Manifests/5.18.0.json | 10 - Releases/Manifests/5.19.0.json | 12 - Releases/Manifests/5.20.0.json | 8 - Releases/Manifests/5.3.0.json | 4 - Releases/Manifests/5.4.0.json | 8 - Releases/Manifests/5.4.1.json | 4 - Releases/Manifests/5.5.0.json | 7 - Releases/Manifests/5.6.0.json | 4 - Releases/Manifests/5.7.0.json | 6 - Releases/Manifests/5.8.0.json | 9 - Releases/Manifests/5.9.0.json | 6 - Releases/Manifests/6.0.0.json | 13 - Releases/Manifests/6.1.0.json | 10 - Releases/Manifests/6.10.0.json | 14 - Releases/Manifests/6.11.0.json | 9 - Releases/Manifests/6.12.0.json | 10 - Releases/Manifests/6.13.0.json | 11 - Releases/Manifests/6.14.0.json | 15 - Releases/Manifests/6.15.0.json | 19 -- Releases/Manifests/6.16.0.json | 12 - Releases/Manifests/6.17.0.json | 12 - Releases/Manifests/6.18.0.json | 12 - Releases/Manifests/6.19.0.json | 14 - Releases/Manifests/6.2.0.json | 9 - Releases/Manifests/6.21.0.json | 11 - Releases/Manifests/6.22.0.json | 11 - Releases/Manifests/6.23.0.json | 17 - Releases/Manifests/6.24.0.json | 14 - Releases/Manifests/6.25.0.json | 10 - Releases/Manifests/6.26.0.json | 10 - Releases/Manifests/6.27.0.json | 19 -- Releases/Manifests/6.28.0.json | 20 -- Releases/Manifests/6.28.1.json | 5 - Releases/Manifests/6.29.0.json | 13 - Releases/Manifests/6.3.0.json | 8 - Releases/Manifests/6.30.0.json | 16 - Releases/Manifests/6.31.0.json | 16 - Releases/Manifests/6.32.0.json | 9 - Releases/Manifests/6.33.0.json | 14 - Releases/Manifests/6.34.0.json | 12 - Releases/Manifests/6.4.0.json | 8 - Releases/Manifests/6.5.0.json | 10 - Releases/Manifests/6.6.0.json | 14 - Releases/Manifests/6.7.0.json | 13 - Releases/Manifests/6.8.0.json | 10 - Releases/Manifests/6.8.1.json | 6 - Releases/Manifests/6.9.0.json | 9 - Releases/Manifests/README | 3 - Releases/update-versions.py | 301 ------------------ scripts/build_non_firebase_sdks.sh | 4 +- scripts/build_zip.sh | 6 +- scripts/check_whitespace.sh | 3 +- 129 files changed, 75 insertions(+), 1065 deletions(-) delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Gemfile delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Gemfile delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Gemfile delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Gemfile delete mode 100644 CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile rename CocoapodsIntegrationTest/TestEnvironments/{Cocoapods1_6_1_frameworks => Cocoapods_multiprojects_frameworks}/Gemfile (66%) rename CocoapodsIntegrationTest/TestEnvironments/{Cocoapods1_7_0_multiprojects_frameworks => Cocoapods_multiprojects_frameworks}/Podfile (100%) rename CocoapodsIntegrationTest/TestEnvironments/{Cocoapods1_7_0_multiprojects_staticLibs => Cocoapods_multiprojects_staticLibs}/Gemfile (82%) rename CocoapodsIntegrationTest/TestEnvironments/{Cocoapods1_7_0_multiprojects_staticLibs => Cocoapods_multiprojects_staticLibs}/Podfile (100%) rename {ZipBuilder => ReleaseTooling}/.gitignore (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseABTestingBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseAdMobBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseAnalyticsBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseAppDistributionBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseAuthBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseCrashBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseCrashlyticsBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseDatabaseBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseDynamicLinksBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseFirestoreBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseFunctionsBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseGoogleSignInBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseInAppMessagingBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseInAppMessagingDisplayBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseInvitesBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseMLModelInterpreterBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseMLVisionBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseMessagingBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebasePerformanceBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseProtobufBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseRemoteConfigBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/CarthageJSON/FirebaseStorageBinary.json (100%) rename {ZipBuilder => ReleaseTooling}/Package.swift (93%) rename {ZipBuilder => ReleaseTooling}/README.md (94%) rename {ZipBuilder => ReleaseTooling}/Sources/FirebaseManifest/FirebaseManifest.swift (99%) rename {ZipBuilder => ReleaseTooling}/Sources/FirebaseManifest/Pod.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/FirebaseReleaser/InitializeRelease.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/FirebaseReleaser/Push.swift (95%) rename {ZipBuilder => ReleaseTooling}/Sources/FirebaseReleaser/Tags.swift (61%) rename {ZipBuilder => ReleaseTooling}/Sources/FirebaseReleaser/main.swift (97%) rename {ZipBuilder => ReleaseTooling}/Sources/Utils/FileManager+Utils.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/Utils/ShellUtils.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/Utils/URL+Utils.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/CarthageUtils.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/CocoaPodUtils.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/FirebaseBuilder.swift (99%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/FrameworkBuilder.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/HashCalculator.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/LaunchArgs.swift (98%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/ModuleMapBuilder.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/ResourcesManager.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/Zip.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/ZipBuilder.swift (100%) rename {ZipBuilder => ReleaseTooling}/Sources/ZipBuilder/main.swift (100%) rename {ZipBuilder => ReleaseTooling}/Template/FrameworkMaker.entitlements (100%) rename {ZipBuilder => ReleaseTooling}/Template/FrameworkMaker.xcodeproj/project.pbxproj (100%) rename {ZipBuilder => ReleaseTooling}/Template/Info.plist (100%) rename {ZipBuilder => ReleaseTooling}/Template/README.md (99%) rename {ZipBuilder => ReleaseTooling}/Template/dummy_Firebase_lib (100%) rename {ZipBuilder => ReleaseTooling}/ZipBuilderV2Plan.md (100%) delete mode 100644 Releases/Manifests/5.10.0.json delete mode 100644 Releases/Manifests/5.11.0.json delete mode 100644 Releases/Manifests/5.12.0.json delete mode 100644 Releases/Manifests/5.13.0 delete mode 100644 Releases/Manifests/5.13.0.json delete mode 100644 Releases/Manifests/5.14.0.json delete mode 100644 Releases/Manifests/5.15.0.json delete mode 100644 Releases/Manifests/5.16.0.json delete mode 100644 Releases/Manifests/5.17.0.json delete mode 100644 Releases/Manifests/5.18.0.json delete mode 100644 Releases/Manifests/5.19.0.json delete mode 100644 Releases/Manifests/5.20.0.json delete mode 100644 Releases/Manifests/5.3.0.json delete mode 100644 Releases/Manifests/5.4.0.json delete mode 100644 Releases/Manifests/5.4.1.json delete mode 100644 Releases/Manifests/5.5.0.json delete mode 100644 Releases/Manifests/5.6.0.json delete mode 100644 Releases/Manifests/5.7.0.json delete mode 100644 Releases/Manifests/5.8.0.json delete mode 100644 Releases/Manifests/5.9.0.json delete mode 100644 Releases/Manifests/6.0.0.json delete mode 100644 Releases/Manifests/6.1.0.json delete mode 100644 Releases/Manifests/6.10.0.json delete mode 100644 Releases/Manifests/6.11.0.json delete mode 100644 Releases/Manifests/6.12.0.json delete mode 100644 Releases/Manifests/6.13.0.json delete mode 100644 Releases/Manifests/6.14.0.json delete mode 100644 Releases/Manifests/6.15.0.json delete mode 100644 Releases/Manifests/6.16.0.json delete mode 100644 Releases/Manifests/6.17.0.json delete mode 100644 Releases/Manifests/6.18.0.json delete mode 100644 Releases/Manifests/6.19.0.json delete mode 100644 Releases/Manifests/6.2.0.json delete mode 100644 Releases/Manifests/6.21.0.json delete mode 100644 Releases/Manifests/6.22.0.json delete mode 100644 Releases/Manifests/6.23.0.json delete mode 100644 Releases/Manifests/6.24.0.json delete mode 100644 Releases/Manifests/6.25.0.json delete mode 100644 Releases/Manifests/6.26.0.json delete mode 100644 Releases/Manifests/6.27.0.json delete mode 100644 Releases/Manifests/6.28.0.json delete mode 100644 Releases/Manifests/6.28.1.json delete mode 100644 Releases/Manifests/6.29.0.json delete mode 100644 Releases/Manifests/6.3.0.json delete mode 100644 Releases/Manifests/6.30.0.json delete mode 100644 Releases/Manifests/6.31.0.json delete mode 100644 Releases/Manifests/6.32.0.json delete mode 100644 Releases/Manifests/6.33.0.json delete mode 100644 Releases/Manifests/6.34.0.json delete mode 100644 Releases/Manifests/6.4.0.json delete mode 100644 Releases/Manifests/6.5.0.json delete mode 100644 Releases/Manifests/6.6.0.json delete mode 100644 Releases/Manifests/6.7.0.json delete mode 100644 Releases/Manifests/6.8.0.json delete mode 100644 Releases/Manifests/6.8.1.json delete mode 100644 Releases/Manifests/6.9.0.json delete mode 100644 Releases/Manifests/README delete mode 100755 Releases/update-versions.py diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml index e0c34e78faf..0c3d9d56465 100644 --- a/.github/workflows/zip.yml +++ b/.github/workflows/zip.yml @@ -3,10 +3,10 @@ name: zip on: pull_request: paths: - - 'ZipBuilder/**' + - 'ReleaseTooling/**' - '.github/workflows/zip.yml' # Don't run based on any markdown only changes. - - '!ZipBuilder/*.md' + - '!ReleaseTooling/*.md' schedule: # Run every day at midnight(PST) - cron uses UTC times - cron: '0 8 * * *' @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v2 - name: Build run: | - cd ZipBuilder + cd ReleaseTooling swift build -v package: diff --git a/.gitignore b/.gitignore index bdec8d64ad8..cd206d68a6f 100644 --- a/.gitignore +++ b/.gitignore @@ -57,9 +57,9 @@ DerivedData # Swift Package Manager */.build -ZipBuilder/Packages -ZipBuilder/*.xcodeproj -ZipBuilder/Package.resolved +ReleaseTooling/Packages +ReleaseTooling/*.xcodeproj +ReleaseTooling/Package.resolved # Mint package manager Mint diff --git a/.travis.yml b/.travis.yml index ba671949b10..63f92e57a09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -239,54 +239,24 @@ jobs: # Validate Cocoapods configurations # This may take long time, so we would like to run it only once all other tests pass - # Validate Cocoapods 1.7.0 compatibility - stage: test if: type = cron env: - - POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_frameworks + - POD_CONFIG_DIR=Cocoapods_multiprojects_frameworks script: - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile - stage: test if: type = cron env: - - POD_CONFIG_DIR=Cocoapods1_7_0_frameworks - script: - - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile - - - stage: test - if: type = cron - env: - - POD_CONFIG_DIR=Cocoapods1_7_0_multiprojects_staticLibs - script: - - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile - - - stage: test - if: type = cron - env: - - POD_CONFIG_DIR=Cocoapods1_7_0_staticLibs - script: - - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile - - # Validate Cocoapods 1.6.1 compatibility - - stage: test - if: type = cron - env: - - POD_CONFIG_DIR=Cocoapods1_6_1_frameworks - script: - - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile - - - stage: test - if: type = cron - env: - - POD_CONFIG_DIR=Cocoapods1_6_1_staticLibs + - POD_CONFIG_DIR=Cocoapods_multiprojects_staticLibs script: - travis_retry ./CocoapodsIntegrationTest/scripts/build_with_environment.sh --gemfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Gemfile --podfile=./CocoapodsIntegrationTest/TestEnvironments/${POD_CONFIG_DIR}/Podfile allow_failures: # Run fuzz tests only on cron jobs. - stage: test - if: type = cron +# if: type = cron env: - PROJECT=Firestore PLATFORM=iOS METHOD=fuzz before_install: diff --git a/AddNewPod.md b/AddNewPod.md index 8c0d0ce576d..0acc1a0fd9d 100644 --- a/AddNewPod.md +++ b/AddNewPod.md @@ -70,7 +70,8 @@ For top-level Firebase pods that map to documented products: * Update [Firebase.podspec](Firebase.podspec). * Register library via registerInternalLibrary API like this [Storage example](FirebaseStorage/Sources/FIRStorageComponent.m). -* Add to the [ZipBuilder pod list](ZipBuilder/Sources/ZipBuilder/FirebasePods.swift). +* When ready to release with Firebase, add to the + [Firebase manifest](ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift). * Add a [quickstart](https://github.com/firebase/quickstart-ios). ## Review and Release diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile deleted file mode 100644 index c476762bcc0..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile +++ /dev/null @@ -1,24 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '10.0' - -target 'CocoapodsIntegrationTest' do - use_frameworks! - - pod 'FirebaseABTesting', :path => '../' - pod 'FirebaseAppDistribution', :path => '../' - pod 'FirebaseCore', :path => '../' - pod 'FirebaseCoreDiagnostics', :path => '../' - pod 'FirebaseCrashlytics', :path => '../' - pod 'FirebaseAuth', :path => '../' - pod 'FirebaseDatabase', :path => '../' - pod 'FirebaseDynamicLinks', :path => '../' - pod 'FirebaseFirestore', :path => '../' - pod 'FirebaseFunctions', :path => '../' - pod 'FirebaseInAppMessaging', :path => '../' - pod 'FirebaseInstallations', :path => '../' - pod 'FirebaseInstanceID', :path => '../' - pod 'FirebaseMessaging', :path => '../' - pod 'FirebaseStorage', :path => '../' - pod 'GoogleDataTransport', :path => '../' - pod 'GoogleUtilities', :path => '../' -end diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Gemfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Gemfile deleted file mode 100644 index 7d579adf0f1..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem 'cocoapods', "=1.6.1" diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile deleted file mode 100644 index 49812ac5f44..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile +++ /dev/null @@ -1,22 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '10.0' - -target 'CocoapodsIntegrationTest' do - pod 'FirebaseABTesting', :path => '../' - pod 'FirebaseAppDistribution', :path => '../' - pod 'FirebaseCore', :path => '../' - pod 'FirebaseCoreDiagnostics', :path => '../' - pod 'FirebaseCrashlytics', :path => '../' - pod 'FirebaseAuth', :path => '../' - pod 'FirebaseDatabase', :path => '../' - pod 'FirebaseDynamicLinks', :path => '../' - pod 'FirebaseFirestore', :path => '../' - pod 'FirebaseFunctions', :path => '../' - pod 'FirebaseInAppMessaging', :path => '../' - pod 'FirebaseInstallations', :path => '../' - pod 'FirebaseInstanceID', :path => '../' - pod 'FirebaseMessaging', :path => '../' - pod 'FirebaseStorage', :path => '../' - pod 'GoogleDataTransport', :path => '../' - pod 'GoogleUtilities', :path => '../' -end diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Gemfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Gemfile deleted file mode 100644 index a4698322428..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem 'cocoapods', "~>1.7.0.beta" diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile deleted file mode 100644 index 25671ca53fe..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile +++ /dev/null @@ -1,23 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '10.0' - -target 'CocoapodsIntegrationTest' do - use_frameworks! - pod 'FirebaseABTesting', :path => '../' - pod 'FirebaseAppDistribution', :path => '../' - pod 'FirebaseCore', :path => '../' - pod 'FirebaseCoreDiagnostics', :path => '../' - pod 'FirebaseCrashlytics', :path => '../' - pod 'FirebaseAuth', :path => '../' - pod 'FirebaseDatabase', :path => '../' - pod 'FirebaseDynamicLinks', :path => '../' - pod 'FirebaseFirestore', :path => '../' - pod 'FirebaseFunctions', :path => '../' - pod 'FirebaseInAppMessaging', :path => '../' - pod 'FirebaseInstallations', :path => '../' - pod 'FirebaseInstanceID', :path => '../' - pod 'FirebaseMessaging', :path => '../' - pod 'FirebaseStorage', :path => '../' - pod 'GoogleDataTransport', :path => '../' - pod 'GoogleUtilities', :path => '../' -end diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Gemfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Gemfile deleted file mode 100644 index a4698322428..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Gemfile +++ /dev/null @@ -1,5 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -gem 'cocoapods', "~>1.7.0.beta" diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Gemfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Gemfile deleted file mode 100644 index b43854c1d3e..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Gemfile +++ /dev/null @@ -1,6 +0,0 @@ -# frozen_string_literal: true - -source "https://rubygems.org" - -# Don't allow 1.7.0.rc.1 because of https://github.com/CocoaPods/CocoaPods/issues/8765 -gem 'cocoapods', "!=1.7.0.rc.1" diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile deleted file mode 100644 index 49812ac5f44..00000000000 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile +++ /dev/null @@ -1,22 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '10.0' - -target 'CocoapodsIntegrationTest' do - pod 'FirebaseABTesting', :path => '../' - pod 'FirebaseAppDistribution', :path => '../' - pod 'FirebaseCore', :path => '../' - pod 'FirebaseCoreDiagnostics', :path => '../' - pod 'FirebaseCrashlytics', :path => '../' - pod 'FirebaseAuth', :path => '../' - pod 'FirebaseDatabase', :path => '../' - pod 'FirebaseDynamicLinks', :path => '../' - pod 'FirebaseFirestore', :path => '../' - pod 'FirebaseFunctions', :path => '../' - pod 'FirebaseInAppMessaging', :path => '../' - pod 'FirebaseInstallations', :path => '../' - pod 'FirebaseInstanceID', :path => '../' - pod 'FirebaseMessaging', :path => '../' - pod 'FirebaseStorage', :path => '../' - pod 'GoogleDataTransport', :path => '../' - pod 'GoogleUtilities', :path => '../' -end diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Gemfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile similarity index 66% rename from CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Gemfile rename to CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile index 7d579adf0f1..428f6565baf 100644 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Gemfile +++ b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Gemfile @@ -2,4 +2,4 @@ source "https://rubygems.org" -gem 'cocoapods', "=1.6.1" +gem 'cocoapods', '1.10.0.rc.1' diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Podfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile similarity index 100% rename from CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Podfile rename to CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_frameworks/Podfile diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Gemfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_staticLibs/Gemfile similarity index 82% rename from CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Gemfile rename to CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_staticLibs/Gemfile index b43854c1d3e..c87a70576f6 100644 --- a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Gemfile +++ b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_staticLibs/Gemfile @@ -3,4 +3,4 @@ source "https://rubygems.org" # Don't allow 1.7.0.rc.1 because of https://github.com/CocoaPods/CocoaPods/issues/8765 -gem 'cocoapods', "!=1.7.0.rc.1" +gem 'cocoapods', '1.10.0.rc.1' diff --git a/CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Podfile b/CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_staticLibs/Podfile similarity index 100% rename from CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Podfile rename to CocoapodsIntegrationTest/TestEnvironments/Cocoapods_multiprojects_staticLibs/Podfile diff --git a/Dangerfile b/Dangerfile index 4e31c9be816..b91aac0fb65 100644 --- a/Dangerfile +++ b/Dangerfile @@ -53,7 +53,7 @@ def labelsForModifiedFiles() labels.push("api: storage") if @has_storage_changes labels.push("GoogleDataTransport") if @has_gdt_changes labels.push("GoogleUtilities") if @has_googleutilities_changes - labels.push("zip-builder") if @has_zipbuilder_changes + labels.push("release-tooling") if @has_releasetooling_changes labels.push("public-api-change") if @has_api_changes return labels end @@ -111,7 +111,7 @@ has_license_changes = didModify(["LICENSE"]) @has_gdt_changes = hasChangesIn(["GoogleDataTransport/"]) @has_gdt_api_changes = hasChangesIn("GoogleDataTransport/GDTCORLibrary/Public") @has_googleutilities_changes = hasChangesIn("GoogleUtilities/") -@has_zipbuilder_changes = hasChangesIn("ZipBuilder/") +@has_releasetooling_changes = hasChangesIn("ReleaseTooling/") # Convenient flag for all API changes. @has_api_changes = @has_abtesting_api_changes || diff --git a/ZipBuilder/.gitignore b/ReleaseTooling/.gitignore similarity index 100% rename from ZipBuilder/.gitignore rename to ReleaseTooling/.gitignore diff --git a/ZipBuilder/CarthageJSON/FirebaseABTestingBinary.json b/ReleaseTooling/CarthageJSON/FirebaseABTestingBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseABTestingBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseABTestingBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseAdMobBinary.json b/ReleaseTooling/CarthageJSON/FirebaseAdMobBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseAdMobBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseAdMobBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseAnalyticsBinary.json b/ReleaseTooling/CarthageJSON/FirebaseAnalyticsBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseAnalyticsBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseAnalyticsBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseAppDistributionBinary.json b/ReleaseTooling/CarthageJSON/FirebaseAppDistributionBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseAppDistributionBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseAppDistributionBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseAuthBinary.json b/ReleaseTooling/CarthageJSON/FirebaseAuthBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseAuthBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseAuthBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseCrashBinary.json b/ReleaseTooling/CarthageJSON/FirebaseCrashBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseCrashBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseCrashBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseCrashlyticsBinary.json b/ReleaseTooling/CarthageJSON/FirebaseCrashlyticsBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseCrashlyticsBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseCrashlyticsBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseDatabaseBinary.json b/ReleaseTooling/CarthageJSON/FirebaseDatabaseBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseDatabaseBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseDatabaseBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseDynamicLinksBinary.json b/ReleaseTooling/CarthageJSON/FirebaseDynamicLinksBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseDynamicLinksBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseDynamicLinksBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseFirestoreBinary.json b/ReleaseTooling/CarthageJSON/FirebaseFirestoreBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseFirestoreBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseFirestoreBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseFunctionsBinary.json b/ReleaseTooling/CarthageJSON/FirebaseFunctionsBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseFunctionsBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseFunctionsBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseGoogleSignInBinary.json b/ReleaseTooling/CarthageJSON/FirebaseGoogleSignInBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseGoogleSignInBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseGoogleSignInBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseInAppMessagingBinary.json b/ReleaseTooling/CarthageJSON/FirebaseInAppMessagingBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseInAppMessagingBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseInAppMessagingBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseInAppMessagingDisplayBinary.json b/ReleaseTooling/CarthageJSON/FirebaseInAppMessagingDisplayBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseInAppMessagingDisplayBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseInAppMessagingDisplayBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseInvitesBinary.json b/ReleaseTooling/CarthageJSON/FirebaseInvitesBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseInvitesBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseInvitesBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseMLModelInterpreterBinary.json b/ReleaseTooling/CarthageJSON/FirebaseMLModelInterpreterBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseMLModelInterpreterBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseMLModelInterpreterBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseMLVisionBinary.json b/ReleaseTooling/CarthageJSON/FirebaseMLVisionBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseMLVisionBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseMLVisionBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseMessagingBinary.json b/ReleaseTooling/CarthageJSON/FirebaseMessagingBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseMessagingBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseMessagingBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebasePerformanceBinary.json b/ReleaseTooling/CarthageJSON/FirebasePerformanceBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebasePerformanceBinary.json rename to ReleaseTooling/CarthageJSON/FirebasePerformanceBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseProtobufBinary.json b/ReleaseTooling/CarthageJSON/FirebaseProtobufBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseProtobufBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseProtobufBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseRemoteConfigBinary.json b/ReleaseTooling/CarthageJSON/FirebaseRemoteConfigBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseRemoteConfigBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseRemoteConfigBinary.json diff --git a/ZipBuilder/CarthageJSON/FirebaseStorageBinary.json b/ReleaseTooling/CarthageJSON/FirebaseStorageBinary.json similarity index 100% rename from ZipBuilder/CarthageJSON/FirebaseStorageBinary.json rename to ReleaseTooling/CarthageJSON/FirebaseStorageBinary.json diff --git a/ZipBuilder/Package.swift b/ReleaseTooling/Package.swift similarity index 93% rename from ZipBuilder/Package.swift rename to ReleaseTooling/Package.swift index 17316b5a321..061f61ae0b1 100644 --- a/ZipBuilder/Package.swift +++ b/ReleaseTooling/Package.swift @@ -20,10 +20,10 @@ import PackageDescription let package = Package( - name: "ZipBuilder", + name: "ReleaseTooling", products: [ .executable(name: "firebase-releaser", targets: ["FirebaseReleaser"]), - .executable(name: "ReleasePackager", targets: ["ZipBuilder"]), + .executable(name: "zip-builder", targets: ["ZipBuilder"]), ], dependencies: [ .package(url: "https://github.com/apple/swift-argument-parser", .exact("0.0.1")), diff --git a/ZipBuilder/README.md b/ReleaseTooling/README.md similarity index 94% rename from ZipBuilder/README.md rename to ReleaseTooling/README.md index 37bfb7272a8..123d11f4068 100644 --- a/ZipBuilder/README.md +++ b/ReleaseTooling/README.md @@ -21,7 +21,7 @@ In order to build the Zip file, you will need: ### Running the Tool -You can run the tool with `swift run ReleasePackager [ARGS]` or generate an Xcode project with +You can run the tool with `swift run zip-builder [ARGS]` or generate an Xcode project with `swift package generate-xcodeproj` and run within Xcode. Since Apple does not support linking libraries built by future Xcode versions, make sure to builid with the @@ -32,12 +32,12 @@ for that version. Check with `xcodebuild -version`. 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 +You can pass in launch arguments with Xcode by clicking "zip-builder" 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. +These arguments assume you're running the command from the `ReleaseTooling` directory. **Required** arguments: - `-templateDir $(pwd)/Template` @@ -78,7 +78,7 @@ For release engineers (Googlers packaging an upcoming Firebase release) these co Putting them all together, here's a common command to build a releaseable Zip file: ``` -swift run ReleasePackager -updatePodRepo true \ +swift run zip-builder -updatePodRepo true \ -repoDir \ -customSpecRepos sso://cpdc-internal/firebase -carthageBuild true diff --git a/ZipBuilder/Sources/FirebaseManifest/FirebaseManifest.swift b/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift similarity index 99% rename from ZipBuilder/Sources/FirebaseManifest/FirebaseManifest.swift rename to ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift index 69f403755bf..56517e994b2 100755 --- a/ZipBuilder/Sources/FirebaseManifest/FirebaseManifest.swift +++ b/ReleaseTooling/Sources/FirebaseManifest/FirebaseManifest.swift @@ -22,7 +22,7 @@ import Foundation public let shared = Manifest( version: "7.0.0", pods: [ - Pod("GoogleUtilities", isFirebase: false, podVersion: "7.0.0", releasing: false), + Pod("GoogleUtilities", isFirebase: false, podVersion: "7.0.0", releasing: true), Pod("GoogleDataTransport", isFirebase: false, podVersion: "8.0.0", releasing: true), Pod("FirebaseCoreDiagnostics"), diff --git a/ZipBuilder/Sources/FirebaseManifest/Pod.swift b/ReleaseTooling/Sources/FirebaseManifest/Pod.swift similarity index 100% rename from ZipBuilder/Sources/FirebaseManifest/Pod.swift rename to ReleaseTooling/Sources/FirebaseManifest/Pod.swift diff --git a/ZipBuilder/Sources/FirebaseReleaser/InitializeRelease.swift b/ReleaseTooling/Sources/FirebaseReleaser/InitializeRelease.swift similarity index 100% rename from ZipBuilder/Sources/FirebaseReleaser/InitializeRelease.swift rename to ReleaseTooling/Sources/FirebaseReleaser/InitializeRelease.swift diff --git a/ZipBuilder/Sources/FirebaseReleaser/Push.swift b/ReleaseTooling/Sources/FirebaseReleaser/Push.swift similarity index 95% rename from ZipBuilder/Sources/FirebaseReleaser/Push.swift rename to ReleaseTooling/Sources/FirebaseReleaser/Push.swift index f9ae72e8845..2c18b2849f8 100644 --- a/ZipBuilder/Sources/FirebaseReleaser/Push.swift +++ b/ReleaseTooling/Sources/FirebaseReleaser/Push.swift @@ -24,10 +24,7 @@ enum Push { let cpdcLocation = findCpdc(gitRoot: gitRoot) let manifest = FirebaseManifest.shared - for pod in manifest.pods { - if !pod.releasing { - continue - } + for pod in manifest.pods.filter({ $0.releasing }) { let warningsOK = pod.allowWarnings ? " --allow-warnings" : "" Shell.executeCommand("pod repo push --skip-tests --use-json \(warningsOK) \(cpdcLocation) " + diff --git a/ZipBuilder/Sources/FirebaseReleaser/Tags.swift b/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift similarity index 61% rename from ZipBuilder/Sources/FirebaseReleaser/Tags.swift rename to ReleaseTooling/Sources/FirebaseReleaser/Tags.swift index 001f6edaa8e..94c88a94a38 100644 --- a/ZipBuilder/Sources/FirebaseReleaser/Tags.swift +++ b/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift @@ -27,10 +27,7 @@ enum Tags { createTag(gitRoot: gitRoot, tag: "CocoaPods-\(manifest.version)-beta", deleteExistingTags: deleteExistingTags) - for pod in manifest.pods { - if pod.isFirebase { - continue - } + for pod in manifest.pods.filter({ !$0.isFirebase && $0.releasing }) { if !pod.name.starts(with: "Google") { fatalError("Unrecognized Other Pod: \(pod.name). Only Google prefix is recognized") } @@ -48,21 +45,31 @@ enum Tags { private static func createTag(gitRoot: URL, tag: String, deleteExistingTags: Bool) { if deleteExistingTags { - verifyTagsAreSafeToDelete() + verifyTagsAreSafeToDelete(gitRoot: gitRoot) Shell.executeCommand("git tag --delete \(tag)", workingDir: gitRoot) Shell.executeCommand("git push --delete origin \(tag)", workingDir: gitRoot) + } else { + verifyTagIsSafeToAdd(tag, gitRoot: gitRoot) } Shell.executeCommand("git tag \(tag)", workingDir: gitRoot) Shell.executeCommand("git push origin \(tag)", workingDir: gitRoot) } - private static func verifyTagsAreSafeToDelete() { + /// Check that the Firebase version has not already been published to CocoaPods, so that we don't + /// delete a tag that is being used in production. + /// It works by checking for the existence of the corresponding Firebase podspec in the + /// clone of https://github.com/CocoaPods/Specs + private static func verifyTagsAreSafeToDelete(gitRoot: URL) { var homeDirURL: URL if #available(OSX 10.12, *) { homeDirURL = FileManager.default.homeDirectoryForCurrentUser } else { fatalError("Run on at least macOS 10.12") } + + // Make sure that local master spec repo is up to date. + Shell.executeCommand("pod repo update", workingDir: gitRoot) + let manifest = FirebaseManifest.shared let firebasePublicURL = homeDirURL.appendingPathComponents( [".cocoapods", "repos", "cocoapods", "Specs", "0", "3", "5", "Firebase"] @@ -77,4 +84,29 @@ enum Tags { fatalError("Do not remove tag of a published Firebase version.") } } + + /// Before trying to add a new tag, make sure that it doesn't already exist locally or in the + /// git origin. The git commands return an empty string if the tag doesn't exist. + private static func verifyTagIsSafeToAdd(_ tag: String, gitRoot: URL) { + if checkTagCommand("git tag -l \(tag)", gitRoot: gitRoot) != "" { + fatalError("Tag \(tag) already exists locally. Please delete and restart") + } + if checkTagCommand("git ls-remote origin refs/tags/\(tag)", gitRoot: gitRoot) != "" { + fatalError("Tag \(tag) already exists locally. Please delete and restart") + } + } + + private static func checkTagCommand(_ command: String, gitRoot: URL) -> String { + let result = Shell.executeCommandFromScript(command, workingDir: gitRoot) + switch result { + case let .error(code, output): + fatalError(""" + `\(command) failed with exit code \(code) + Output from `pod repo list`: + \(output) + """) + case let .success(output): + return output.trimmingCharacters(in: .whitespacesAndNewlines) + } + } } diff --git a/ZipBuilder/Sources/FirebaseReleaser/main.swift b/ReleaseTooling/Sources/FirebaseReleaser/main.swift similarity index 97% rename from ZipBuilder/Sources/FirebaseReleaser/main.swift rename to ReleaseTooling/Sources/FirebaseReleaser/main.swift index 76d5033786c..1617c0bcede 100644 --- a/ZipBuilder/Sources/FirebaseReleaser/main.swift +++ b/ReleaseTooling/Sources/FirebaseReleaser/main.swift @@ -27,6 +27,8 @@ struct FirebaseReleaser: ParsableCommand { transform: URL.init(fileURLWithPath:)) var gitRoot: URL + /// Log commands only and do not make any repository or source changes. + /// Useful for testing and for generating the list of push commands. @Option(default: false, help: "Log without executing the shell commands") var logOnly: Bool diff --git a/ZipBuilder/Sources/Utils/FileManager+Utils.swift b/ReleaseTooling/Sources/Utils/FileManager+Utils.swift similarity index 100% rename from ZipBuilder/Sources/Utils/FileManager+Utils.swift rename to ReleaseTooling/Sources/Utils/FileManager+Utils.swift diff --git a/ZipBuilder/Sources/Utils/ShellUtils.swift b/ReleaseTooling/Sources/Utils/ShellUtils.swift similarity index 100% rename from ZipBuilder/Sources/Utils/ShellUtils.swift rename to ReleaseTooling/Sources/Utils/ShellUtils.swift diff --git a/ZipBuilder/Sources/Utils/URL+Utils.swift b/ReleaseTooling/Sources/Utils/URL+Utils.swift similarity index 100% rename from ZipBuilder/Sources/Utils/URL+Utils.swift rename to ReleaseTooling/Sources/Utils/URL+Utils.swift diff --git a/ZipBuilder/Sources/ZipBuilder/CarthageUtils.swift b/ReleaseTooling/Sources/ZipBuilder/CarthageUtils.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/CarthageUtils.swift rename to ReleaseTooling/Sources/ZipBuilder/CarthageUtils.swift diff --git a/ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift b/ReleaseTooling/Sources/ZipBuilder/CocoaPodUtils.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift rename to ReleaseTooling/Sources/ZipBuilder/CocoaPodUtils.swift diff --git a/ZipBuilder/Sources/ZipBuilder/FirebaseBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/FirebaseBuilder.swift similarity index 99% rename from ZipBuilder/Sources/ZipBuilder/FirebaseBuilder.swift rename to ReleaseTooling/Sources/ZipBuilder/FirebaseBuilder.swift index f94dc0fe897..f6c26ec118f 100644 --- a/ZipBuilder/Sources/ZipBuilder/FirebaseBuilder.swift +++ b/ReleaseTooling/Sources/ZipBuilder/FirebaseBuilder.swift @@ -44,7 +44,7 @@ struct FirebaseBuilder { guard let repoDir = args.repoDir else { fatalError("repoDir option must be specified when building Carthage") } - let carthageJSONDir = repoDir.appendingPathComponents(["ZipBuilder", "CarthageJSON"]) + let carthageJSONDir = repoDir.appendingPathComponents(["ReleaseTooling", "CarthageJSON"]) carthageRoot = CarthageUtils.packageCarthageRelease(templateDir: args.templateDir, carthageJSONDir: carthageJSONDir, artifacts: artifacts, diff --git a/ZipBuilder/Sources/ZipBuilder/FrameworkBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/FrameworkBuilder.swift rename to ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift diff --git a/ZipBuilder/Sources/ZipBuilder/HashCalculator.swift b/ReleaseTooling/Sources/ZipBuilder/HashCalculator.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/HashCalculator.swift rename to ReleaseTooling/Sources/ZipBuilder/HashCalculator.swift diff --git a/ZipBuilder/Sources/ZipBuilder/LaunchArgs.swift b/ReleaseTooling/Sources/ZipBuilder/LaunchArgs.swift similarity index 98% rename from ZipBuilder/Sources/ZipBuilder/LaunchArgs.swift rename to ReleaseTooling/Sources/ZipBuilder/LaunchArgs.swift index 97257f277b6..f18ab794d8e 100644 --- a/ZipBuilder/Sources/ZipBuilder/LaunchArgs.swift +++ b/ReleaseTooling/Sources/ZipBuilder/LaunchArgs.swift @@ -181,8 +181,9 @@ struct LaunchArgs { // Get the project template directory, and fail if it doesn't exist. var templatePath = defaults.string(forKey: Key.templateDir.rawValue) if templatePath == nil, let repoDir = repoDir { - templatePath = repoDir.path + "/ZipBuilder/Template" - } else { + templatePath = repoDir.path + "/ReleaseTooling/Template" + } + if templatePath == nil { LaunchArgs.exitWithUsageAndLog("Missing required key: `\(Key.templateDir)` for the folder " + "containing all required files to build frameworks.") } @@ -331,7 +332,7 @@ struct LaunchArgs { print(errorText) // Loop over all the possible keys and print their description. - print("Usage: `swift run ZipBuilder [ARGS]` where args are:") + print("Usage: `swift run zip-builder [ARGS]` where args are:") for option in Key.allCases { print(""" -\(option.rawValue) diff --git a/ZipBuilder/Sources/ZipBuilder/ModuleMapBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/ModuleMapBuilder.swift rename to ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift diff --git a/ZipBuilder/Sources/ZipBuilder/ResourcesManager.swift b/ReleaseTooling/Sources/ZipBuilder/ResourcesManager.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/ResourcesManager.swift rename to ReleaseTooling/Sources/ZipBuilder/ResourcesManager.swift diff --git a/ZipBuilder/Sources/ZipBuilder/Zip.swift b/ReleaseTooling/Sources/ZipBuilder/Zip.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/Zip.swift rename to ReleaseTooling/Sources/ZipBuilder/Zip.swift diff --git a/ZipBuilder/Sources/ZipBuilder/ZipBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/ZipBuilder.swift rename to ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift diff --git a/ZipBuilder/Sources/ZipBuilder/main.swift b/ReleaseTooling/Sources/ZipBuilder/main.swift similarity index 100% rename from ZipBuilder/Sources/ZipBuilder/main.swift rename to ReleaseTooling/Sources/ZipBuilder/main.swift diff --git a/ZipBuilder/Template/FrameworkMaker.entitlements b/ReleaseTooling/Template/FrameworkMaker.entitlements similarity index 100% rename from ZipBuilder/Template/FrameworkMaker.entitlements rename to ReleaseTooling/Template/FrameworkMaker.entitlements diff --git a/ZipBuilder/Template/FrameworkMaker.xcodeproj/project.pbxproj b/ReleaseTooling/Template/FrameworkMaker.xcodeproj/project.pbxproj similarity index 100% rename from ZipBuilder/Template/FrameworkMaker.xcodeproj/project.pbxproj rename to ReleaseTooling/Template/FrameworkMaker.xcodeproj/project.pbxproj diff --git a/ZipBuilder/Template/Info.plist b/ReleaseTooling/Template/Info.plist similarity index 100% rename from ZipBuilder/Template/Info.plist rename to ReleaseTooling/Template/Info.plist diff --git a/ZipBuilder/Template/README.md b/ReleaseTooling/Template/README.md similarity index 99% rename from ZipBuilder/Template/README.md rename to ReleaseTooling/Template/README.md index daa23467e61..ebfb424d7c5 100644 --- a/ZipBuilder/Template/README.md +++ b/ReleaseTooling/Template/README.md @@ -83,7 +83,7 @@ You can get samples for Firebase from https://github.com/firebase/quickstart-ios Note that several of the samples depend on SDKs that are not included with this archive; for example, FirebaseUI. For the samples that depend on SDKs not included in this archive, you'll need to use CocoaPods or use the -[ZipBuilder](https://github.com/firebase/firebase-ios-sdk/tree/master/ZipBuilder) +[ZipBuilder](https://github.com/firebase/firebase-ios-sdk/tree/master/ReleaseTooling) to create your own custom binary frameworks. # Versions diff --git a/ZipBuilder/Template/dummy_Firebase_lib b/ReleaseTooling/Template/dummy_Firebase_lib similarity index 100% rename from ZipBuilder/Template/dummy_Firebase_lib rename to ReleaseTooling/Template/dummy_Firebase_lib diff --git a/ZipBuilder/ZipBuilderV2Plan.md b/ReleaseTooling/ZipBuilderV2Plan.md similarity index 100% rename from ZipBuilder/ZipBuilderV2Plan.md rename to ReleaseTooling/ZipBuilderV2Plan.md diff --git a/Releases/Manifests/5.10.0.json b/Releases/Manifests/5.10.0.json deleted file mode 100644 index 7143b12a846..00000000000 --- a/Releases/Manifests/5.10.0.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "FirebaseCore":"5.1.5", - "FirebaseMessaging":"3.2.0", - "FirebaseFirestore":"0.13.5" -} diff --git a/Releases/Manifests/5.11.0.json b/Releases/Manifests/5.11.0.json deleted file mode 100644 index 25f42b1fa67..00000000000 --- a/Releases/Manifests/5.11.0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "FirebaseCore":"5.1.6", - "FirebaseDynamicLinks":"3.1.1", - "FirebaseMessaging":"3.2.1", - "FirebaseFirestore":"0.13.6", - "FirebaseAnalyticsInterop":"1.1.0" -} diff --git a/Releases/Manifests/5.12.0.json b/Releases/Manifests/5.12.0.json deleted file mode 100644 index 07931200142..00000000000 --- a/Releases/Manifests/5.12.0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "FirebaseCore":"5.1.7", - "FirebaseAuth":"5.0.5", - "FirebaseStorage":"3.0.3", - "FirebaseFirestore":"0.14.0" -} diff --git a/Releases/Manifests/5.13.0 b/Releases/Manifests/5.13.0 deleted file mode 100644 index 631ece9ea31..00000000000 --- a/Releases/Manifests/5.13.0 +++ /dev/null @@ -1,6 +0,0 @@ -{ - "FirebaseCore":"5.1.8", - "FirebaseDynamicLinks":"3.2.0", - "FirebaseFirestore":"0.15.0", - "FirebaseInAppMessagingDisplay":"0.12.2" -} diff --git a/Releases/Manifests/5.13.0.json b/Releases/Manifests/5.13.0.json deleted file mode 100644 index 631ece9ea31..00000000000 --- a/Releases/Manifests/5.13.0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "FirebaseCore":"5.1.8", - "FirebaseDynamicLinks":"3.2.0", - "FirebaseFirestore":"0.15.0", - "FirebaseInAppMessagingDisplay":"0.12.2" -} diff --git a/Releases/Manifests/5.14.0.json b/Releases/Manifests/5.14.0.json deleted file mode 100644 index 04c52ed36cb..00000000000 --- a/Releases/Manifests/5.14.0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "FirebaseAuth":"5.1.0", - "FirebaseCore":"5.1.9", - "FirebaseDatabase":"5.0.4", - "FirebaseDynamicLinks":"3.3.0", - "FirebaseFirestore":"0.16.0", - "FirebaseMessaging":"3.2.2" -} diff --git a/Releases/Manifests/5.15.0.json b/Releases/Manifests/5.15.0.json deleted file mode 100644 index d61a2198746..00000000000 --- a/Releases/Manifests/5.15.0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "FirebaseAuth":"5.2.0", - "FirebaseCore":"5.1.10", - "FirebaseFirestore":"0.16.1", - "FirebaseFunctions":"2.1.2", - "FirebasePerformance":"2.2.2" -} diff --git a/Releases/Manifests/5.16.0.json b/Releases/Manifests/5.16.0.json deleted file mode 100644 index d859d36d502..00000000000 --- a/Releases/Manifests/5.16.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "FirebaseAuth":"5.3.0", - "FirebaseCore":"5.2.0", - "FirebaseDatabase":"5.1.0", - "FirebaseDynamicLinks":"3.4.0", - "FirebaseFirestore":"1.0.0", - "FirebaseFunctions":"2.2.0", - "FirebaseMessaging":"3.3.0", - "FirebaseStorage":"3.1.0" -} diff --git a/Releases/Manifests/5.17.0.json b/Releases/Manifests/5.17.0.json deleted file mode 100644 index c2a4da04395..00000000000 --- a/Releases/Manifests/5.17.0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "FirebaseAnalyticsInterop":"1.2.0", - "FirebaseAuth":"5.3.1", - "FirebaseCore":"5.3.0", - "FirebaseFirestore":"1.0.1", - "FirebaseFunctions":"2.2.1", - "FirebaseMessaging":"3.3.1" -} diff --git a/Releases/Manifests/5.18.0.json b/Releases/Manifests/5.18.0.json deleted file mode 100644 index 34a052ca92e..00000000000 --- a/Releases/Manifests/5.18.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "FirebaseAuth":"5.4.0", - "FirebaseCore":"5.3.1", - "FirebaseDynamicLinks":"3.4.1", - "FirebaseFirestore":"1.0.2", - "FirebaseFunctions":"2.3.0", - "FirebaseInAppMessaging":"0.13.0", - "FirebaseInAppMessagingDisplay":"0.13.0", - "FirebaseMessaging":"3.3.2" -} diff --git a/Releases/Manifests/5.19.0.json b/Releases/Manifests/5.19.0.json deleted file mode 100644 index b8d333d612e..00000000000 --- a/Releases/Manifests/5.19.0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "FirebaseAuth":"5.4.1", - "FirebaseCore":"5.4.0", - "FirebaseDatabase":"5.1.1", - "FirebaseDynamicLinks":"3.4.2", - "FirebaseFirestore":"1.1.0", - "FirebaseFunctions":"2.4.0", - "FirebaseInAppMessagingDisplay":"0.13.1", - "FirebaseInstanceID":"3.8.0", - "FirebaseMessaging":"3.4.0", - "FirebaseStorage":"3.1.1" -} diff --git a/Releases/Manifests/5.20.0.json b/Releases/Manifests/5.20.0.json deleted file mode 100644 index 3afa84abc24..00000000000 --- a/Releases/Manifests/5.20.0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "FirebaseAuth":"5.4.2", - "FirebaseCore":"5.4.1", - "FirebaseDynamicLinks":"3.4.3", - "FirebaseFirestore":"1.2.0", - "FirebaseInstanceID":"3.8.1", - "FirebaseMessaging":"3.5.0" -} diff --git a/Releases/Manifests/5.3.0.json b/Releases/Manifests/5.3.0.json deleted file mode 100644 index ae18cfaf701..00000000000 --- a/Releases/Manifests/5.3.0.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "FirebaseCore":"5.0.4", - "FirebaseFirestore":"0.12.4" -} \ No newline at end of file diff --git a/Releases/Manifests/5.4.0.json b/Releases/Manifests/5.4.0.json deleted file mode 100644 index 373805a3ef5..00000000000 --- a/Releases/Manifests/5.4.0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "FirebaseCore":"5.0.5", - "FirebaseAuth":"5.0.2", - "FirebaseDatabase":"5.0.2", - "FirebaseMessaging":"3.0.3", - "FirebaseFirestore":"0.12.5", - "FirebaseFunctions":"2.1.0" -} \ No newline at end of file diff --git a/Releases/Manifests/5.4.1.json b/Releases/Manifests/5.4.1.json deleted file mode 100644 index 73c07ba7697..00000000000 --- a/Releases/Manifests/5.4.1.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "FirebaseCore":"5.0.6", - "FirebaseFirestore":"0.12.6" -} \ No newline at end of file diff --git a/Releases/Manifests/5.5.0.json b/Releases/Manifests/5.5.0.json deleted file mode 100644 index 62d31eb8fc4..00000000000 --- a/Releases/Manifests/5.5.0.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "FirebaseCore":"5.1.0", - "FirebaseAuth":"5.0.3", - "FirebaseAuthInterop":"1.0.0", - "FirebaseMessaging":"3.1.0", - "FirebaseFirestore":"0.13.0" -} diff --git a/Releases/Manifests/5.6.0.json b/Releases/Manifests/5.6.0.json deleted file mode 100644 index 00c3312d157..00000000000 --- a/Releases/Manifests/5.6.0.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "FirebaseCore":"5.1.1", - "FirebaseFirestore":"0.13.1" -} diff --git a/Releases/Manifests/5.7.0.json b/Releases/Manifests/5.7.0.json deleted file mode 100644 index 2c4ac0430ad..00000000000 --- a/Releases/Manifests/5.7.0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "FirebaseCore":"5.1.2", - "FirebaseMessaging":"3.1.1", - "FirebaseStorage":"3.0.1", - "FirebaseFirestore":"0.13.2" -} diff --git a/Releases/Manifests/5.8.0.json b/Releases/Manifests/5.8.0.json deleted file mode 100644 index 1d22ade752d..00000000000 --- a/Releases/Manifests/5.8.0.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "FirebaseCore":"5.1.3", - "FirebaseAuth":"5.0.4", - "FirebaseDatabase":"5.0.3", - "FirebaseFirestore":"0.13.3", - "FirebaseFunctions":"2.1.1", - "FirebaseMessaging":"3.1.2", - "FirebaseStorage":"3.0.2" -} \ No newline at end of file diff --git a/Releases/Manifests/5.9.0.json b/Releases/Manifests/5.9.0.json deleted file mode 100644 index 4c4576f41d0..00000000000 --- a/Releases/Manifests/5.9.0.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "FirebaseCore":"5.1.4", - "FirebaseDynamicLinks":"3.1.0", - "FirebaseFirestore":"0.13.4", - "FirebaseInAppMessagingDisplay":"0.12.0" -} \ No newline at end of file diff --git a/Releases/Manifests/6.0.0.json b/Releases/Manifests/6.0.0.json deleted file mode 100644 index 49c4040572b..00000000000 --- a/Releases/Manifests/6.0.0.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "FirebaseAuth":"6.0.0", - "FirebaseCore":"6.0.0", - "FirebaseDatabase":"6.0.0", - "FirebaseDynamicLinks":"4.0.0", - "FirebaseFirestore":"1.3.0", - "FirebaseFunctions":"2.5.0", - "FirebaseInAppMessaging":"0.14.0", - "FirebaseInAppMessagingDisplay":"0.14.0", - "FirebaseInstanceID":"4.0.0", - "FirebaseMessaging":"4.0.0", - "FirebaseStorage":"3.2.0" -} diff --git a/Releases/Manifests/6.1.0.json b/Releases/Manifests/6.1.0.json deleted file mode 100644 index c8e33cb5b1c..00000000000 --- a/Releases/Manifests/6.1.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "FirebaseAuth":"6.1.0", - "FirebaseCore":"6.0.1", - "FirebaseFirestore":"1.3.1", - "FirebaseFunctions":"2.5.1", - "FirebaseInAppMessaging":"0.14.1", - "FirebaseInstanceID":"4.1.0", - "FirebaseMessaging":"4.0.1", - "FirebaseStorage":"3.2.1" -} diff --git a/Releases/Manifests/6.10.0.json b/Releases/Manifests/6.10.0.json deleted file mode 100644 index eaf3966a045..00000000000 --- a/Releases/Manifests/6.10.0.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "FirebaseABTesting":"3.1.2", - "FirebaseAuth":"6.3.0", - "FirebaseCore":"6.3.1", - "FirebaseCoreDiagnostics":"1.1.1", - "FirebaseDatabase":"6.1.1", - "FirebaseFirestore":"1.6.0", - "FirebaseInAppMessaging":"0.15.5", - "FirebaseInAppMessagingDisplay":"0.15.5", - "FirebaseMessaging":"4.1.6", - "FirebaseRemoteConfig":"4.4.2", - "GoogleDataTransport":"3.0.0", - "GoogleDataTransportCCTSupport":"1.2.0" -} diff --git a/Releases/Manifests/6.11.0.json b/Releases/Manifests/6.11.0.json deleted file mode 100644 index 559fb2e331c..00000000000 --- a/Releases/Manifests/6.11.0.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Firebase":"6.11.0", - "FirebaseAuth":"6.3.1", - "FirebaseCore":"6.3.2", - "FirebaseFirestore":"1.6.1", - "FirebaseInstanceID":"4.2.6", - "FirebaseMessaging":"4.1.7", - "FirebaseRemoteConfig":"4.4.3" -} diff --git a/Releases/Manifests/6.12.0.json b/Releases/Manifests/6.12.0.json deleted file mode 100644 index bee20f26427..00000000000 --- a/Releases/Manifests/6.12.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Firebase":"6.12.0", - "FirebaseCore":"6.3.3", - "FirebaseCoreDiagnosticsInterop":"1.1.0", - "FirebaseDatabase":"6.1.2", - "FirebaseFirestore":"1.7.0", - "FirebaseInstanceID":"4.2.7", - "FirebaseMessaging":"4.1.8", - "FirebaseRemoteConfig":"4.4.4" -} diff --git a/Releases/Manifests/6.13.0.json b/Releases/Manifests/6.13.0.json deleted file mode 100644 index a9576e50606..00000000000 --- a/Releases/Manifests/6.13.0.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Firebase":"6.13.0", - "FirebaseCore":"6.4.0", - "GoogleUtilities":"6.3.2", - "FirebaseAuth":"6.4.0", - "FirebaseFirestore":"1.8.0", - "FirebaseMessaging":"4.1.9", - "FirebaseRemoteConfig":"4.4.5", - "FirebaseStorage":"3.4.2", - "GoogleDataTransport":"3.1.0" -} diff --git a/Releases/Manifests/6.14.0.json b/Releases/Manifests/6.14.0.json deleted file mode 100644 index f98c8a7200f..00000000000 --- a/Releases/Manifests/6.14.0.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "Firebase":"6.14.0", - "FirebaseAuth":"6.4.1", - "FirebaseCore":"6.5.0", - "FirebaseDatabase":"6.1.3", - "FirebaseDynamicLinks":"4.0.6", - "FirebaseFirestore":"1.8.2", - "FirebaseInAppMessaging":"0.15.6", - "FirebaseInstanceID":"4.2.8", - "FirebaseMessaging":"4.1.10", - "FirebaseRemoteConfig":"4.4.6", - "FirebaseStorage":"3.4.3", - "GoogleDataTransportCCTSupport":"1.2.3", - "GoogleUtilities":"6.4.0" -} diff --git a/Releases/Manifests/6.15.0.json b/Releases/Manifests/6.15.0.json deleted file mode 100644 index c99381bef93..00000000000 --- a/Releases/Manifests/6.15.0.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Firebase":"6.15.0", - "FirebaseAnalyticsInterop":"1.5.0", - "FirebaseAuth":"6.4.2", - "FirebaseCore":"6.6.0", - "FirebaseCoreDiagnostics":"1.2.0", - "FirebaseCoreDiagnosticsInterop":"1.2.0", - "FirebaseCrashlytics":"4.0.0-beta.1", - "FirebaseDatabase":"6.1.4", - "FirebaseFirestore":"1.9.0", - "FirebaseInAppMessaging":"0.16.0", - "FirebaseInstallations":"1.0.0", - "FirebaseInstanceID":"4.3.0", - "FirebaseMessaging":"4.2.0", - "FirebaseStorage":"3.5.0", - "GoogleDataTransport":"3.3.0", - "GoogleDataTransportCCTSupport":"1.3.0", - "GoogleUtilities":"6.5.0" -} diff --git a/Releases/Manifests/6.16.0.json b/Releases/Manifests/6.16.0.json deleted file mode 100644 index 9689b64b3be..00000000000 --- a/Releases/Manifests/6.16.0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Firebase":"6.16.0", - "FirebaseAuth":"6.4.3", - "FirebaseCore":"6.6.1", - "FirebaseCrashlytics":"4.0.0-beta.2", - "FirebaseFirestore":"1.10.0", - "FirebaseInAppMessaging":"0.17.0", - "FirebaseInAppMessagingDisplay":"0.17.0", - "GoogleDataTransport":"3.3.1", - "GoogleDataTransportCCTSupport":"1.3.1", - "GoogleUtilities":"6.5.1" -} diff --git a/Releases/Manifests/6.17.0.json b/Releases/Manifests/6.17.0.json deleted file mode 100644 index afe6523ef0d..00000000000 --- a/Releases/Manifests/6.17.0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Firebase":"6.17.0", - "FirebaseCore":"6.6.2", - "FirebaseCrashlytics":"4.0.0-beta.4", - "FirebaseDynamicLinks":"4.0.7", - "FirebaseFirestore":"1.10.2", - "FirebaseInstanceID":"4.3.1", - "FirebaseMessaging":"4.2.1", - "FirebaseRemoteConfig":"4.4.7", - "GoogleDataTransport":"4.0.0", - "GoogleDataTransportCCTSupport":"1.4.0" -} diff --git a/Releases/Manifests/6.18.0.json b/Releases/Manifests/6.18.0.json deleted file mode 100644 index 3768c969068..00000000000 --- a/Releases/Manifests/6.18.0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Firebase":"6.18.0", - "FirebaseCore":"6.6.3", - "FirebaseCoreDiagnostics":"1.2.1", - "FirebaseFirestore":"1.11.0", - "FirebaseInAppMessaging":"0.18.0", - "FirebaseInstanceID":"4.3.2", - "FirebaseMessaging":"4.3.0", - "FirebaseRemoteConfig":"4.4.8", - "GoogleDataTransport":"4.0.1", - "GoogleDataTransportCCTSupport":"1.4.1" -} diff --git a/Releases/Manifests/6.19.0.json b/Releases/Manifests/6.19.0.json deleted file mode 100644 index 1280c609df2..00000000000 --- a/Releases/Manifests/6.19.0.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "Firebase":"6.19.0", - "FirebaseABTesting":"3.2.0", - "FirebaseAuthInterop":"1.1.0", - "FirebaseCore":"6.6.4", - "FirebaseCoreDiagnostics":"1.2.2", - "FirebaseCrashlytics":"4.0.0-beta.5", - "FirebaseFirestore":"1.11.1", - "FirebaseInAppMessaging":"0.19.0", - "FirebaseRemoteConfig":"4.4.9", - "FirebaseStorage":"3.6.0", - "GoogleDataTransport":"5.0.0", - "GoogleDataTransportCCTSupport":"2.0.0" -} diff --git a/Releases/Manifests/6.2.0.json b/Releases/Manifests/6.2.0.json deleted file mode 100644 index f3a7e48350b..00000000000 --- a/Releases/Manifests/6.2.0.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "FirebaseAuth":"6.1.1", - "FirebaseCore":"6.0.2", - "FirebaseFirestore":"1.3.2", - "FirebaseInAppMessaging":"0.15.0", - "FirebaseInAppMessagingDisplay":"0.15.0", - "FirebaseInstanceID":"4.1.1", - "FirebaseMessaging":"4.0.2" -} diff --git a/Releases/Manifests/6.21.0.json b/Releases/Manifests/6.21.0.json deleted file mode 100644 index 4733ced826b..00000000000 --- a/Releases/Manifests/6.21.0.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Firebase":"6.21.0", - "FirebaseAuth":"6.5.1", - "FirebaseCore":"6.6.5", - "FirebaseCrashlytics":"4.0.0-beta.6", - "FirebaseDynamicLinks":"4.0.8", - "FirebaseInAppMessaging":"0.19.1", - "FirebaseInstallations":"1.1.1", - "GoogleDataTransport":"5.1.0", - "GoogleDataTransportCCTSupport":"2.0.1" -} diff --git a/Releases/Manifests/6.22.0.json b/Releases/Manifests/6.22.0.json deleted file mode 100644 index 2872b1657b8..00000000000 --- a/Releases/Manifests/6.22.0.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Firebase":"6.22.0", - "FirebaseCore":"6.6.6", - "FirebaseCoreDiagnostics":"1.2.3", - "FirebaseCrashlytics":"4.0.0-beta.7", - "FirebaseFirestore":"1.12.0", - "FirebaseInAppMessaging":"0.19.2", - "FirebaseInstanceID":"4.3.3", - "GoogleDataTransport":"5.1.1", - "GoogleDataTransportCCTSupport":"2.0.2" -} diff --git a/Releases/Manifests/6.23.0.json b/Releases/Manifests/6.23.0.json deleted file mode 100644 index 3a2b367a1e1..00000000000 --- a/Releases/Manifests/6.23.0.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "Firebase":"6.23.0", - "FirebaseAuth":"6.5.2", - "FirebaseCore":"6.6.7", - "FirebaseCoreDiagnostics":"1.2.4", - "FirebaseCrashlytics":"4.0.0", - "FirebaseDatabase":"6.2.0", - "FirebaseFirestore":"1.12.1", - "FirebaseInAppMessaging":"0.19.3", - "FirebaseInstallations":"1.2.0", - "FirebaseInstanceID":"4.3.4", - "FirebaseMessaging":"4.3.1", - "FirebaseStorage":"3.6.1", - "GoogleDataTransport":"6.0.0", - "GoogleDataTransportCCTSupport":"3.0.0", - "GoogleUtilities":"6.6.0" -} diff --git a/Releases/Manifests/6.24.0.json b/Releases/Manifests/6.24.0.json deleted file mode 100644 index 7b96a632b2b..00000000000 --- a/Releases/Manifests/6.24.0.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "Firebase":"6.24.0", - "FirebaseAuth":"6.5.3", - "FirebaseCore":"6.7.0", - "FirebaseCoreDiagnostics":"1.3.0", - "FirebaseCrashlytics":"4.1.0", - "FirebaseDatabase":"6.2.1", - "FirebaseFirestore":"1.13.0", - "FirebaseInAppMessaging":"0.20.0", - "FirebaseMessaging":"4.4.0", - "FirebaseRemoteConfig":"4.4.10", - "GoogleDataTransport":"6.1.0", - "GoogleDataTransportCCTSupport":"3.1.0" -} diff --git a/Releases/Manifests/6.25.0.json b/Releases/Manifests/6.25.0.json deleted file mode 100644 index 3ed72731666..00000000000 --- a/Releases/Manifests/6.25.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Firebase" : "6.25.0", - "FirebaseCore" : "6.7.1", - "FirebaseFirestore" : "1.14.0", - "FirebaseFirestoreSwift" : "0.3.0", - "FirebaseInAppMessaging" : "0.20.1", - "FirebaseMessaging" : "4.4.1", - "FirebaseRemoteConfig" : "4.4.11", - "GoogleDataTransport" : "6.1.1" -} diff --git a/Releases/Manifests/6.26.0.json b/Releases/Manifests/6.26.0.json deleted file mode 100644 index 0a5ae9f7b9c..00000000000 --- a/Releases/Manifests/6.26.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "Firebase" : "6.26.0", - "FirebaseCore" : "6.7.2", - "FirebaseCrashlytics" : "4.1.1", - "FirebaseFirestore" : "1.15.0", - "FirebaseInAppMessaging" : "0.20.2", - "FirebaseInstallations" : "1.3.0", - "FirebaseRemoteConfig" : "4.5.0", - "GoogleDataTransport" : "6.2.0" -} \ No newline at end of file diff --git a/Releases/Manifests/6.27.0.json b/Releases/Manifests/6.27.0.json deleted file mode 100644 index 322c342987f..00000000000 --- a/Releases/Manifests/6.27.0.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "Firebase" : "6.27.0", - "FirebaseABTesting" : "3.3.0", - "FirebaseAuth" : "6.6.0", - "FirebaseCore" : "6.8.0", - "FirebaseCoreDiagnostics": "1.4.0", - "FirebaseCrashlytics" : "4.2.0", - "FirebaseDatabase" : "6.3.0", - "FirebaseDynamicLinks" : "4.1.0", - "FirebaseFirestore" : "1.16.0", - "FirebaseFunctions" : "2.6.0", - "FirebaseInAppMessaging" : "0.21.0", - "FirebaseInstallations" : "1.4.0", - "FirebaseInstanceID" : "4.4.0", - "FirebaseMessaging" : "4.5.0", - "FirebaseRemoteConfig" : "4.6.0", - "FirebaseStorage" : "3.7.0", - "GoogleDataTransportCCTSupport" : "3.2.0" -} \ No newline at end of file diff --git a/Releases/Manifests/6.28.0.json b/Releases/Manifests/6.28.0.json deleted file mode 100644 index 5ff761d2eea..00000000000 --- a/Releases/Manifests/6.28.0.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "Firebase" : "6.28.0", - "FirebaseABTesting" : "4.0.0", - "FirebaseAuth" : "6.7.0", - "FirebaseCore" : "6.9.0", - "FirebaseCoreDiagnostics" : "1.5.0", - "FirebaseCrashlytics" : "4.3.0", - "FirebaseDatabase" : "6.4.0", - "FirebaseDynamicLinks" : "4.2.0", - "FirebaseFirestore" : "1.16.1", - "FirebaseFunctions" : "2.7.0", - "FirebaseInAppMessaging" : "0.22.0", - "FirebaseInstallations" : "1.5.0", - "FirebaseInstanceID" : "4.5.0", - "FirebaseMessaging" : "4.6.0", - "FirebaseRemoteConfig" : "4.7.0", - "FirebaseStorage" : "3.8.0", - "GoogleDataTransport" : "7.0.0", - "GoogleUtilities" : "6.7.0" -} \ No newline at end of file diff --git a/Releases/Manifests/6.28.1.json b/Releases/Manifests/6.28.1.json deleted file mode 100644 index fa66df9d2e9..00000000000 --- a/Releases/Manifests/6.28.1.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "Firebase" : "6.28.1", - "FirebaseCore" : "6.9.1", - "FirebaseFirestore" : "1.16.2" -} \ No newline at end of file diff --git a/Releases/Manifests/6.29.0.json b/Releases/Manifests/6.29.0.json deleted file mode 100644 index 46d715b22c4..00000000000 --- a/Releases/Manifests/6.29.0.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "Firebase" : "6.29.0", - "FirebaseABTesting" : "4.1.0", - "FirebaseAuth" : "6.7.1", - "FirebaseCore" : "6.9.2", - "FirebaseCrashlytics" : "4.3.1", - "FirebaseFirestore" : "1.16.3", - "FirebaseInAppMessaging" : "0.23.0", - "FirebaseInstanceID" : "4.5.1", - "FirebaseMessaging" : "4.6.1", - "FirebaseRemoteConfig" : "4.8.0", - "GoogleDataTransport" : "7.1.0" -} \ No newline at end of file diff --git a/Releases/Manifests/6.3.0.json b/Releases/Manifests/6.3.0.json deleted file mode 100644 index 63225c11c31..00000000000 --- a/Releases/Manifests/6.3.0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "FirebaseAuth":"6.1.2", - "FirebaseCore":"6.0.3", - "FirebaseFirestore":"1.4.0", - "FirebaseInAppMessaging":"0.15.1", - "FirebaseInstanceID":"4.2.0", - "FirebaseMessaging":"4.1.0" -} diff --git a/Releases/Manifests/6.30.0.json b/Releases/Manifests/6.30.0.json deleted file mode 100644 index 7072af7c9c2..00000000000 --- a/Releases/Manifests/6.30.0.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Firebase" : "6.30.0", - "FirebaseABTesting" : "4.2.0", - "FirebaseAuth" : "6.8.0", - "FirebaseCore" : "6.10.0", - "FirebaseCrashlytics" : "4.4.0", - "FirebaseDatabase" : "6.5.0", - "FirebaseDynamicLinks" : "4.2.1", - "FirebaseFirestore" : "1.16.4", - "FirebaseFunctions" : "2.8.0", - "FirebaseInstallations" : "1.6.0", - "FirebaseRemoteConfig" : "4.9.0", - "FirebaseStorage" : "3.9.0", - "GoogleDataTransport" : "7.2.0", - "GoogleUtilities" : "6.7.2" -} \ No newline at end of file diff --git a/Releases/Manifests/6.31.0.json b/Releases/Manifests/6.31.0.json deleted file mode 100644 index 9eb91208504..00000000000 --- a/Releases/Manifests/6.31.0.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Firebase" : "6.31.0", - "FirebaseAppDistribution" : "0.9.0", - "FirebaseAuth" : "6.9.0", - "FirebaseCore" : "6.10.1", - "FirebaseCoreDiagnostics" : "1.6.0", - "FirebaseCrashlytics" : "4.5.0", - "FirebaseDynamicLinks" : "4.3.0", - "FirebaseFirestore" : "1.17.0", - "FirebaseFirestoreSwift" : "0.4.0", - "FirebaseInAppMessaging" : "0.24.0", - "FirebaseInstallations" : "1.7.0", - "FirebaseInstanceID" : "4.6.0", - "FirebaseMessaging" : "4.6.2", - "GoogleDataTransport" : "7.3.0" -} \ No newline at end of file diff --git a/Releases/Manifests/6.32.0.json b/Releases/Manifests/6.32.0.json deleted file mode 100644 index 443ffb0a6e3..00000000000 --- a/Releases/Manifests/6.32.0.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Firebase" : "6.32.0", - "FirebaseAppDistribution" : "0.9.2", - "FirebaseAuth" : "6.9.1", - "FirebaseCore" : "6.10.2", - "FirebaseCrashlytics" : "4.6.0", - "FirebaseDatabase" : "6.6.0", - "FirebaseFirestore" : "1.17.1" -} \ No newline at end of file diff --git a/Releases/Manifests/6.33.0.json b/Releases/Manifests/6.33.0.json deleted file mode 100644 index 69132a7b3f1..00000000000 --- a/Releases/Manifests/6.33.0.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "Firebase" : "6.33.0", - "FirebaseAppDistribution" : "0.9.3", - "FirebaseAuth" : "6.9.2", - "FirebaseCore" : "6.10.3", - "FirebaseCoreDiagnostics" : "1.7.0", - "FirebaseCrashlytics" : "4.6.1", - "FirebaseDynamicLinks" : "4.3.1", - "FirebaseFirestore" : "1.18.0", - "FirebaseFunctions" : "2.9.0", - "FirebaseInstanceID" : "4.7.0", - "FirebaseMessaging" : "4.7.0", - "GoogleDataTransport" : "7.4.0" -} \ No newline at end of file diff --git a/Releases/Manifests/6.34.0.json b/Releases/Manifests/6.34.0.json deleted file mode 100644 index e77f6d1f503..00000000000 --- a/Releases/Manifests/6.34.0.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "Firebase" : "6.34.0", - "FirebaseCore" : "6.10.4", - "FirebaseCrashlytics" : "4.6.2", - "FirebaseFirestore" : "1.19.0", - "FirebaseInstanceID" : "4.8.0", - "FirebaseInstallations" : "1.7.1", - "FirebaseMessaging" : "4.7.1", - "FirebaseRemoteConfig" : "4.9.1", - "FirebaseStorage" : "3.9.1", - "GoogleDataTransport" : "7.5.0" -} diff --git a/Releases/Manifests/6.4.0.json b/Releases/Manifests/6.4.0.json deleted file mode 100644 index 6a984e0497e..00000000000 --- a/Releases/Manifests/6.4.0.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "FirebaseAuth":"6.2.0", - "FirebaseCore":"6.0.4", - "FirebaseFirestore":"1.4.1", - "FirebaseInstanceID":"4.2.1", - "FirebaseMessaging":"4.1.1", - "FirebaseStorage":"3.3.0" -} diff --git a/Releases/Manifests/6.5.0.json b/Releases/Manifests/6.5.0.json deleted file mode 100644 index 84b8835571b..00000000000 --- a/Releases/Manifests/6.5.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "FirebaseAuth":"6.2.1", - "FirebaseCore":"6.1.0", - "FirebaseDynamicLinks":"4.0.1", - "FirebaseFirestore":"1.4.2", - "FirebaseInAppMessaging":"0.15.2", - "FirebaseInAppMessagingDisplay":"0.15.2", - "FirebaseInstanceID":"4.2.2", - "FirebaseStorage":"3.4.0" -} diff --git a/Releases/Manifests/6.6.0.json b/Releases/Manifests/6.6.0.json deleted file mode 100644 index ffd23bb948d..00000000000 --- a/Releases/Manifests/6.6.0.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "GoogleDataTransportCCTSupport":"1.0.0", - "GoogleDataTransport":"1.0.0", - "FirebaseCoreDiagnosticsInterop":"1.0.0", - "FirebaseCoreDiagnostics":"1.0.0", - "FirebaseCore":"6.2.0", - "FirebaseAuth":"6.2.2", - "FirebaseDynamicLinks":"4.0.2", - "FirebaseFirestore":"1.4.3", - "FirebaseInAppMessaging":"0.15.3", - "FirebaseInAppMessagingDisplay":"0.15.3", - "FirebaseInstanceID":"4.2.3", - "FirebaseMessaging":"4.1.2" -} diff --git a/Releases/Manifests/6.7.0.json b/Releases/Manifests/6.7.0.json deleted file mode 100644 index a440ac5bfc0..00000000000 --- a/Releases/Manifests/6.7.0.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "FirebaseABTesting":"3.1.0", - "FirebaseAnalyticsInterop":"1.4.0", - "FirebaseAuth":"6.2.3", - "FirebaseCore":"6.2.1", - "FirebaseDatabase":"6.1.0", - "FirebaseDynamicLinks":"4.0.3", - "FirebaseInAppMessagingDisplay":"0.15.4", - "FirebaseFirestore":"1.4.4", - "FirebaseMessaging":"4.1.3", - "GoogleDataTransportCCTSupport":"1.0.2", - "GoogleDataTransport":"1.1.2" -} diff --git a/Releases/Manifests/6.8.0.json b/Releases/Manifests/6.8.0.json deleted file mode 100644 index 9f6589de0e4..00000000000 --- a/Releases/Manifests/6.8.0.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "FirebaseABTesting":"3.1.1", - "FirebaseCore":"6.2.2", - "FirebaseDynamicLinks":"4.0.4", - "FirebaseFirestore":"1.5.0", - "FirebaseInAppMessaging":"0.15.4", - "FirebaseInstanceID":"4.2.4", - "FirebaseMessaging":"4.1.4", - "FirebaseRemoteConfig":"4.4.0" -} diff --git a/Releases/Manifests/6.8.1.json b/Releases/Manifests/6.8.1.json deleted file mode 100644 index 26ba6c82c3b..00000000000 --- a/Releases/Manifests/6.8.1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "FirebaseCore":"6.2.3", - "FirebaseDynamicLinks":"4.0.5", - "FirebaseInstanceID":"4.2.5", - "FirebaseStorage":"3.4.1" -} diff --git a/Releases/Manifests/6.9.0.json b/Releases/Manifests/6.9.0.json deleted file mode 100644 index d79ec30f8e0..00000000000 --- a/Releases/Manifests/6.9.0.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "FirebaseCore":"6.3.0", - "FirebaseCoreDiagnostics":"1.1.0", - "FirebaseFirestore":"1.5.1", - "FirebaseMessaging":"4.1.5", - "FirebaseRemoteConfig":"4.4.1", - "GoogleDataTransport":"2.0.0", - "GoogleDataTransportCCTSupport":"1.1.0" -} diff --git a/Releases/Manifests/README b/Releases/Manifests/README deleted file mode 100644 index 0c7a6314596..00000000000 --- a/Releases/Manifests/README +++ /dev/null @@ -1,3 +0,0 @@ -Each file in this directory corresponds with a Firebase release. The file -includes a list of the podspecs and versions from this repo that updated in the -Firebase release version indicated by the filename. diff --git a/Releases/update-versions.py b/Releases/update-versions.py deleted file mode 100755 index fa7948b9b46..00000000000 --- a/Releases/update-versions.py +++ /dev/null @@ -1,301 +0,0 @@ -#!/usr/bin/python - -# Copyright 2018 Google -# -# 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. - -"""update-versions.py creates a release branch and commit with version updates. - -With the required --version parameter, this script will update all files in -the repo based on the versions in Releases/Manifests/{version}.json. - -It will create a release branch, push and tag the updates, and push the -updated podspecs to cpdc-internal. -""" - -import argparse -import json -import os -import subprocess -import sys -import tempfile - -test_mode = False # Flag to disable external repo updates - - -def SetupArguments(): - """SetupArguments sets up the set of command-line arguments. - - Returns: - Args: The set of command line arguments - """ - parser = argparse.ArgumentParser(description='Update Pod Versions') - - parser.add_argument('--version', required=True, help='Firebase version') - - parser.add_argument( - '--test_mode', - dest='test_mode', - action='store_true', - help='Log commands instead of updating public repo') - - parser.add_argument( - '--tag_update', - dest='tag_update', - action='store_true', - help='Update the tags only') - - parser.add_argument( - '--base_branch', - dest='base_branch', - default='master', - help='Base branch for new release') - - parser.add_argument( - '--push_only', - dest='push_only', - action='store_true', - help='Skip all of script except pushing podspecs to cpdc_internal') - - args = parser.parse_args() - return args - - -def LogOrRun(command): - """Log or run a command depending on test_mode value. - - Args: - command: command to log or run. - """ - if test_mode: - print 'Log only: {}'.format(command) - else: - os.system(command) - -def LogAndRun(command): - """Log and run a command depending on test_mode value. - - Args: - command: command to log and run. - """ - print 'Log only: {}'.format(command) - os.system(command) - - -def GetVersionData(git_root, version): - """Update version specifier in FIROptions.m. - - Args: - git_root: root of git checkout. - version: the next version to release. - Returns: - Dictionary with pod keys and version values. - """ - json_file = os.path.join(git_root, 'Releases', 'Manifests', - '{}.json'.format(version)) - if os.path.isfile(json_file): - return json.load(open(json_file)) - else: - sys.exit('Missing version file:{}'.format(json_file)) - - -def CreateReleaseBranch(release_branch, base_branch): - """Create and push the release branch. - - Args: - release_branch: the name of the git release branch. - """ - os.system('git checkout {}'.format(base_branch)) - os.system('git pull') - os.system('git checkout -b {}'.format(release_branch)) - LogOrRun('git push origin {}'.format(release_branch)) - LogOrRun('git branch --set-upstream-to=origin/{} {}'.format(release_branch, - release_branch)) - - -def UpdatePodSpecs(git_root, version_data, firebase_version): - """Update the podspecs with the right version. - - Args: - git_root: root of git checkout. - version_data: dictionary of versions to be updated. - firebase_version: the Firebase version. - """ - core_podspec = os.path.join(git_root, 'FirebaseCore.podspec') - os.system("sed -i.bak -e \"s/\\(Firebase_VERSION=\\).*'/\\1{}'/\" {}".format( - firebase_version, core_podspec)) - for pod, version in version_data.items(): - podspec = os.path.join(git_root, '{}.podspec'.format(pod)) - os.system("sed -i.bak -e \"s/\\(\\.version.*=[[:space:]]*'\\).*'/\\1{}'/\" " - '{}'.format(version, podspec)) - - -def UpdatePodfiles(git_root, version): - """Update Podfile's to reference the latest Firebase pod. - - Args: - git_root: root of git checkout. - version: the next Firebase version to release. - """ - firebase_podfile = os.path.join(git_root, 'Example', 'Podfile') - firestore_podfile = os.path.join(git_root, 'Firestore', 'Example', 'Podfile') - collision_podfile = os.path.join(git_root, 'SymbolCollisionTest', 'Podfile') - - sed_command = ("sed -i.bak -e \"s#\\(pod " - "'Firebase/CoreOnly',[[:space:]]*'\\).*'#\\1{}'#\" {}") - os.system(sed_command.format(version, firebase_podfile)) - os.system(sed_command.format(version, firestore_podfile)) - sed_command = ("sed -i.bak -e \"s#\\(pod " - "'Firebase',[[:space:]]*'\\).*'#\\1{}'#\" {}") - os.system(sed_command.format(version, collision_podfile)) - - -def GenerateTag(pod, version): - """ Generate a tag from a pod and a version. - - Args: - pod: name of the pod for which to generate the tag. - version: version of the pod to tag. - - Returns: - Tag. - """ - if pod == "Firebase": - return 'CocoaPods-{}'.format(version) - if pod.startswith("Firebase"): - return '{}-{}'.format(pod[len('Firebase'):], version) - if pod.startswith("Google"): - return '{}-{}'.format(pod[len('Google'):], version) - sys.exit("Script does not support generating a tag for {}".format(pod)) - - -def UpdateTags(version_data, first=False): - """Update tags. - - Args: - version_data: dictionary of versions to be updated. - firebase_version: the Firebase version. - first: set to true the first time the versions are set. - """ - for pod, version in version_data.items(): - tag = GenerateTag(pod, version) - if not first: - LogOrRun("git push --delete origin '{}'".format(tag)) - LogOrRun("git tag --delete '{}'".format(tag)) - LogOrRun("git tag '{}'".format(tag)) - LogOrRun("git push origin '{}'".format(tag)) - - -def CheckVersions(version_data, firebase_version): - """Ensure that versions do not already exist as tags. - - Args: - version_data: dictionary of versions to be updated. - """ - error = False - for pod, version in version_data.items(): - tag = GenerateTag(pod, version) - if pod == "Firebase": - if version != firebase_version: - sys.exit("Aborting: Release version must match Firebase pod version.") - find = subprocess.Popen( - ['git', 'tag', '-l', tag], - stdout=subprocess.PIPE).communicate()[0].rstrip() - if tag == find: - print "{} tag already exists".format(tag) - error = True - if error: - sys.exit("Aborting: Remove pre-existing tags and retry") - - -def GetCpdcInternal(): - """Find the firebase repo. - -""" - tmp_file = tempfile.mktemp() - os.system('pod repo list | grep -B2 sso://cpdc-internal/firebase | head -1 > {}' - .format(tmp_file)) - with open(tmp_file,'r') as o: - output_var = ''.join(o.readlines()).strip() - os.system('rm -rf {}'.format(tmp_file)) - return output_var - - -# TODO update PushPodspecs to push dependent pods first, like when FirebaseCore -# depends on the most recent version of GoogleUtilities. - -def PushPodspecs(version_data): - """Push podspecs to cpdc-firebase. - - Args: - version_data: dictionary of versions to be updated. - """ - pods = version_data.keys() - for pod in pods: - LogOrRun('pod cache clean {} --all'.format(pod)) - if pod == 'Firebase': - # Do the Firebase pod last - continue - if pod == 'FirebaseFirestore': - warnings_ok = ' --allow-warnings' - else: - warnings_ok = '' - - podspec = '{}.podspec'.format(pod) - LogAndRun('pod repo push --skip-tests --use-json {} {}{}' - .format(GetCpdcInternal(), podspec, warnings_ok)) - # This command will need to be rerun if any pods need to be pushed from Rapid. - LogAndRun('pod repo push --skip-tests --use-json --skip-import-validation ' + - '--sources=sso://cpdc-internal/firebase.git,https://cdn.cocoapods.org' + - ' {} Firebase.podspec {}'.format(GetCpdcInternal(), warnings_ok)) - - -def UpdateVersions(): - """UpdateVersions is the main body to create the branch and change versions. - """ - global test_mode - args = SetupArguments() - test_mode = args.test_mode - - # Validate version is proper format - major, minor, patch = args.version.split('.') - if (not major.isdigit()) or (not minor.isdigit()) or (not patch.isdigit()): - sys.exit('Invalid version parameter') - - git_root = subprocess.Popen( - ['git', 'rev-parse', '--show-toplevel'], - stdout=subprocess.PIPE).communicate()[0].rstrip().decode('utf-8') - - version_data = GetVersionData(git_root, args.version) - - if not args.push_only: - if args.tag_update: - UpdateTags(version_data) - return - - CheckVersions(version_data, args.version) - release_branch = 'release-{}'.format(args.version) - CreateReleaseBranch(release_branch, args.base_branch) - UpdatePodSpecs(git_root, version_data, args.version) - UpdatePodfiles(git_root, args.version) - - LogOrRun('git commit -am "Update versions for Release {}"' - .format(args.version)) - LogOrRun('git push origin {}'.format(release_branch)) - UpdateTags(version_data, True) - - PushPodspecs(version_data) - - -if __name__ == '__main__': - UpdateVersions() diff --git a/scripts/build_non_firebase_sdks.sh b/scripts/build_non_firebase_sdks.sh index ec9a42886d0..17760942d0b 100755 --- a/scripts/build_non_firebase_sdks.sh +++ b/scripts/build_non_firebase_sdks.sh @@ -16,7 +16,7 @@ set -ex -cd "${REPO}"/ZipBuilder +cd "${REPO}"/ReleaseTooling # This file will have non Firebase SDKs that will be built by ZipBuilder. ZIP_POD_JSON="non_firebase_sdk.json" @@ -35,7 +35,7 @@ do done echo "]" >> "${ZIP_POD_JSON}" mkdir -p "${REPO}"/sdk_zip -swift run ReleasePackager -keepBuildArtifacts true -updatePodRepo true -templateDir "${REPO}"/ZipBuilder/Template -zipPods "${ZIP_POD_JSON}" -outputDir "${REPO}"/sdk_zip -buildDependencies false +swift run zip-builder -keepBuildArtifacts true -updatePodRepo true -templateDir "${REPO}"/ReleaseTooling/Template -zipPods "${ZIP_POD_JSON}" -outputDir "${REPO}"/sdk_zip -buildDependencies false unzip -o "${REPO}"/sdk_zip/Frameworks.zip -d "${HOME}"/ios_frameworks/Firebase/ diff --git a/scripts/build_zip.sh b/scripts/build_zip.sh index bda3ef29740..34168dbfd9d 100755 --- a/scripts/build_zip.sh +++ b/scripts/build_zip.sh @@ -25,7 +25,7 @@ fi # output directory. OUTPUT_DIR="$REPO/$1" -cd ZipBuilder -swift run ReleasePackager -keepBuildArtifacts true -updatePodRepo true \ - -templateDir "${REPO}"/ZipBuilder/Template -localPodspecPath "${REPO}" \ +cd ReleaseToolings +swift run zip-builder -keepBuildArtifacts true -updatePodRepo true \ + -templateDir "${REPO}"/ReleaseTooling/Template -localPodspecPath "${REPO}" \ -outputDir "${OUTPUT_DIR}" -customSpecRepos https://github.com/firebase/SpecsStaging.git diff --git a/scripts/check_whitespace.sh b/scripts/check_whitespace.sh index 53b697264b3..561ac29d0ed 100755 --- a/scripts/check_whitespace.sh +++ b/scripts/check_whitespace.sh @@ -40,10 +40,9 @@ git grep "${options[@]}" -- \ ':(exclude)Firestore/third_party/abseil-cpp' \ ':(exclude)GoogleDataTransport/GDTCCTLibrary/Protogen/nanopb' \ ':(exclude)GoogleDataTransport/ProtoSupport' \ - ':(exclude)ZipBuilder/Template/NOTICES' + ':(exclude)ReleaseTooling/Template/NOTICES' if [[ $? == 0 ]]; then echo "ERROR: Trailing whitespace found in the files above. Please fix." exit 1 fi - From 3e8e572e22847ffd96ebb1f1ffc7889e92b0cd90 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 19 Oct 2020 14:33:33 -0700 Subject: [PATCH 2/9] Missing SwiftPM beta annotations (#6777) --- Package.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 0a96adc259a..a72b3af0ef7 100644 --- a/Package.swift +++ b/Package.swift @@ -53,7 +53,7 @@ let package = Package( targets: ["FirebaseFirestoreTarget"] ), .library( - name: "FirebaseFirestoreSwift", + name: "FirebaseFirestoreSwift-Beta", targets: ["FirebaseFirestoreSwiftTarget"] ), .library( @@ -81,7 +81,7 @@ let package = Package( targets: ["FirebaseStorage"] ), .library( - name: "FirebaseStorageSwift", + name: "FirebaseStorageSwift-Beta", targets: ["FirebaseStorageSwift"] ), From 12c567b145a8b26713e8ebe16b8e99daf3557e5b Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 19 Oct 2020 19:09:19 -0700 Subject: [PATCH 3/9] Fix CI after #6777 (#6780) --- .github/workflows/firestore.yml | 2 +- .github/workflows/storage.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 7211755d74f..bc06261b799 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -205,7 +205,7 @@ jobs: - name: iOS Build Test run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore iOS spmbuildonly - name: Swift Build - run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift iOS spmbuildonly + run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift-Beta iOS spmbuildonly spm-cron: # Don't run on private repo. diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index d9cd681832f..6fa8b70d388 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -54,7 +54,7 @@ jobs: - name: iOS Unit Tests run: scripts/third_party/travis/retry.sh ./scripts/build.sh StorageUnit iOS spm - name: Swift Build - run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageSwift iOS spmbuildonly + run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseStorageSwift-Beta iOS spmbuildonly spm-cron: # Don't run on private repo. From 9404f28856d76606d7e9434033b2d396f5c5aa65 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 19 Oct 2020 19:39:56 -0700 Subject: [PATCH 4/9] Fix a memory leak introduced in #6418 (#6778) (#6779) The root of the issue is that when serializing a singular filter, it is being treated as a unary filter before it is definitively established whether it is a unary filter or a field filter. The leak is caused by always serializing the unary filter's field path field for equality and non-equality filters -- if the filter's value turns out not to be NaN or null, the serialization code switches the filter's type to a field filter without clearing the partially-initialized unary filter. `pb_release` would not free the `unary_filter.field.field_path` member variable because it would consider the object not to be a unary filter. Also a small refactoring to make the function easier to digest. Co-authored-by: Konstantin Varlamov --- Firestore/CHANGELOG.md | 2 ++ Firestore/core/src/remote/serializer.cc | 24 ++++++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Firestore/CHANGELOG.md b/Firestore/CHANGELOG.md index 619bc387af6..14b936637d5 100644 --- a/Firestore/CHANGELOG.md +++ b/Firestore/CHANGELOG.md @@ -5,6 +5,8 @@ setting. Timestamp fields that read from a `FIRDocumentSnapshot` now always return `FIRTimestamp` objects. Use `FIRTimestamp.dateValue` to convert to `NSDate` if required. +- [fixed] Fixed a memory leak introduced in 1.18.0 that may manifest when + serializing queries containing equality or non-equality comparisons. # v1.19.0 - [changed] Internal improvements for future C++ and Unity support. Includes a diff --git a/Firestore/core/src/remote/serializer.cc b/Firestore/core/src/remote/serializer.cc index ff3030bf078..cd708ec3657 100644 --- a/Firestore/core/src/remote/serializer.cc +++ b/Firestore/core/src/remote/serializer.cc @@ -1102,30 +1102,34 @@ google_firestore_v1_StructuredQuery_Filter Serializer::EncodeSingularFilter( const FieldFilter& filter) const { google_firestore_v1_StructuredQuery_Filter result{}; - if (filter.op() == Filter::Operator::Equal || - filter.op() == Filter::Operator::NotEqual) { + bool is_unary = (filter.op() == Filter::Operator::Equal || + filter.op() == Filter::Operator::NotEqual) && + (filter.value().is_nan() || filter.value().is_null()); + if (is_unary) { result.which_filter_type = google_firestore_v1_StructuredQuery_Filter_unary_filter_tag; result.unary_filter.which_operand_type = google_firestore_v1_StructuredQuery_UnaryFilter_field_tag; result.unary_filter.field.field_path = EncodeFieldPath(filter.field()); + bool is_equality = filter.op() == Filter::Operator::Equal; if (filter.value().is_nan()) { - auto op = - filter.op() == Filter::Operator::Equal + result.unary_filter.op = + is_equality ? google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NAN : google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NOT_NAN; // NOLINT - result.unary_filter.op = op; - return result; } else if (filter.value().is_null()) { - auto op = - filter.op() == Filter::Operator::Equal + result.unary_filter.op = + is_equality ? google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NULL : google_firestore_v1_StructuredQuery_UnaryFilter_Operator_IS_NOT_NULL; // NOLINT - result.unary_filter.op = op; - return result; + + } else { + HARD_FAIL("Expected a unary filter"); } + + return result; } result.which_filter_type = From eb815c632b9519f6de3475ee8b72869e602bdc93 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 21 Oct 2020 06:49:34 -0700 Subject: [PATCH 5/9] Add publish option to release tooling (#6792) --- .../Sources/FirebaseReleaser/Push.swift | 32 ++++++++++++++++--- .../Sources/FirebaseReleaser/main.swift | 13 ++++++-- scripts/build_zip.sh | 2 +- 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/ReleaseTooling/Sources/FirebaseReleaser/Push.swift b/ReleaseTooling/Sources/FirebaseReleaser/Push.swift index 2c18b2849f8..f480e882721 100644 --- a/ReleaseTooling/Sources/FirebaseReleaser/Push.swift +++ b/ReleaseTooling/Sources/FirebaseReleaser/Push.swift @@ -19,18 +19,40 @@ import Foundation import FirebaseManifest import Utils +private enum Destination { + case cpdc, trunk +} + enum Push { static func pushPodsToCPDC(gitRoot: URL) { + push(to: .cpdc, gitRoot: gitRoot) + } + + static func publishPodsToTrunk(gitRoot: URL) { + push(to: .trunk, gitRoot: gitRoot) + } + + private static func push(to destination: Destination, gitRoot: URL) { let cpdcLocation = findCpdc(gitRoot: gitRoot) let manifest = FirebaseManifest.shared for pod in manifest.pods.filter({ $0.releasing }) { - let warningsOK = pod.allowWarnings ? " --allow-warnings" : "" + let warningsOK = pod.allowWarnings ? "--allow-warnings" : "" + + let command: String = { + switch destination { + case .cpdc: + return "pod repo push --skip-tests --use-json \(warningsOK) \(cpdcLocation) " + + pod.skipImportValidation() + " \(pod.podspecName()) " + + "--sources=sso://cpdc-internal/firebase.git,https://cdn.cocoapods.org" - Shell.executeCommand("pod repo push --skip-tests --use-json \(warningsOK) \(cpdcLocation) " + - pod.skipImportValidation() + " \(pod.podspecName()) " + - "--sources=sso://cpdc-internal/firebase.git,https://cdn.cocoapods.org", - workingDir: gitRoot) + case .trunk: + return "pod trunk push --skip-tests --synchronous \(warningsOK) " + + pod.skipImportValidation() + " ~/.cocoapods/repos/\(cpdcLocation)/Specs/\(pod.name)/" + + "\(manifest.versionString(pod))/\(pod.name).podspec.json" + } + }() + Shell.executeCommand(command, workingDir: gitRoot) } } diff --git a/ReleaseTooling/Sources/FirebaseReleaser/main.swift b/ReleaseTooling/Sources/FirebaseReleaser/main.swift index 1617c0bcede..78ac6eef7d6 100644 --- a/ReleaseTooling/Sources/FirebaseReleaser/main.swift +++ b/ReleaseTooling/Sources/FirebaseReleaser/main.swift @@ -38,7 +38,12 @@ struct FirebaseReleaser: ParsableCommand { help: "Initialize the release branch") var initBranch: Bool - /// Set this option to update podspecs only. + /// Set this option to output the commands to generate the ordered `pod trunk push` commands. + @Option(default: false, + help: "Publish the podspecs to the CocoaPodsTrunk") + var publish: Bool + + /// Set this option to only update the podspecs on cpdc. @Option(default: false, help: "Update the podspecs only") var pushOnly: Bool @@ -68,10 +73,12 @@ struct FirebaseReleaser: ParsableCommand { workingDir: gitRoot) Tags.createTags(gitRoot: gitRoot) Push.pushPodsToCPDC(gitRoot: gitRoot) - } else if pushOnly { - Push.pushPodsToCPDC(gitRoot: gitRoot) } else if updateTagsOnly { Tags.updateTags(gitRoot: gitRoot) + } else if pushOnly { + Push.pushPodsToCPDC(gitRoot: gitRoot) + } else if publish { + Push.publishPodsToTrunk(gitRoot: gitRoot) } } diff --git a/scripts/build_zip.sh b/scripts/build_zip.sh index 34168dbfd9d..ef9a3bbc31a 100755 --- a/scripts/build_zip.sh +++ b/scripts/build_zip.sh @@ -25,7 +25,7 @@ fi # output directory. OUTPUT_DIR="$REPO/$1" -cd ReleaseToolings +cd ReleaseTooling swift run zip-builder -keepBuildArtifacts true -updatePodRepo true \ -templateDir "${REPO}"/ReleaseTooling/Template -localPodspecPath "${REPO}" \ -outputDir "${OUTPUT_DIR}" -customSpecRepos https://github.com/firebase/SpecsStaging.git From 0be893dddfdd1accc190f233cd04d09fb1b10b4a Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 21 Oct 2020 09:59:45 -0700 Subject: [PATCH 6/9] M82 SPM Analytics update (#6796) --- Package.swift | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index a72b3af0ef7..aa0d6a20b91 100644 --- a/Package.swift +++ b/Package.swift @@ -229,18 +229,18 @@ let package = Package( ), .binaryTarget( name: "FirebaseAnalytics", - url: "https://dl.google.com/firebase/ios/swiftpm/6.34.0/FirebaseAnalytics.zip", - checksum: "48aee46798b06ab4dbe6241541ba21ebdfe449e343c34a07845a67b6b328c4e2" + url: "https://dl.google.com/firebase/ios/swiftpm/7.0.0/FirebaseAnalytics.zip", + checksum: "52fce991295d5de9fd5f4a821544d7489bc4fdaed7189f7aef24487305d7d527" ), .binaryTarget( name: "FIRAnalyticsConnector", - url: "https://dl.google.com/firebase/ios/swiftpm/6.34.0/FIRAnalyticsConnector.zip", - checksum: "b3818c2cac2f2f780eacf33ace7bd1632b477060670a21ca3d1b423991c08ca1" + url: "https://dl.google.com/firebase/ios/swiftpm/7.0.0/FIRAnalyticsConnector.zip", + checksum: "06833c004316891f188e5bdbdb48e4c3aa9dafa832cfe73af21b482941b67ec3" ), .binaryTarget( name: "GoogleAppMeasurement", - url: "https://dl.google.com/firebase/ios/swiftpm/6.34.0/GoogleAppMeasurement.zip", - checksum: "05f6d2da2aa072781826be135498c6e1730ed43519c2232e01c5f043f5fe7189" + url: "https://dl.google.com/firebase/ios/swiftpm/7.0.0/GoogleAppMeasurement.zip", + checksum: "8e7cccef0f97069c1e17c4a7b53580d32dc8da80053c158313e3f28991265163" ), .target( From 4368b98e4a545d7491a29396a60a2f53fc3c930d Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 21 Oct 2020 15:06:14 -0700 Subject: [PATCH 7/9] Fixed broken callback to AppDelegate (#6800) (#6801) Fixed broken callback to AppDelegate after retrieving a dynamic link during fresh app start. The AppDelegate call was broken in PR : #6517 Reverting to the old implementation of dynamic link passing to App delegate with changes to remove iOS 9 checks. Using new "openURL" method instead of the deprecated one. Clean up in the sample app pod file. Co-authored-by: Eldhose M Babu --- FirebaseDynamicLinks/Sources/FIRDynamicLinks.m | 9 +++++++++ FirebaseDynamicLinks/Tests/Sample/Podfile | 14 +++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m index f7a8322085e..acd5665e21a 100644 --- a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m +++ b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m @@ -509,6 +509,15 @@ - (BOOL)handleIncomingCustomSchemeDeepLink:(NSURL *)url { } - (void)passRetrievedDynamicLinkToApplication:(NSURL *)url { + id applicationDelegate = [UIApplication sharedApplication].delegate; + if (applicationDelegate && + [applicationDelegate respondsToSelector:@selector(application:openURL:options:)]) { + // pass url directly to application delegate to avoid hop into + // iOS handling of the universal links + [applicationDelegate application:[UIApplication sharedApplication] openURL:url options:@{}]; + return; + } + [[UIApplication sharedApplication] openURL:url options:@{} completionHandler:nil]; } diff --git a/FirebaseDynamicLinks/Tests/Sample/Podfile b/FirebaseDynamicLinks/Tests/Sample/Podfile index d56705a812d..57375341202 100644 --- a/FirebaseDynamicLinks/Tests/Sample/Podfile +++ b/FirebaseDynamicLinks/Tests/Sample/Podfile @@ -1,14 +1,10 @@ -# Uncomment the next line to define a global platform for your project -# platform :ios, '9.0' - target 'FDLBuilderTestAppObjC' do - # Comment the next line if you don't want to use dynamic frameworks + platform :ios, '10.0' use_frameworks! - pod 'FirebaseAnalytics' + pod 'FirebaseCore', :path => '../../../' - pod 'FirebaseInstallations', :path => '../../../' - pod 'FirebaseInstanceID', :path => '../../../' - pod 'FirebaseDynamicLinks', :path => '../../../' + pod 'FirebaseCoreDiagnostics', :path => '../../../' + pod 'GoogleDataTransport', :path => '../../../' pod 'GoogleUtilities', :path => '../../../' - + pod 'FirebaseDynamicLinks', :path => '../../../' end From c887ea1a8de22bbd980e2aca0ac51bb074201b96 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Thu, 22 Oct 2020 08:58:33 -0700 Subject: [PATCH 8/9] Update SPM Analytics (#6805) --- Package.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Package.swift b/Package.swift index aa0d6a20b91..3d9315e3ac9 100644 --- a/Package.swift +++ b/Package.swift @@ -230,17 +230,17 @@ let package = Package( .binaryTarget( name: "FirebaseAnalytics", url: "https://dl.google.com/firebase/ios/swiftpm/7.0.0/FirebaseAnalytics.zip", - checksum: "52fce991295d5de9fd5f4a821544d7489bc4fdaed7189f7aef24487305d7d527" + checksum: "8d835a816ec3f279d76d0d164f0b6fc0827239e26ed59a1acd277ed40d26243f" ), .binaryTarget( name: "FIRAnalyticsConnector", url: "https://dl.google.com/firebase/ios/swiftpm/7.0.0/FIRAnalyticsConnector.zip", - checksum: "06833c004316891f188e5bdbdb48e4c3aa9dafa832cfe73af21b482941b67ec3" + checksum: "bdbf31a06ef741456bd386ad3f10529103953c330771d140e021e5a467d89395" ), .binaryTarget( name: "GoogleAppMeasurement", url: "https://dl.google.com/firebase/ios/swiftpm/7.0.0/GoogleAppMeasurement.zip", - checksum: "8e7cccef0f97069c1e17c4a7b53580d32dc8da80053c158313e3f28991265163" + checksum: "50fd6e762fc44f92a835bebf34ce8ecc9589ef34681be1cb41779bec9e44e652" ), .target( From ab758f2ac842b12560354af0526e21d73235d4d3 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Thu, 22 Oct 2020 14:26:59 -0700 Subject: [PATCH 9/9] Speed up retagging (#6806) --- ReleaseTooling/Sources/FirebaseReleaser/Tags.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift b/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift index 94c88a94a38..40006328d3b 100644 --- a/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift +++ b/ReleaseTooling/Sources/FirebaseReleaser/Tags.swift @@ -21,6 +21,9 @@ import Utils enum Tags { static func createTags(gitRoot: URL, deleteExistingTags: Bool = false) { + if deleteExistingTags { + verifyTagsAreSafeToDelete(gitRoot: gitRoot) + } let manifest = FirebaseManifest.shared createTag(gitRoot: gitRoot, tag: "CocoaPods-\(manifest.version)", deleteExistingTags: deleteExistingTags) @@ -45,7 +48,6 @@ enum Tags { private static func createTag(gitRoot: URL, tag: String, deleteExistingTags: Bool) { if deleteExistingTags { - verifyTagsAreSafeToDelete(gitRoot: gitRoot) Shell.executeCommand("git tag --delete \(tag)", workingDir: gitRoot) Shell.executeCommand("git push --delete origin \(tag)", workingDir: gitRoot) } else {