From 560dedc524514be5d159e0c21e648fadc3c871f5 Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Thu, 19 Nov 2026 09:39:28 +0000 Subject: [PATCH 1/3] fix(apple): resolve one Firebase iOS SDK version from firebase_core Plugins published against different exact pins cannot be resolved together, and pub never sees that Swift package constraint. Keep the exact pin on firebase_core and let the other plugins accept any version in that major. --- .../ios/cloud_firestore/Package.swift | 3 +- .../macos/cloud_firestore/Package.swift | 3 +- .../ios/cloud_functions/Package.swift | 4 +- .../macos/cloud_functions/Package.swift | 4 +- .../ios/firebase_analytics/Package.swift | 4 +- .../macos/firebase_analytics/Package.swift | 4 +- .../ios/firebase_app_check/Package.swift | 4 +- .../macos/firebase_app_check/Package.swift | 4 +- .../firebase_app_installations/Package.swift | 4 +- .../firebase_app_installations/Package.swift | 4 +- .../ios/firebase_auth/Package.swift | 3 +- .../macos/firebase_auth/Package.swift | 3 +- .../ios/firebase_crashlytics/Package.swift | 4 +- .../macos/firebase_crashlytics/Package.swift | 4 +- .../ios/firebase_database/Package.swift | 3 +- .../macos/firebase_database/Package.swift | 3 +- .../firebase_in_app_messaging/Package.swift | 4 +- .../ios/firebase_messaging/Package.swift | 3 +- .../macos/firebase_messaging/Package.swift | 3 +- .../ios/firebase_performance/Package.swift | 3 +- .../ios/firebase_remote_config/Package.swift | 4 +- .../firebase_remote_config/Package.swift | 4 +- .../ios/firebase_storage/Package.swift | 3 +- .../macos/firebase_storage/Package.swift | 3 +- scripts/generate_versions_spm.dart | 87 +++++++-- scripts/generate_versions_spm_test.dart | 183 ++++++++++++++++++ scripts/verify_spm_sdk_pin.sh | 177 +++++++++++++++++ 27 files changed, 459 insertions(+), 73 deletions(-) create mode 100644 scripts/generate_versions_spm_test.dart create mode 100755 scripts/verify_spm_sdk_pin.sh diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift index fc45b7e96375..8f9abceae76b 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "7.2.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "cloud_firestore", @@ -19,7 +18,7 @@ let package = Package( .library(name: "cloud-firestore", targets: ["cloud_firestore"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift index 5852edd3a341..d2074044b83d 100644 --- a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "7.2.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "cloud_firestore", @@ -19,7 +18,7 @@ let package = Package( .library(name: "cloud-firestore", targets: ["cloud_firestore"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift index cf11c02b3f6c..31d28c50bd14 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "cloud_functions", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "cloud-functions", targets: ["cloud_functions"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift b/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift index 9939dac895c6..5029737d1691 100644 --- a/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "cloud_functions", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "cloud-functions", targets: ["cloud_functions"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift index 9270294ec5a3..5e1fa4b889b7 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift @@ -8,8 +8,6 @@ import Foundation import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - // Set FIREBASE_ANALYTICS_WITHOUT_ADID=true to use FirebaseAnalyticsCore. // e.g. FIREBASE_ANALYTICS_WITHOUT_ADID=true flutter build ios let useWithoutAdId = ProcessInfo.processInfo.environment["FIREBASE_ANALYTICS_WITHOUT_ADID"] != nil @@ -24,7 +22,7 @@ let package = Package( .library(name: "firebase-analytics", targets: ["firebase_analytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift b/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift index c5e0423c1e5f..f44ffd0d7041 100644 --- a/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift +++ b/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_analytics", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-analytics", targets: ["firebase_analytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift index 975bc45cf49b..dd5bd8878104 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift +++ b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_app_check", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-app-check", targets: ["firebase_app_check"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package( url: "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git", from: "18.0.0" diff --git a/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift b/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift index 0856fac16f53..d313aa6e0a47 100644 --- a/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift +++ b/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_app_check", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-app-check", targets: ["firebase_app_check"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift index bf10786ce856..df38d1c76f17 100644 --- a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift +++ b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_app_installations", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift b/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift index 9b3cee2f74ad..dd2d9983f156 100644 --- a/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift +++ b/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_app_installations", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift index 5df3e82e3676..de6b32234d42 100644 --- a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "7.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_auth", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-auth", targets: ["firebase_auth"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift index 4667e4d90640..14c0bf9423bb 100644 --- a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "7.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_auth", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-auth", targets: ["firebase_auth"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift index e74bedb6ca0f..58157b8ef2cc 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_crashlytics", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift b/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift index bbfc4c6e803c..a114c9d88c35 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_crashlytics", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift index e375efd33c56..96bf07aff4da 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "13.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_database", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-database", targets: ["firebase_database"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift b/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift index 54c72ccba5ce..5a15a7545945 100644 --- a/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "13.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_database", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-database", targets: ["firebase_database"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift index 4a46e9632f12..a04b415238bb 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_in_app_messaging", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-in-app-messaging", targets: ["firebase_in_app_messaging"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift index 0dd1255cdf34..3a52920ff894 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "17.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_messaging", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-messaging", targets: ["firebase_messaging"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift index b163ea053e4a..76166a4bbd5b 100644 --- a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "17.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_messaging", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-messaging", targets: ["firebase_messaging"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift index 2682f9ccb557..7e5b4289f455 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "0.12.2" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_performance", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-performance", targets: ["firebase_performance"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift index b70d5b1290d0..af34bbd8a6f9 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_remote_config", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift b/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift index 333498d5c29c..f353005c5d47 100644 --- a/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift +++ b/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift @@ -7,8 +7,6 @@ import PackageDescription -let firebaseSdkVersion: Version = "13.2.0" - let package = Package( name: "firebase_remote_config", platforms: [ @@ -18,7 +16,7 @@ let package = Package( .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift index a949d8278bb0..041381e0c3ac 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "14.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_storage", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-storage", targets: ["firebase_storage"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift b/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift index c64b6b28ee32..3c19008e4519 100644 --- a/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift @@ -8,7 +8,6 @@ import PackageDescription let libraryVersion = "14.1.0" -let firebaseSdkVersion: Version = "13.2.0" let package = Package( name: "firebase_storage", @@ -19,7 +18,7 @@ let package = Package( .library(name: "firebase-storage", targets: ["firebase_storage"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/scripts/generate_versions_spm.dart b/scripts/generate_versions_spm.dart index 993a1bec0e13..e961bb5029fd 100644 --- a/scripts/generate_versions_spm.dart +++ b/scripts/generate_versions_spm.dart @@ -6,7 +6,9 @@ import 'package:melos/melos.dart' as melos; import 'package:glob/glob.dart'; + import 'dart:io'; + import 'package:cli_util/cli_logging.dart' as logging; import 'package:yaml/yaml.dart'; @@ -17,7 +19,8 @@ import 'firebase_sdk_version_spm.dart'; void main(List args) async { final workspace = await getMelosWorkspace(); - // Update hard-coded versions in all plugin Package.swift files. + // firebase_core keeps an exact pin. Other plugins accept any version in + // that major, so SwiftPM can select the pin from firebase_core. // CocoaPods keeps its own pin in firebase_sdk_version.rb. updatePluginPackageSwiftVersions(workspace, firebaseSpmSdkVersion); // Update plugin version in Constants.swift for pure Swift plugins. Unable to pass macros in pure Swift implementations @@ -27,11 +30,7 @@ void main(List args) async { Future getMelosWorkspace() async { final packageFilters = melos.PackageFilters( includePrivatePackages: false, - ignore: [ - Glob('*web*'), - Glob('*platform*'), - Glob('*internals*'), - ], + ignore: [Glob('*web*'), Glob('*platform*'), Glob('*internals*')], ); final workspace = await melos.MelosWorkspace.fromConfig( await melos.MelosWorkspaceConfig.fromWorkspaceRoot(Directory.current), @@ -41,23 +40,87 @@ Future getMelosWorkspace() async { return workspace; } +/// Rewrites the `firebase-ios-sdk` requirement in one `Package.swift`. +/// +/// [pinExact] is true for `firebase_core`, which is the package every other +/// plugin depends on. Its exact version is the one SwiftPM must select. +/// Other plugins get `from: ".0.0"` so a plugin published against an +/// older patch in the same major can resolve together with that pin. +String rewritePackageSwiftFirebaseSdkPin( + String content, { + required String sdkVersion, + required bool pinExact, +}) { + final requirement = pinExact + ? '.package(url: "$_firebaseIosSdkUrl", exact: firebaseSdkVersion)' + : '.package(url: "$_firebaseIosSdkUrl", from: "${_spmMajorFloor(sdkVersion)}")'; + + if (!content.contains(_firebaseSdkRequirement)) { + if (content.contains('firebase-ios-sdk')) { + throw StateError( + 'Package.swift depends on firebase-ios-sdk in a form this generator ' + 'does not know how to rewrite.', + ); + } + return content; + } + + content = content.replaceAll(_firebaseSdkRequirement, requirement); + + if (pinExact) { + if (!content.contains('let firebaseSdkVersion: Version =')) { + throw StateError( + 'firebase_core Package.swift is missing its firebaseSdkVersion pin.', + ); + } + return content.replaceAll( + RegExp(r'let firebaseSdkVersion: Version = "[^"]+"'), + 'let firebaseSdkVersion: Version = "$sdkVersion"', + ); + } + + content = content.replaceFirst( + RegExp(r'\nlet firebaseSdkVersion: Version = "[^"]+"\n'), + '\n', + ); + return content.replaceAll(RegExp(r'\n{3,}'), '\n\n'); +} + +/// `13.2.0` -> `13.0.0`. `from` already stops before the next major. +String _spmMajorFloor(String sdkVersion) { + final major = sdkVersion.split('.').first; + if (int.tryParse(major) == null) { + throw FormatException( + 'Invalid Swift Package Manager SDK version: $sdkVersion', + ); + } + return '$major.0.0'; +} + +const _firebaseIosSdkUrl = 'https://github.com/firebase/firebase-ios-sdk'; + +final _firebaseSdkRequirement = RegExp( + r'\.package\(url: "https://github.com/firebase/firebase-ios-sdk", (?:exact: firebaseSdkVersion|from: "[0-9]+\.[0-9]+\.[0-9]+")\)', +); + void updatePluginPackageSwiftVersions( melos.MelosWorkspace workspace, String firebaseiOSVersion, ) { for (final package in workspace.filteredPackages.values) { for (final platform in ['ios', 'macos']) { - final packageSwiftFile = - File('${package.path}/$platform/${package.name}/Package.swift'); + final packageSwiftFile = File( + '${package.path}/$platform/${package.name}/Package.swift', + ); if (!packageSwiftFile.existsSync()) continue; var content = packageSwiftFile.readAsStringSync(); - // Update firebaseSdkVersion (matches Package.swift naming). - content = content.replaceAll( - RegExp(r'let firebaseSdkVersion: Version = "[^"]+"'), - 'let firebaseSdkVersion: Version = "$firebaseiOSVersion"', + content = rewritePackageSwiftFirebaseSdkPin( + content, + sdkVersion: firebaseiOSVersion, + pinExact: package.name == 'firebase_core', ); // Update libraryVersion / libraryVersionString from pubspec version. diff --git a/scripts/generate_versions_spm_test.dart b/scripts/generate_versions_spm_test.dart new file mode 100644 index 000000000000..83279bd6a76e --- /dev/null +++ b/scripts/generate_versions_spm_test.dart @@ -0,0 +1,183 @@ +// Copyright 2026, the Chromium project authors. Please see the AUTHORS file +// for details. All rights reserved. Use of this source code is governed by a +// BSD-style license that can be found in the LICENSE file. + +import 'dart:io'; + +import 'generate_versions_spm.dart'; + +void main() { + _pluginDropsItsExactPin(); + _analyticsDropsItsPinWithoutADoubleBlank(); + _pluginFloorFollowsTheNextMajor(); + _coreKeepsAnExactPin(); + _rewriteIsIdempotent(); + _manifestWithoutTheSdkIsLeftAlone(); + if (exitCode != 0) { + stderr.writeln('generate_versions_spm_test failed'); + } +} + +const _plugin = ''' +let libraryVersion = "7.1.0" +let firebaseSdkVersion: Version = "12.15.0" + +let package = Package( + dependencies: [ + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + ], +) +'''; + +const _core = ''' +let libraryVersionString = "5.1.0" +let firebaseSdkVersion: Version = "13.1.1" + +let package = Package( + dependencies: [ + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + ], +) +'''; + +void _pluginDropsItsExactPin() { + final rewritten = rewritePackageSwiftFirebaseSdkPin( + _plugin, + sdkVersion: '13.2.0', + pinExact: false, + ); + _expect(rewritten, ''' +let libraryVersion = "7.1.0" + +let package = Package( + dependencies: [ + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + ], +) +''', 'plugin uses the current major as a floor'); + if (rewritten.contains('firebaseSdkVersion') || + rewritten.contains('exact:')) { + _fail('plugin rewrite still carries an exact pin'); + } +} + +void _analyticsDropsItsPinWithoutADoubleBlank() { + const manifest = ''' +import Foundation +import PackageDescription + +let firebaseSdkVersion: Version = "13.2.0" + +// Set FIREBASE_ANALYTICS_WITHOUT_ADID=true to use FirebaseAnalyticsCore. +let package = Package( + dependencies: [ + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + ], +) +'''; + final rewritten = rewritePackageSwiftFirebaseSdkPin( + manifest, + sdkVersion: '13.2.0', + pinExact: false, + ); + _expect(rewritten, ''' +import Foundation +import PackageDescription + +// Set FIREBASE_ANALYTICS_WITHOUT_ADID=true to use FirebaseAnalyticsCore. +let package = Package( + dependencies: [ + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + ], +) +''', 'analytics keeps a single blank line where the pin was'); +} + +void _pluginFloorFollowsTheNextMajor() { + final onThirteen = rewritePackageSwiftFirebaseSdkPin( + _plugin, + sdkVersion: '13.2.0', + pinExact: false, + ); + final onFourteen = rewritePackageSwiftFirebaseSdkPin( + onThirteen, + sdkVersion: '14.0.0', + pinExact: false, + ); + if (!onFourteen.contains('from: "14.0.0"') || + onFourteen.contains('from: "13.0.0"')) { + _fail('major bump did not move the floor to 14.0.0:\n$onFourteen'); + } +} + +void _coreKeepsAnExactPin() { + final rewritten = rewritePackageSwiftFirebaseSdkPin( + _core, + sdkVersion: '13.2.0', + pinExact: true, + ); + _expect(rewritten, ''' +let libraryVersionString = "5.1.0" +let firebaseSdkVersion: Version = "13.2.0" + +let package = Package( + dependencies: [ + .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion), + ], +) +''', 'core keeps the exact pin and updates it'); +} + +void _manifestWithoutTheSdkIsLeftAlone() { + const manifest = ''' +let package = Package( + name: "firebase_ai", + dependencies: [ + .package(name: "FlutterFramework", path: "../FlutterFramework") + ], +) +'''; + final rewritten = rewritePackageSwiftFirebaseSdkPin( + manifest, + sdkVersion: '13.2.0', + pinExact: false, + ); + _expect(rewritten, manifest, 'a manifest without the SDK is unchanged'); +} + +void _rewriteIsIdempotent() { + final plugin = rewritePackageSwiftFirebaseSdkPin( + _plugin, + sdkVersion: '13.2.0', + pinExact: false, + ); + final pluginAgain = rewritePackageSwiftFirebaseSdkPin( + plugin, + sdkVersion: '13.2.0', + pinExact: false, + ); + _expect(pluginAgain, plugin, 'plugin rewrite is idempotent'); + + final core = rewritePackageSwiftFirebaseSdkPin( + _core, + sdkVersion: '13.2.0', + pinExact: true, + ); + final coreAgain = rewritePackageSwiftFirebaseSdkPin( + core, + sdkVersion: '13.2.0', + pinExact: true, + ); + _expect(coreAgain, core, 'core rewrite is idempotent'); +} + +void _expect(String actual, String expected, String label) { + if (actual != expected) { + _fail('$label\nexpected:\n$expected\nactual:\n$actual'); + } +} + +void _fail(String message) { + stderr.writeln(message); + exitCode = 1; +} diff --git a/scripts/verify_spm_sdk_pin.sh b/scripts/verify_spm_sdk_pin.sh new file mode 100755 index 000000000000..78ef253dd0da --- /dev/null +++ b/scripts/verify_spm_sdk_pin.sh @@ -0,0 +1,177 @@ +# Copyright 2026, the Chromium project authors. Please see the AUTHORS file +# for details. All rights reserved. Use of this source code is governed by a +# BSD-style license that can be found in the LICENSE file. + +# Resolves two Swift package graphs against a local git repo tagged 13.0.0, +# 13.1.1, and 13.2.0. +# +# The published firebase-ios-sdk pin is 13.2.0, which is also the newest 13.x +# tag, so resolving the real packages cannot show that an exact pin held the +# resolver back. This fixture pins core at 13.1.1 while the other package +# allows any 13.x. The resolved version has to be 13.1.1. A second graph, where +# core also uses `from: "13.0.0"`, has to select 13.2.0. + +set -eu + +root=$(mktemp -d) +trap 'rm -rf "$root"' EXIT + +sdk="$root/firebase-ios-sdk" +mkdir -p "$sdk/Sources/FirebaseCore" + +cat >"$sdk/Package.swift" <<'EOF' +// swift-tools-version: 5.9 +import PackageDescription +let package = Package( + name: "firebase-ios-sdk", + products: [ + .library(name: "FirebaseCore", targets: ["FirebaseCore"]) + ], + targets: [ + .target(name: "FirebaseCore") + ] +) +EOF + +cat >"$sdk/Sources/FirebaseCore/FirebaseCore.swift" <<'EOF' +public enum FirebaseCoreMarker {} +EOF + +git -C "$sdk" init -q +git -C "$sdk" add . +git -C "$sdk" -c user.email="spm-pin@example.com" -c user.name="spm-pin" commit -qm "13.0.0" +git -C "$sdk" tag 13.0.0 +printf '\n// 13.1.1\n' >>"$sdk/Sources/FirebaseCore/FirebaseCore.swift" +git -C "$sdk" add . +git -C "$sdk" -c user.email="spm-pin@example.com" -c user.name="spm-pin" commit -qm "13.1.1" +git -C "$sdk" tag 13.1.1 +printf '\n// 13.2.0\n' >>"$sdk/Sources/FirebaseCore/FirebaseCore.swift" +git -C "$sdk" add . +git -C "$sdk" -c user.email="spm-pin@example.com" -c user.name="spm-pin" commit -qm "13.2.0" +git -C "$sdk" tag 13.2.0 + +write_graph() { + name="$1" + core_requirement="$2" + dir="$root/$name" + mkdir -p "$dir/core/Sources/core" "$dir/plugin/Sources/plugin" "$dir/app/Sources/app" + + cat >"$dir/core/Package.swift" <"$dir/core/Sources/core/Core.swift" <<'EOF' +public enum CoreMarker {} +EOF + + cat >"$dir/plugin/Package.swift" <"$dir/plugin/Sources/plugin/Plugin.swift" <<'EOF' +public enum PluginMarker {} +EOF + + cat >"$dir/app/Package.swift" <<'EOF' +// swift-tools-version: 5.9 +import PackageDescription +let package = Package( + name: "app", + dependencies: [ + .package(name: "firebase_auth", path: "../plugin"), + ], + targets: [ + .executableTarget( + name: "app", + dependencies: [ + .product(name: "firebase-auth", package: "firebase_auth") + ] + ) + ] +) +EOF + + cat >"$dir/app/Sources/app/main.swift" <<'EOF' +print("ok") +EOF +} + +resolved_version() { + python3 - "$1/app/Package.resolved" <<'PY' +import json, sys +pins = json.load(open(sys.argv[1]))["pins"] +versions = [ + pin["state"]["version"] + for pin in pins + if pin["identity"] == "firebase-ios-sdk" +] +if len(versions) != 1: + raise SystemExit(f"expected one firebase-ios-sdk pin, found {versions}") +print(versions[0]) +PY +} + +resolve() { + GIT_CONFIG_COUNT=1 \ + GIT_CONFIG_KEY_0=protocol.file.allow \ + GIT_CONFIG_VALUE_0=always \ + swift package resolve --package-path "$1/app" >/dev/null + resolved_version "$1" +} + +write_graph pinned 'exact: "13.1.1"' +write_graph floated 'from: "13.0.0"' + +pinned_version=$(resolve "$root/pinned") +floated_version=$(resolve "$root/floated") + +echo "core exact 13.1.1, plugin from 13.0.0 -> $pinned_version" +echo "core from 13.0.0, plugin from 13.0.0 -> $floated_version" + +if [ "$pinned_version" != "13.1.1" ]; then + echo "expected the exact pin 13.1.1, got $pinned_version" >&2 + exit 1 +fi + +if [ "$floated_version" != "13.2.0" ]; then + echo "expected the floated graph to select 13.2.0, got $floated_version" >&2 + exit 1 +fi From 64a123220ca25d2d4c7030c6a504576f6948d4de Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Thu, 19 Nov 2026 09:41:02 +0000 Subject: [PATCH 2/3] fix(apple): keep the Swift package generator free of analyzer infos --- scripts/generate_versions_spm.dart | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/generate_versions_spm.dart b/scripts/generate_versions_spm.dart index e961bb5029fd..48b163204615 100644 --- a/scripts/generate_versions_spm.dart +++ b/scripts/generate_versions_spm.dart @@ -65,25 +65,28 @@ String rewritePackageSwiftFirebaseSdkPin( return content; } - content = content.replaceAll(_firebaseSdkRequirement, requirement); + final withRequirement = content.replaceAll( + _firebaseSdkRequirement, + requirement, + ); if (pinExact) { - if (!content.contains('let firebaseSdkVersion: Version =')) { + if (!withRequirement.contains('let firebaseSdkVersion: Version =')) { throw StateError( 'firebase_core Package.swift is missing its firebaseSdkVersion pin.', ); } - return content.replaceAll( - RegExp(r'let firebaseSdkVersion: Version = "[^"]+"'), + return withRequirement.replaceAll( + RegExp('let firebaseSdkVersion: Version = "[^"]+"'), 'let firebaseSdkVersion: Version = "$sdkVersion"', ); } - content = content.replaceFirst( - RegExp(r'\nlet firebaseSdkVersion: Version = "[^"]+"\n'), + final withoutPin = withRequirement.replaceFirst( + RegExp('\nlet firebaseSdkVersion: Version = "[^"]+"\n'), '\n', ); - return content.replaceAll(RegExp(r'\n{3,}'), '\n\n'); + return withoutPin.replaceAll(RegExp('\n{3,}'), '\n\n'); } /// `13.2.0` -> `13.0.0`. `from` already stops before the next major. @@ -131,11 +134,11 @@ void updatePluginPackageSwiftVersions( if (version != null) { final spmVersion = version.replaceAll('+', '-'); content = content.replaceAll( - RegExp(r'let libraryVersionString = "[^"]+"'), + RegExp('let libraryVersionString = "[^"]+"'), 'let libraryVersionString = "$spmVersion"', ); content = content.replaceAll( - RegExp(r'let libraryVersion = "[^"]+"'), + RegExp('let libraryVersion = "[^"]+"'), 'let libraryVersion = "$spmVersion"', ); } From 6fe6052a73a6ec2fc2d6df70e3e3a74f489302ff Mon Sep 17 00:00:00 2001 From: Jude Kwashie Date: Thu, 19 Nov 2026 14:03:32 +0000 Subject: [PATCH 3/3] fix(apple): floor Swift package SDK ranges at the generated version A major floor let an older firebase_core pin compile a plugin against an SDK it was not built for. Keep the floor at the generated version, collapse blank lines only where that pin was removed, and run the resolver checks in CI. --- .github/workflows/all_plugins.yaml | 12 +++ .../ios/cloud_firestore/Package.swift | 2 +- .../macos/cloud_firestore/Package.swift | 2 +- .../ios/cloud_functions/Package.swift | 2 +- .../macos/cloud_functions/Package.swift | 2 +- .../ios/firebase_analytics/Package.swift | 2 +- .../macos/firebase_analytics/Package.swift | 2 +- .../ios/firebase_app_check/Package.swift | 2 +- .../macos/firebase_app_check/Package.swift | 2 +- .../firebase_app_installations/Package.swift | 2 +- .../firebase_app_installations/Package.swift | 2 +- .../ios/firebase_auth/Package.swift | 2 +- .../macos/firebase_auth/Package.swift | 2 +- .../ios/firebase_crashlytics/Package.swift | 2 +- .../macos/firebase_crashlytics/Package.swift | 2 +- .../ios/firebase_database/Package.swift | 2 +- .../macos/firebase_database/Package.swift | 2 +- .../firebase_in_app_messaging/Package.swift | 2 +- .../ios/firebase_messaging/Package.swift | 2 +- .../macos/firebase_messaging/Package.swift | 2 +- .../ios/firebase_performance/Package.swift | 2 +- .../ios/firebase_remote_config/Package.swift | 2 +- .../firebase_remote_config/Package.swift | 2 +- .../ios/firebase_storage/Package.swift | 2 +- .../macos/firebase_storage/Package.swift | 2 +- pubspec.yaml | 11 +++ scripts/generate_versions_spm.dart | 57 +++++++++--- scripts/generate_versions_spm_test.dart | 56 ++++++++++- scripts/verify_spm_sdk_pin.sh | 93 +++++++++++++------ 29 files changed, 207 insertions(+), 70 deletions(-) diff --git a/.github/workflows/all_plugins.yaml b/.github/workflows/all_plugins.yaml index cc8b036e62ef..a4a35349a9b4 100644 --- a/.github/workflows/all_plugins.yaml +++ b/.github/workflows/all_plugins.yaml @@ -57,6 +57,7 @@ jobs: melos-run-bootstrap: 'true' - name: 'Validate Generated SPM Versions' run: | + melos run test:spm-generator dart run scripts/generate_versions_spm.dart git diff --exit-code -- ':(glob)packages/**/Package.swift' - name: 'Run Analyze' @@ -275,6 +276,17 @@ jobs: if: ${{ !cancelled() }} run: melos run test:browser --no-select + # Resolves a local Swift package fixture. The rewrite unit test runs in + # analyze; this job needs Xcode, and it does not bootstrap Flutter. + # `melos run test:spm-sdk-pin` is the same script. + spm_sdk_pin: + runs-on: macos-latest + timeout-minutes: 15 + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 + - name: Check firebase_core selects the Swift package SDK version + run: ./scripts/verify_spm_sdk_pin.sh + # Ruby, not Dart: crashlytics_add_upload_symbols_test.rb checks the generated # Xcode Run Script. It only needs the xcodeproj gem, so it stays off the # Flutter bootstrap used by the test job above. diff --git a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift index 8f9abceae76b..7d814371f8f3 100644 --- a/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/ios/cloud_firestore/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "cloud-firestore", targets: ["cloud_firestore"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift index d2074044b83d..d2c727f067dc 100644 --- a/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift +++ b/packages/cloud_firestore/cloud_firestore/macos/cloud_firestore/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "cloud-firestore", targets: ["cloud_firestore"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift index 31d28c50bd14..dab811ab3e25 100644 --- a/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/ios/cloud_functions/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "cloud-functions", targets: ["cloud_functions"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift b/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift index 5029737d1691..b1109605d9a5 100644 --- a/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift +++ b/packages/cloud_functions/cloud_functions/macos/cloud_functions/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "cloud-functions", targets: ["cloud_functions"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift index 5e1fa4b889b7..c54cafa8b2b7 100644 --- a/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift +++ b/packages/firebase_analytics/firebase_analytics/ios/firebase_analytics/Package.swift @@ -22,7 +22,7 @@ let package = Package( .library(name: "firebase-analytics", targets: ["firebase_analytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift b/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift index f44ffd0d7041..732990716caf 100644 --- a/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift +++ b/packages/firebase_analytics/firebase_analytics/macos/firebase_analytics/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-analytics", targets: ["firebase_analytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift index dd5bd8878104..55a99bdafe50 100644 --- a/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift +++ b/packages/firebase_app_check/firebase_app_check/ios/firebase_app_check/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-app-check", targets: ["firebase_app_check"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package( url: "https://github.com/GoogleCloudPlatform/recaptcha-enterprise-mobile-sdk.git", from: "18.0.0" diff --git a/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift b/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift index d313aa6e0a47..5752b6d42cd8 100644 --- a/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift +++ b/packages/firebase_app_check/firebase_app_check/macos/firebase_app_check/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-app-check", targets: ["firebase_app_check"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift index df38d1c76f17..29965f0179b4 100644 --- a/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift +++ b/packages/firebase_app_installations/firebase_app_installations/ios/firebase_app_installations/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift b/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift index dd2d9983f156..90a093aba872 100644 --- a/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift +++ b/packages/firebase_app_installations/firebase_app_installations/macos/firebase_app_installations/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-app-installations", targets: ["firebase_app_installations"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift index de6b32234d42..f96fba9da10e 100644 --- a/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/ios/firebase_auth/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-auth", targets: ["firebase_auth"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift index 14c0bf9423bb..e78da6fa52ef 100644 --- a/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift +++ b/packages/firebase_auth/firebase_auth/macos/firebase_auth/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-auth", targets: ["firebase_auth"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift index 58157b8ef2cc..b733e91ab704 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/ios/firebase_crashlytics/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift b/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift index a114c9d88c35..fb4341d32c67 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift +++ b/packages/firebase_crashlytics/firebase_crashlytics/macos/firebase_crashlytics/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-crashlytics", targets: ["firebase_crashlytics"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift b/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift index 96bf07aff4da..4dfcfbde91e1 100644 --- a/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/ios/firebase_database/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-database", targets: ["firebase_database"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift b/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift index 5a15a7545945..64cdc5653b5d 100644 --- a/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift +++ b/packages/firebase_database/firebase_database/macos/firebase_database/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-database", targets: ["firebase_database"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift index a04b415238bb..6ca955833976 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/ios/firebase_in_app_messaging/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-in-app-messaging", targets: ["firebase_in_app_messaging"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift index 3a52920ff894..1a8c6e1c2987 100644 --- a/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/ios/firebase_messaging/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-messaging", targets: ["firebase_messaging"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift index 76166a4bbd5b..ff531db77db8 100644 --- a/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift +++ b/packages/firebase_messaging/firebase_messaging/macos/firebase_messaging/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-messaging", targets: ["firebase_messaging"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift index 7e5b4289f455..9e63b7d25a6d 100644 --- a/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift +++ b/packages/firebase_performance/firebase_performance/ios/firebase_performance/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-performance", targets: ["firebase_performance"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift index af34bbd8a6f9..53c5690300fa 100644 --- a/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift +++ b/packages/firebase_remote_config/firebase_remote_config/ios/firebase_remote_config/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift b/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift index f353005c5d47..13f17c520ee9 100644 --- a/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift +++ b/packages/firebase_remote_config/firebase_remote_config/macos/firebase_remote_config/Package.swift @@ -16,7 +16,7 @@ let package = Package( .library(name: "firebase-remote-config", targets: ["firebase_remote_config"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift index 041381e0c3ac..44ab2b492a0a 100644 --- a/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/ios/firebase_storage/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-storage", targets: ["firebase_storage"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift b/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift index 3c19008e4519..6ad29ea51060 100644 --- a/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift +++ b/packages/firebase_storage/firebase_storage/macos/firebase_storage/Package.swift @@ -18,7 +18,7 @@ let package = Package( .library(name: "firebase-storage", targets: ["firebase_storage"]) ], dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), .package(name: "firebase_core", path: "../firebase_core"), .package(name: "FlutterFramework", path: "../FlutterFramework"), ], diff --git a/pubspec.yaml b/pubspec.yaml index f0f1f4c02a3d..476557dee4e7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -118,6 +118,17 @@ melos: run: dart scripts/validate_wasm_imports.dart description: Validate that published packages only depend on libraries available on Wasm. + test:spm-generator: + run: dart run scripts/generate_versions_spm_test.dart + description: Check the Swift package firebase-ios-sdk rewrite. + + test:spm-sdk-pin: + run: ./scripts/verify_spm_sdk_pin.sh + description: > + Check that firebase_core's exact pin selects the Swift package SDK + version, and that an older pin conflicts with a plugin built against + a newer one. + analyze-ci: # We are setting the concurrency to 1 because a higher concurrency can crash # the analysis server on low performance machines (like GitHub Actions). diff --git a/scripts/generate_versions_spm.dart b/scripts/generate_versions_spm.dart index 48b163204615..d2fcb28d7a2c 100644 --- a/scripts/generate_versions_spm.dart +++ b/scripts/generate_versions_spm.dart @@ -19,9 +19,10 @@ import 'firebase_sdk_version_spm.dart'; void main(List args) async { final workspace = await getMelosWorkspace(); - // firebase_core keeps an exact pin. Other plugins accept any version in - // that major, so SwiftPM can select the pin from firebase_core. - // CocoaPods keeps its own pin in firebase_sdk_version.rb. + // firebase_core keeps an exact pin. Other plugins accept that version up + // to the next major, so SwiftPM selects the pin from firebase_core and + // rejects an older one. CocoaPods keeps its own pin in + // firebase_sdk_version.rb. updatePluginPackageSwiftVersions(workspace, firebaseSpmSdkVersion); // Update plugin version in Constants.swift for pure Swift plugins. Unable to pass macros in pure Swift implementations updateLibraryVersionPureSwiftPlugins(); @@ -44,8 +45,10 @@ Future getMelosWorkspace() async { /// /// [pinExact] is true for `firebase_core`, which is the package every other /// plugin depends on. Its exact version is the one SwiftPM must select. -/// Other plugins get `from: ".0.0"` so a plugin published against an -/// older patch in the same major can resolve together with that pin. +/// Other plugins get `from` the SDK version they were generated against. +/// `from` stops before the next major, so a current `firebase_core` pin still +/// resolves, and an older pin conflicts instead of compiling the plugin +/// against an SDK that is missing APIs it uses. String rewritePackageSwiftFirebaseSdkPin( String content, { required String sdkVersion, @@ -53,7 +56,7 @@ String rewritePackageSwiftFirebaseSdkPin( }) { final requirement = pinExact ? '.package(url: "$_firebaseIosSdkUrl", exact: firebaseSdkVersion)' - : '.package(url: "$_firebaseIosSdkUrl", from: "${_spmMajorFloor(sdkVersion)}")'; + : '.package(url: "$_firebaseIosSdkUrl", from: "${_spmFromVersion(sdkVersion)}")'; if (!content.contains(_firebaseSdkRequirement)) { if (content.contains('firebase-ios-sdk')) { @@ -82,22 +85,46 @@ String rewritePackageSwiftFirebaseSdkPin( ); } - final withoutPin = withRequirement.replaceFirst( - RegExp('\nlet firebaseSdkVersion: Version = "[^"]+"\n'), - '\n', + final pinDeclaration = RegExp( + '\nlet firebaseSdkVersion: Version = "[^"]+"\n', ); - return withoutPin.replaceAll(RegExp('\n{3,}'), '\n\n'); + final match = pinDeclaration.firstMatch(withRequirement); + if (match == null) { + return withRequirement; + } + + final removed = withRequirement.replaceRange(match.start, match.end, '\n'); + return _collapseBlankLinesAt(removed, match.start); +} + +/// Collapses the newline run at [index] to one blank line. +/// +/// Removing `firebaseSdkVersion` can leave the blank line that surrounded +/// that declaration. Blank lines anywhere else in the manifest stay put. +String _collapseBlankLinesAt(String content, int index) { + var start = index; + var end = index; + while (start > 0 && content[start - 1] == '\n') { + start--; + } + while (end < content.length && content[end] == '\n') { + end++; + } + if (end - start <= 2) { + return content; + } + return content.replaceRange(start, end, '\n\n'); } -/// `13.2.0` -> `13.0.0`. `from` already stops before the next major. -String _spmMajorFloor(String sdkVersion) { - final major = sdkVersion.split('.').first; - if (int.tryParse(major) == null) { +String _spmFromVersion(String sdkVersion) { + final parts = sdkVersion.split('.'); + if (parts.length != 3 || + parts.any((part) => part.isEmpty || int.tryParse(part) == null)) { throw FormatException( 'Invalid Swift Package Manager SDK version: $sdkVersion', ); } - return '$major.0.0'; + return sdkVersion; } const _firebaseIosSdkUrl = 'https://github.com/firebase/firebase-ios-sdk'; diff --git a/scripts/generate_versions_spm_test.dart b/scripts/generate_versions_spm_test.dart index 83279bd6a76e..3ed6ddf6b9a6 100644 --- a/scripts/generate_versions_spm_test.dart +++ b/scripts/generate_versions_spm_test.dart @@ -9,7 +9,9 @@ import 'generate_versions_spm.dart'; void main() { _pluginDropsItsExactPin(); _analyticsDropsItsPinWithoutADoubleBlank(); + _pluginFloorIsTheSdkItWasBuiltAgainst(); _pluginFloorFollowsTheNextMajor(); + _blankLinesAwayFromThePinStay(); _coreKeepsAnExactPin(); _rewriteIsIdempotent(); _manifestWithoutTheSdkIsLeftAlone(); @@ -51,10 +53,10 @@ let libraryVersion = "7.1.0" let package = Package( dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), ], ) -''', 'plugin uses the current major as a floor'); +''', 'plugin uses the SDK it was generated against as a floor'); if (rewritten.contains('firebaseSdkVersion') || rewritten.contains('exact:')) { _fail('plugin rewrite still carries an exact pin'); @@ -87,12 +89,26 @@ import PackageDescription // Set FIREBASE_ANALYTICS_WITHOUT_ADID=true to use FirebaseAnalyticsCore. let package = Package( dependencies: [ - .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.0.0"), + .package(url: "https://github.com/firebase/firebase-ios-sdk", from: "13.2.0"), ], ) ''', 'analytics keeps a single blank line where the pin was'); } +void _pluginFloorIsTheSdkItWasBuiltAgainst() { + final rewritten = rewritePackageSwiftFirebaseSdkPin( + _plugin, + sdkVersion: '13.1.1', + pinExact: false, + ); + if (!rewritten.contains('from: "13.1.1"') || + rewritten.contains('from: "13.0.0"')) { + _fail( + 'floor should be the SDK the plugin was generated against:\n$rewritten', + ); + } +} + void _pluginFloorFollowsTheNextMajor() { final onThirteen = rewritePackageSwiftFirebaseSdkPin( _plugin, @@ -105,11 +121,43 @@ void _pluginFloorFollowsTheNextMajor() { pinExact: false, ); if (!onFourteen.contains('from: "14.0.0"') || - onFourteen.contains('from: "13.0.0"')) { + onFourteen.contains('from: "13.2.0"')) { _fail('major bump did not move the floor to 14.0.0:\n$onFourteen'); } } +void _blankLinesAwayFromThePinStay() { + const manifest = + 'let libraryVersion = "7.1.0"\n' + 'let firebaseSdkVersion: Version = "12.15.0"\n' + '\n' + 'let package = Package(\n' + ' dependencies: [\n' + ' .package(url: "https://github.com/firebase/firebase-ios-sdk", exact: firebaseSdkVersion),\n' + ' ],\n' + ')\n' + '\n' + '\n' + '\n' + '// kept\n'; + final rewritten = rewritePackageSwiftFirebaseSdkPin( + manifest, + sdkVersion: '13.2.0', + pinExact: false, + ); + const trailing = '\n\n\n// kept\n'; + if (!rewritten.endsWith(trailing)) { + _fail('rewrite collapsed blank lines away from the pin:\n$rewritten'); + } + if (!rewritten.startsWith('let libraryVersion = "7.1.0"\n\nlet package')) { + _fail('pin removal left the wrong blank line:\n$rewritten'); + } + if (rewritten.contains('firebaseSdkVersion') || + !rewritten.contains('from: "13.2.0"')) { + _fail('rewrite did not drop the pin:\n$rewritten'); + } +} + void _coreKeepsAnExactPin() { final rewritten = rewritePackageSwiftFirebaseSdkPin( _core, diff --git a/scripts/verify_spm_sdk_pin.sh b/scripts/verify_spm_sdk_pin.sh index 78ef253dd0da..10131b9f91ec 100755 --- a/scripts/verify_spm_sdk_pin.sh +++ b/scripts/verify_spm_sdk_pin.sh @@ -1,15 +1,17 @@ +#!/bin/bash # Copyright 2026, the Chromium project authors. Please see the AUTHORS file # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. -# Resolves two Swift package graphs against a local git repo tagged 13.0.0, -# 13.1.1, and 13.2.0. +# Resolves Swift package graphs against a local git repo tagged 13.0.0, +# 13.1.1, 13.2.0, and 13.3.0. # # The published firebase-ios-sdk pin is 13.2.0, which is also the newest 13.x # tag, so resolving the real packages cannot show that an exact pin held the -# resolver back. This fixture pins core at 13.1.1 while the other package -# allows any 13.x. The resolved version has to be 13.1.1. A second graph, where -# core also uses `from: "13.0.0"`, has to select 13.2.0. +# resolver back. This fixture tags a newer 13.3.0. Core's exact 13.2.0 pin has +# to win over a plugin `from: "13.2.0"`, and over an older plugin +# `from: "13.1.1"`. An older core pin has to fail against a plugin built on +# 13.2.0. A core that also uses `from` has to float to 13.3.0. set -eu @@ -49,10 +51,15 @@ printf '\n// 13.2.0\n' >>"$sdk/Sources/FirebaseCore/FirebaseCore.swift" git -C "$sdk" add . git -C "$sdk" -c user.email="spm-pin@example.com" -c user.name="spm-pin" commit -qm "13.2.0" git -C "$sdk" tag 13.2.0 +printf '\n// 13.3.0\n' >>"$sdk/Sources/FirebaseCore/FirebaseCore.swift" +git -C "$sdk" add . +git -C "$sdk" -c user.email="spm-pin@example.com" -c user.name="spm-pin" commit -qm "13.3.0" +git -C "$sdk" tag 13.3.0 write_graph() { name="$1" core_requirement="$2" + plugin_requirement="$3" dir="$root/$name" mkdir -p "$dir/core/Sources/core" "$dir/plugin/Sources/plugin" "$dir/app/Sources/app" @@ -91,7 +98,7 @@ let package = Package( .library(name: "firebase-auth", targets: ["plugin"]) ], dependencies: [ - .package(url: "$sdk", from: "13.0.0"), + .package(url: "$sdk", $plugin_requirement), .package(name: "firebase_core", path: "../core"), ], targets: [ @@ -135,18 +142,21 @@ EOF } resolved_version() { - python3 - "$1/app/Package.resolved" <<'PY' -import json, sys -pins = json.load(open(sys.argv[1]))["pins"] -versions = [ - pin["state"]["version"] - for pin in pins - if pin["identity"] == "firebase-ios-sdk" -] -if len(versions) != 1: - raise SystemExit(f"expected one firebase-ios-sdk pin, found {versions}") -print(versions[0]) -PY + file="$1/app/Package.resolved" + # Do not parse this with python3. A python3 earlier on PATH can be a stub + # that exits 0 and prints nothing, which hides a resolved version. + raw=$( + grep -E -A 20 '"identity" *: *"firebase-ios-sdk"' "$file" | + grep '"version"' | + head -1 || true + ) + version=$(printf '%s\n' "$raw" | sed -E 's/.*"version" *: *"([^"]+)".*/\1/') + if [ -z "$raw" ] || [ "$version" = "$raw" ]; then + echo "could not read the firebase-ios-sdk version from $file" >&2 + cat "$file" >&2 + exit 1 + fi + printf '%s\n' "$version" } resolve() { @@ -157,21 +167,50 @@ resolve() { resolved_version "$1" } -write_graph pinned 'exact: "13.1.1"' -write_graph floated 'from: "13.0.0"' +expect_conflict() { + dir="$1" + err="$dir/resolve.err" + if GIT_CONFIG_COUNT=1 \ + GIT_CONFIG_KEY_0=protocol.file.allow \ + GIT_CONFIG_VALUE_0=always \ + swift package resolve --package-path "$dir/app" >"$dir/resolve.out" 2>"$err" + then + echo "expected a version conflict for $dir" >&2 + exit 1 + fi + if ! grep -q '13.2.0' "$err" || ! grep -q '13.1.1' "$err"; then + echo "expected the conflict to mention 13.1.1 and 13.2.0" >&2 + cat "$err" >&2 + exit 1 + fi +} + +write_graph current 'exact: "13.2.0"' 'from: "13.2.0"' +write_graph older_plugin 'exact: "13.2.0"' 'from: "13.1.1"' +write_graph stale_core 'exact: "13.1.1"' 'from: "13.2.0"' +write_graph floated 'from: "13.0.0"' 'from: "13.2.0"' -pinned_version=$(resolve "$root/pinned") +current_version=$(resolve "$root/current") +older_plugin_version=$(resolve "$root/older_plugin") floated_version=$(resolve "$root/floated") +expect_conflict "$root/stale_core" + +echo "core exact 13.2.0, plugin from 13.2.0 -> $current_version" +echo "core exact 13.2.0, plugin from 13.1.1 -> $older_plugin_version" +echo "core from 13.0.0, plugin from 13.2.0 -> $floated_version" +echo "core exact 13.1.1, plugin from 13.2.0 -> conflict" -echo "core exact 13.1.1, plugin from 13.0.0 -> $pinned_version" -echo "core from 13.0.0, plugin from 13.0.0 -> $floated_version" +if [ "$current_version" != "13.2.0" ]; then + echo "expected the exact pin 13.2.0, got $current_version" >&2 + exit 1 +fi -if [ "$pinned_version" != "13.1.1" ]; then - echo "expected the exact pin 13.1.1, got $pinned_version" >&2 +if [ "$older_plugin_version" != "13.2.0" ]; then + echo "expected an older plugin floor to select 13.2.0, got $older_plugin_version" >&2 exit 1 fi -if [ "$floated_version" != "13.2.0" ]; then - echo "expected the floated graph to select 13.2.0, got $floated_version" >&2 +if [ "$floated_version" != "13.3.0" ]; then + echo "expected the floated graph to select 13.3.0, got $floated_version" >&2 exit 1 fi