From 3c2cb0db9dab4e111c4ee711acb6d4d85d54fd4e Mon Sep 17 00:00:00 2001 From: Pix Date: Mon, 9 Nov 2026 08:45:08 +0100 Subject: [PATCH 1/2] feat(spm): Package.swift for the Firebase tvOS ports (core and all dependents) flutter-tvos links a plugin that ships tvos/Package.swift through SwiftPM and leaves it out of the Podfile. Once firebase_core_tvos ships one, a port that still says `s.dependency 'firebase_core_tvos'` in its podspec cannot resolve, so core and every port that depends on it move to SwiftPM together. - firebase_core_tvos 0.0.4: one Objective-C target, include/ as the public headers. LIBRARY_VERSION now matches the package version. - Swift ports (analytics 0.0.2, app_check 0.0.3, cloud_functions 0.0.2, performance 0.0.2, remote_config 0.0.2, storage 0.0.2): one Swift target. - Objective-C ports (cloud_firestore 0.0.2, auth 0.0.2, messaging 0.0.2): one Objective-C target. Core headers resolve as under SwiftPM. - firebase_crashlytics_tvos 0.0.3: a Swift and an Objective-C target, sources split into Classes/firebase_crashlytics_tvos and Classes/firebase_crashlytics_objc like upstream. The podspec globs match both. - Every manifest takes firebase-ios-sdk .upToNextMinor(from: "12.15.0"), the podspecs' ~> 12.15.0, and dependents reach core as ../firebase_core_tvos. - Every dependent requires firebase_core_tvos ^0.0.4. The six without one get a root pubspec_overrides.yaml, and their examples override core to the sibling package and move to upstream versions that accept core 0.0.4. Library registration: under SwiftPM FIRAppInternal.h is unreachable (FirebaseCoreExtension is no product of firebase-ios-sdk), so REGISTER_LIB was never defined. FLTFirebasePluginRegistry.m now declares +[FIRApp registerLibrary:withVersion:] when neither header is found and checks respondsToSelector: before calling it. Co-Authored-By: Claude Opus 5.5 --- packages/cloud_firestore_tvos/CHANGELOG.md | 15 +++++ packages/cloud_firestore_tvos/README.md | 10 ++- packages/cloud_firestore_tvos/pubspec.yaml | 6 +- .../FLTDocumentSnapshotStreamHandler.m | 2 + .../tvos/Classes/FLTFirebaseFirestorePlugin.m | 2 + .../tvos/Classes/FLTFirebaseFirestoreReader.m | 2 + .../tvos/Classes/FLTLoadBundleStreamHandler.m | 2 + .../Classes/FLTQuerySnapshotStreamHandler.m | 2 + .../Classes/FLTTransactionStreamHandler.m | 2 + .../Public/FLTFirebaseFirestorePlugin.h | 2 + .../cloud_firestore_tvos/tvos/Package.swift | 53 ++++++++++++++++ .../tvos/cloud_firestore_tvos.podspec | 4 +- packages/cloud_functions_tvos/CHANGELOG.md | 11 ++++ packages/cloud_functions_tvos/README.md | 12 +++- .../cloud_functions_tvos/example/pubspec.yaml | 16 +++-- packages/cloud_functions_tvos/pubspec.yaml | 6 +- .../pubspec_overrides.yaml | 9 +++ .../cloud_functions_tvos/tvos/Package.swift | 45 ++++++++++++++ .../tvos/cloud_functions_tvos.podspec | 2 +- packages/firebase_analytics_tvos/CHANGELOG.md | 11 ++++ packages/firebase_analytics_tvos/README.md | 12 +++- .../example/pubspec.yaml | 16 +++-- packages/firebase_analytics_tvos/pubspec.yaml | 6 +- .../pubspec_overrides.yaml | 9 +++ .../tvos/Package.swift | 45 ++++++++++++++ .../tvos/firebase_analytics_tvos.podspec | 2 +- packages/firebase_app_check_tvos/CHANGELOG.md | 11 ++++ packages/firebase_app_check_tvos/README.md | 12 +++- .../example/pubspec.yaml | 9 ++- packages/firebase_app_check_tvos/pubspec.yaml | 6 +- .../pubspec_overrides.yaml | 9 +++ .../tvos/Package.swift | 45 ++++++++++++++ .../tvos/firebase_app_check_tvos.podspec | 2 +- packages/firebase_auth_tvos/CHANGELOG.md | 15 +++++ packages/firebase_auth_tvos/README.md | 10 ++- packages/firebase_auth_tvos/pubspec.yaml | 6 +- .../tvos/Classes/FLTFirebaseAuthPlugin.m | 4 ++ .../include/Public/FLTFirebaseAuthPlugin.h | 2 + .../firebase_auth_tvos/tvos/Package.swift | 53 ++++++++++++++++ .../tvos/firebase_auth_tvos.podspec | 4 +- packages/firebase_core_tvos/CHANGELOG.md | 17 +++++ packages/firebase_core_tvos/README.md | 11 +++- packages/firebase_core_tvos/pubspec.yaml | 2 +- .../tvos/Classes/FLTFirebasePluginRegistry.m | 16 ++++- .../firebase_core_tvos/tvos/Package.swift | 55 ++++++++++++++++ .../tvos/firebase_core_tvos.podspec | 4 +- .../firebase_crashlytics_tvos/CHANGELOG.md | 15 +++++ .../PORTING_REPORT.md | 3 + packages/firebase_crashlytics_tvos/README.md | 12 +++- .../example/pubspec.yaml | 9 ++- .../firebase_crashlytics_tvos/pubspec.yaml | 11 ++-- .../pubspec_overrides.yaml | 9 +++ .../CrashlyticsPlatformHelpers.m | 0 .../include/CrashlyticsPlatformHelpers.h | 0 .../include/Crashlytics_Platform.h | 0 .../include/ExceptionModel_Platform.h | 0 .../Constants.swift | 0 .../FirebaseCrashlyticsMessages.g.swift | 0 .../FirebaseCrashlyticsPlugin.swift | 0 .../tvos/Package.swift | 62 +++++++++++++++++++ .../tvos/firebase_crashlytics_tvos.podspec | 2 +- packages/firebase_messaging_tvos/CHANGELOG.md | 15 +++++ packages/firebase_messaging_tvos/README.md | 10 ++- packages/firebase_messaging_tvos/pubspec.yaml | 6 +- .../tvos/Classes/FLTFirebaseMessagingPlugin.m | 2 + .../include/FLTFirebaseMessagingPlugin.h | 2 + .../tvos/Package.swift | 52 ++++++++++++++++ .../tvos/firebase_messaging_tvos.podspec | 4 +- .../firebase_performance_tvos/CHANGELOG.md | 11 ++++ packages/firebase_performance_tvos/README.md | 12 +++- .../example/pubspec.yaml | 16 +++-- .../firebase_performance_tvos/pubspec.yaml | 6 +- .../pubspec_overrides.yaml | 9 +++ .../tvos/Package.swift | 45 ++++++++++++++ .../tvos/firebase_performance_tvos.podspec | 2 +- .../firebase_remote_config_tvos/CHANGELOG.md | 11 ++++ .../firebase_remote_config_tvos/README.md | 12 +++- .../example/pubspec.yaml | 16 +++-- .../firebase_remote_config_tvos/pubspec.yaml | 6 +- .../pubspec_overrides.yaml | 9 +++ .../tvos/Package.swift | 45 ++++++++++++++ .../tvos/firebase_remote_config_tvos.podspec | 2 +- packages/firebase_storage_tvos/CHANGELOG.md | 11 ++++ packages/firebase_storage_tvos/README.md | 10 ++- packages/firebase_storage_tvos/pubspec.yaml | 6 +- .../firebase_storage_tvos/tvos/Package.swift | 45 ++++++++++++++ .../tvos/firebase_storage_tvos.podspec | 2 +- 87 files changed, 1012 insertions(+), 75 deletions(-) create mode 100644 packages/cloud_firestore_tvos/tvos/Package.swift create mode 100644 packages/cloud_functions_tvos/pubspec_overrides.yaml create mode 100644 packages/cloud_functions_tvos/tvos/Package.swift create mode 100644 packages/firebase_analytics_tvos/pubspec_overrides.yaml create mode 100644 packages/firebase_analytics_tvos/tvos/Package.swift create mode 100644 packages/firebase_app_check_tvos/pubspec_overrides.yaml create mode 100644 packages/firebase_app_check_tvos/tvos/Package.swift create mode 100644 packages/firebase_auth_tvos/tvos/Package.swift create mode 100644 packages/firebase_core_tvos/tvos/Package.swift create mode 100644 packages/firebase_crashlytics_tvos/pubspec_overrides.yaml rename packages/firebase_crashlytics_tvos/tvos/Classes/{ => firebase_crashlytics_objc}/CrashlyticsPlatformHelpers.m (100%) rename packages/firebase_crashlytics_tvos/tvos/Classes/{ => firebase_crashlytics_objc}/include/CrashlyticsPlatformHelpers.h (100%) rename packages/firebase_crashlytics_tvos/tvos/Classes/{ => firebase_crashlytics_objc}/include/Crashlytics_Platform.h (100%) rename packages/firebase_crashlytics_tvos/tvos/Classes/{ => firebase_crashlytics_objc}/include/ExceptionModel_Platform.h (100%) rename packages/firebase_crashlytics_tvos/tvos/Classes/{ => firebase_crashlytics_tvos}/Constants.swift (100%) rename packages/firebase_crashlytics_tvos/tvos/Classes/{ => firebase_crashlytics_tvos}/FirebaseCrashlyticsMessages.g.swift (100%) rename packages/firebase_crashlytics_tvos/tvos/Classes/{ => firebase_crashlytics_tvos}/FirebaseCrashlyticsPlugin.swift (100%) create mode 100644 packages/firebase_crashlytics_tvos/tvos/Package.swift create mode 100644 packages/firebase_messaging_tvos/tvos/Package.swift create mode 100644 packages/firebase_performance_tvos/pubspec_overrides.yaml create mode 100644 packages/firebase_performance_tvos/tvos/Package.swift create mode 100644 packages/firebase_remote_config_tvos/pubspec_overrides.yaml create mode 100644 packages/firebase_remote_config_tvos/tvos/Package.swift create mode 100644 packages/firebase_storage_tvos/tvos/Package.swift diff --git a/packages/cloud_firestore_tvos/CHANGELOG.md b/packages/cloud_firestore_tvos/CHANGELOG.md index 42767ce..bef4bfa 100644 --- a/packages/cloud_firestore_tvos/CHANGELOG.md +++ b/packages/cloud_firestore_tvos/CHANGELOG.md @@ -1,3 +1,18 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Objective-C + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. +* Imports firebase_core_tvos's headers as `` when + `` (the CocoaPods layout) is not there. +* `LIBRARY_VERSION` (podspec and Package.swift) now matches the package version. + It said 0.0.1. + ## 0.0.1 * Initial tvOS scaffolding generated by `flutter-tvos plugin port` from diff --git a/packages/cloud_firestore_tvos/README.md b/packages/cloud_firestore_tvos/README.md index 3644864..cfbf4fb 100644 --- a/packages/cloud_firestore_tvos/README.md +++ b/packages/cloud_firestore_tvos/README.md @@ -16,7 +16,7 @@ it: ```yaml dependencies: cloud_firestore: ^6.6.0 - cloud_firestore_tvos: ^0.0.1 + cloud_firestore_tvos: ^0.0.2 ``` The native plugin registers automatically through flutter-tvos' plugin @@ -46,6 +46,14 @@ Firestore features are disabled here: - Apple TV running tvOS 15.0 or later (the Firebase Apple SDK's minimum). - `firebase_core_tvos` (pulled in automatically). +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/cloud_firestore_tvos/pubspec.yaml b/packages/cloud_firestore_tvos/pubspec.yaml index d01c30d..a46be11 100644 --- a/packages/cloud_firestore_tvos/pubspec.yaml +++ b/packages/cloud_firestore_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: cloud_firestore_tvos description: >- tvOS (Apple TV) implementation of the cloud_firestore Flutter plugin, bringing Cloud Firestore to Apple TV apps via the flutter-tvos toolchain. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/cloud_firestore_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -24,7 +24,9 @@ dependencies: # against locally instead of failing over to upstream's iOS-only pod. # Hosted constraint for pub.dev (path deps can't be published); local # development resolves it via pubspec_overrides.yaml until it's published. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/cloud_firestore_tvos/tvos/Classes/FLTDocumentSnapshotStreamHandler.m b/packages/cloud_firestore_tvos/tvos/Classes/FLTDocumentSnapshotStreamHandler.m index 18539e9..445dee4 100644 --- a/packages/cloud_firestore_tvos/tvos/Classes/FLTDocumentSnapshotStreamHandler.m +++ b/packages/cloud_firestore_tvos/tvos/Classes/FLTDocumentSnapshotStreamHandler.m @@ -5,6 +5,8 @@ @import FirebaseFirestore; #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePluginRegistry.h" #endif diff --git a/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestorePlugin.m b/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestorePlugin.m index 725a101..8a2f0cb 100644 --- a/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestorePlugin.m +++ b/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestorePlugin.m @@ -5,6 +5,8 @@ @import FirebaseFirestore; #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePluginRegistry.h" #endif diff --git a/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestoreReader.m b/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestoreReader.m index 9387c9d..8dec353 100644 --- a/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestoreReader.m +++ b/packages/cloud_firestore_tvos/tvos/Classes/FLTFirebaseFirestoreReader.m @@ -7,6 +7,8 @@ #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePlugin.h" #endif diff --git a/packages/cloud_firestore_tvos/tvos/Classes/FLTLoadBundleStreamHandler.m b/packages/cloud_firestore_tvos/tvos/Classes/FLTLoadBundleStreamHandler.m index 2aabe2f..3966197 100644 --- a/packages/cloud_firestore_tvos/tvos/Classes/FLTLoadBundleStreamHandler.m +++ b/packages/cloud_firestore_tvos/tvos/Classes/FLTLoadBundleStreamHandler.m @@ -12,6 +12,8 @@ @import FirebaseFirestore; #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePluginRegistry.h" #endif diff --git a/packages/cloud_firestore_tvos/tvos/Classes/FLTQuerySnapshotStreamHandler.m b/packages/cloud_firestore_tvos/tvos/Classes/FLTQuerySnapshotStreamHandler.m index 2800493..8352867 100644 --- a/packages/cloud_firestore_tvos/tvos/Classes/FLTQuerySnapshotStreamHandler.m +++ b/packages/cloud_firestore_tvos/tvos/Classes/FLTQuerySnapshotStreamHandler.m @@ -5,6 +5,8 @@ @import FirebaseFirestore; #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePluginRegistry.h" #endif diff --git a/packages/cloud_firestore_tvos/tvos/Classes/FLTTransactionStreamHandler.m b/packages/cloud_firestore_tvos/tvos/Classes/FLTTransactionStreamHandler.m index 68d8acd..43a1e77 100644 --- a/packages/cloud_firestore_tvos/tvos/Classes/FLTTransactionStreamHandler.m +++ b/packages/cloud_firestore_tvos/tvos/Classes/FLTTransactionStreamHandler.m @@ -5,6 +5,8 @@ @import FirebaseFirestore; #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePluginRegistry.h" #endif diff --git a/packages/cloud_firestore_tvos/tvos/Classes/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h b/packages/cloud_firestore_tvos/tvos/Classes/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h index 96c6e65..96b2708 100644 --- a/packages/cloud_firestore_tvos/tvos/Classes/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h +++ b/packages/cloud_firestore_tvos/tvos/Classes/include/cloud_firestore/Public/FLTFirebaseFirestorePlugin.h @@ -12,6 +12,8 @@ #import #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePlugin.h" #endif diff --git a/packages/cloud_firestore_tvos/tvos/Package.swift b/packages/cloud_firestore_tvos/tvos/Package.swift new file mode 100644 index 0000000..2323449 --- /dev/null +++ b/packages/cloud_firestore_tvos/tvos/Package.swift @@ -0,0 +1,53 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +// Keep in step with `version:` in pubspec.yaml and `s.version` in the podspec. +let libraryVersion = "0.0.2" + +let package = Package( + name: "cloud_firestore_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "cloud-firestore-tvos", targets: ["cloud_firestore_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + // All Objective-C, so one target (SwiftPM cannot mix languages in one). + .target( + name: "cloud_firestore_tvos", + dependencies: [ + // The podspec's Firebase/Firestore subspec. + .product(name: "FirebaseFirestore", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + publicHeadersPath: "include/cloud_firestore/Public", + cSettings: [ + .headerSearchPath("include/cloud_firestore/Private"), + .headerSearchPath("include/cloud_firestore/Public"), + // The podspec's GCC_PREPROCESSOR_DEFINITIONS. + .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), + .define("LIBRARY_NAME", to: "\"flutter-fire-fst-tvos\""), + ] + ), + ] +) diff --git a/packages/cloud_firestore_tvos/tvos/cloud_firestore_tvos.podspec b/packages/cloud_firestore_tvos/tvos/cloud_firestore_tvos.podspec index ee8b123..e63f018 100644 --- a/packages/cloud_firestore_tvos/tvos/cloud_firestore_tvos.podspec +++ b/packages/cloud_firestore_tvos/tvos/cloud_firestore_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'cloud_firestore_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of cloud_firestore.' s.description = <<-DESC tvOS implementation of cloud_firestore, the federated platform @@ -39,7 +39,7 @@ package that ships native code targeting Apple tvOS. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'GCC_PREPROCESSOR_DEFINITIONS' => - '$(inherited) LIBRARY_VERSION=\"0.0.1\" LIBRARY_NAME=\"flutter-fire-fst-tvos\"', + '$(inherited) LIBRARY_VERSION=\"0.0.2\" LIBRARY_NAME=\"flutter-fire-fst-tvos\"', } # The ported Classes/ call into FIRFirestore (Firebase/Firestore) and into diff --git a/packages/cloud_functions_tvos/CHANGELOG.md b/packages/cloud_functions_tvos/CHANGELOG.md index 760ef48..f7a4107 100644 --- a/packages/cloud_functions_tvos/CHANGELOG.md +++ b/packages/cloud_functions_tvos/CHANGELOG.md @@ -1,3 +1,14 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Swift + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. + ## 0.0.1 * Initial tvOS scaffolding generated by `flutter-tvos plugin port` from diff --git a/packages/cloud_functions_tvos/README.md b/packages/cloud_functions_tvos/README.md index 83c101d..6856944 100644 --- a/packages/cloud_functions_tvos/README.md +++ b/packages/cloud_functions_tvos/README.md @@ -14,9 +14,9 @@ automatically. Apps that already use `cloud_functions` and target tvOS add: ```yaml dependencies: cloud_functions: ^6.3.3 - cloud_functions_tvos: ^0.0.1 + cloud_functions_tvos: ^0.0.2 firebase_core: ^4.11.0 - firebase_core_tvos: ^0.0.1 # tvOS core (this package depends on it) + firebase_core_tvos: ^0.0.4 # tvOS core (this package depends on it) ``` > **Version alignment matters.** This package's native code matches the @@ -36,6 +36,14 @@ Full `cloud_functions` API is available on tvOS (callable functions + streaming callables, `httpsCallable`, region/emulator selection), no feature disables. Streaming requires tvOS 15+ (the pod floor). +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/cloud_functions_tvos/example/pubspec.yaml b/packages/cloud_functions_tvos/example/pubspec.yaml index 4b27367..287805c 100755 --- a/packages/cloud_functions_tvos/example/pubspec.yaml +++ b/packages/cloud_functions_tvos/example/pubspec.yaml @@ -8,15 +8,23 @@ environment: dependencies: # firebase_core is pinned exact; its train picks the matching firebase_core_tvos - # (4.11.x -> pi 7.1.0 -> 0.0.2); floating it breaks the native Pigeon ABI. - cloud_functions: 6.3.3 + # (4.14.x -> pi 8.1.1 -> 0.0.3 and later); floating it breaks the native + # Pigeon ABI. firebase_core_tvos 0.0.4 requires firebase_core ^4.13.0. + cloud_functions: 6.3.6 cloud_functions_tvos: path: ../ - firebase_core: 4.11.0 - firebase_core_tvos: ^0.0.1 + firebase_core: 4.14.0 + firebase_core_tvos: ^0.0.4 flutter: sdk: flutter +# This plugin requires firebase_core_tvos ^0.0.4 (the first with a +# tvos/Package.swift). Resolve it from the sibling package so the example +# builds before that version is on pub.dev, and builds what this repo has. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos + dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/cloud_functions_tvos/pubspec.yaml b/packages/cloud_functions_tvos/pubspec.yaml index a7a1850..b9f5806 100644 --- a/packages/cloud_functions_tvos/pubspec.yaml +++ b/packages/cloud_functions_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: cloud_functions_tvos description: >- tvOS (Apple TV) implementation of the cloud_functions Flutter plugin, providing Firebase Cloud Functions (callable + streaming) on Apple TV. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/cloud_functions_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -22,7 +22,9 @@ dependencies: # package's native pod to the generated Podfile if it's reachable here, # which the podspec's `s.dependency 'firebase_core_tvos'` then resolves # instead of failing over to upstream's iOS-only firebase_core pod. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/cloud_functions_tvos/pubspec_overrides.yaml b/packages/cloud_functions_tvos/pubspec_overrides.yaml new file mode 100644 index 0000000..92f7db4 --- /dev/null +++ b/packages/cloud_functions_tvos/pubspec_overrides.yaml @@ -0,0 +1,9 @@ +# Local development override: resolve firebase_core_tvos from the sibling +# package in this monorepo for `flutter pub get` and `dart analyze` until the +# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a +# package's own root pubspec_overrides.yaml out of the archive, so consumers get +# the hosted constraint from pubspec.yaml. A no-op once that version is +# published. +dependency_overrides: + firebase_core_tvos: + path: ../firebase_core_tvos diff --git a/packages/cloud_functions_tvos/tvos/Package.swift b/packages/cloud_functions_tvos/tvos/Package.swift new file mode 100644 index 0000000..fb2866f --- /dev/null +++ b/packages/cloud_functions_tvos/tvos/Package.swift @@ -0,0 +1,45 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +let package = Package( + name: "cloud_functions_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "cloud-functions-tvos", targets: ["cloud_functions_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + .target( + name: "cloud_functions_tvos", + dependencies: [ + // The podspec's Firebase/Functions subspec. + .product(name: "FirebaseFunctions", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + swiftSettings: [ + // Keep Swift `#if TARGET_OS_TV` branches active, matching the podspec. + .define("TARGET_OS_TV"), + ] + ), + ] +) diff --git a/packages/cloud_functions_tvos/tvos/cloud_functions_tvos.podspec b/packages/cloud_functions_tvos/tvos/cloud_functions_tvos.podspec index 3b25f65..019aac1 100644 --- a/packages/cloud_functions_tvos/tvos/cloud_functions_tvos.podspec +++ b/packages/cloud_functions_tvos/tvos/cloud_functions_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'cloud_functions_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of cloud_functions.' s.description = <<-DESC tvOS implementation of cloud_functions, the federated platform diff --git a/packages/firebase_analytics_tvos/CHANGELOG.md b/packages/firebase_analytics_tvos/CHANGELOG.md index 7d46e8b..ce4667a 100644 --- a/packages/firebase_analytics_tvos/CHANGELOG.md +++ b/packages/firebase_analytics_tvos/CHANGELOG.md @@ -1,3 +1,14 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Swift + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. + ## 0.0.1 - Initial tvOS (Apple TV) implementation of `firebase_analytics`, ported from diff --git a/packages/firebase_analytics_tvos/README.md b/packages/firebase_analytics_tvos/README.md index 5f920f8..6ffb57b 100644 --- a/packages/firebase_analytics_tvos/README.md +++ b/packages/firebase_analytics_tvos/README.md @@ -14,9 +14,9 @@ automatically. Apps that already use `firebase_analytics` and target tvOS add: ```yaml dependencies: firebase_analytics: ^12.4.3 - firebase_analytics_tvos: ^0.0.1 + firebase_analytics_tvos: ^0.0.2 firebase_core: ^4.11.0 - firebase_core_tvos: ^0.0.1 # tvOS core (this package depends on it) + firebase_core_tvos: ^0.0.4 # tvOS core (this package depends on it) ``` > **Version alignment matters.** This package's native code matches the @@ -40,6 +40,14 @@ iOS-only). The handler is kept verbatim from upstream, so on tvOS that call is a on-device-conversion flow against it on tvOS. Events appear in Firebase **DebugView** when the app is launched with `-FIRDebugEnabled`. +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_analytics_tvos/example/pubspec.yaml b/packages/firebase_analytics_tvos/example/pubspec.yaml index dbfe347..d4ffc1a 100755 --- a/packages/firebase_analytics_tvos/example/pubspec.yaml +++ b/packages/firebase_analytics_tvos/example/pubspec.yaml @@ -8,15 +8,23 @@ environment: dependencies: # firebase_core is pinned exact; its train picks the matching firebase_core_tvos - # (4.11.x -> pi 7.1.0 -> 0.0.2); floating it breaks the native Pigeon ABI. - firebase_core: 4.11.0 - firebase_analytics: 12.4.3 + # (4.14.x -> pi 8.1.1 -> 0.0.3 and later); floating it breaks the native + # Pigeon ABI. firebase_core_tvos 0.0.4 requires firebase_core ^4.13.0. + firebase_core: 4.14.0 + firebase_analytics: 12.4.6 firebase_analytics_tvos: path: ../ - firebase_core_tvos: ^0.0.1 + firebase_core_tvos: ^0.0.4 flutter: sdk: flutter +# This plugin requires firebase_core_tvos ^0.0.4 (the first with a +# tvos/Package.swift). Resolve it from the sibling package so the example +# builds before that version is on pub.dev, and builds what this repo has. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos + dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_analytics_tvos/pubspec.yaml b/packages/firebase_analytics_tvos/pubspec.yaml index 3a85f6a..57b8f48 100644 --- a/packages/firebase_analytics_tvos/pubspec.yaml +++ b/packages/firebase_analytics_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_analytics_tvos description: >- tvOS (Apple TV) implementation of the firebase_analytics Flutter plugin, providing Firebase Analytics event logging on Apple TV. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_analytics_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -22,7 +22,9 @@ dependencies: # package's native pod to the generated Podfile if it's reachable here, # which the podspec's `s.dependency 'firebase_core_tvos'` then resolves # instead of failing over to upstream's iOS-only firebase_core pod. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_analytics_tvos/pubspec_overrides.yaml b/packages/firebase_analytics_tvos/pubspec_overrides.yaml new file mode 100644 index 0000000..92f7db4 --- /dev/null +++ b/packages/firebase_analytics_tvos/pubspec_overrides.yaml @@ -0,0 +1,9 @@ +# Local development override: resolve firebase_core_tvos from the sibling +# package in this monorepo for `flutter pub get` and `dart analyze` until the +# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a +# package's own root pubspec_overrides.yaml out of the archive, so consumers get +# the hosted constraint from pubspec.yaml. A no-op once that version is +# published. +dependency_overrides: + firebase_core_tvos: + path: ../firebase_core_tvos diff --git a/packages/firebase_analytics_tvos/tvos/Package.swift b/packages/firebase_analytics_tvos/tvos/Package.swift new file mode 100644 index 0000000..46d758d --- /dev/null +++ b/packages/firebase_analytics_tvos/tvos/Package.swift @@ -0,0 +1,45 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +let package = Package( + name: "firebase_analytics_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-analytics-tvos", targets: ["firebase_analytics_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + .target( + name: "firebase_analytics_tvos", + dependencies: [ + // The podspec's Firebase/Analytics subspec. + .product(name: "FirebaseAnalytics", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + swiftSettings: [ + // Keep Swift `#if TARGET_OS_TV` branches active, matching the podspec. + .define("TARGET_OS_TV"), + ] + ), + ] +) diff --git a/packages/firebase_analytics_tvos/tvos/firebase_analytics_tvos.podspec b/packages/firebase_analytics_tvos/tvos/firebase_analytics_tvos.podspec index de2ca13..ef656f4 100644 --- a/packages/firebase_analytics_tvos/tvos/firebase_analytics_tvos.podspec +++ b/packages/firebase_analytics_tvos/tvos/firebase_analytics_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_analytics_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of firebase_analytics.' s.description = <<-DESC tvOS implementation of firebase_analytics, the federated platform diff --git a/packages/firebase_app_check_tvos/CHANGELOG.md b/packages/firebase_app_check_tvos/CHANGELOG.md index 5b366d1..8d9353c 100644 --- a/packages/firebase_app_check_tvos/CHANGELOG.md +++ b/packages/firebase_app_check_tvos/CHANGELOG.md @@ -1,3 +1,14 @@ +## 0.0.3 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Swift + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. + ## 0.0.2 * Regenerated the Pigeon messages against `firebase_app_check` 0.4.7: `activate()` diff --git a/packages/firebase_app_check_tvos/README.md b/packages/firebase_app_check_tvos/README.md index fbf0302..dcb8e7e 100644 --- a/packages/firebase_app_check_tvos/README.md +++ b/packages/firebase_app_check_tvos/README.md @@ -14,9 +14,9 @@ automatically. Apps that already use `firebase_app_check` and target tvOS add: ```yaml dependencies: firebase_app_check: ">=0.4.7 <0.4.8" # closed window: 0.4.8 may move the Pigeon contract - firebase_app_check_tvos: ^0.0.2 + firebase_app_check_tvos: ^0.0.3 firebase_core: ^4.14.0 - firebase_core_tvos: ^0.0.3 # tvOS core (this package depends on it) + firebase_core_tvos: ^0.0.4 # tvOS core (this package depends on it) ``` Use the Apple providers that exist on tvOS 15+ — **DeviceCheck** or **App Attest**: @@ -53,6 +53,14 @@ simulator — use the Debug provider there). | Apple TV (`appletvos`) | yes | ⏳ pending physical Apple TV pass (DeviceCheck runs only on real hardware) | | Apple TV simulator (`appletvsimulator`) | yes | ✅ re-verified for 0.0.2 on tvOS 26.5 (Apple TV 4K, 3rd gen) — all three `activate()` calls cross the 5-argument Pigeon payload, and `getToken` / `getLimitedUseToken` both reach `exchangeDebugToken` on the App Check backend and return typed errors to Dart. Token *issuance* still needs a debug token registered in the console; attestation itself needs real hardware | +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_app_check_tvos/example/pubspec.yaml b/packages/firebase_app_check_tvos/example/pubspec.yaml index c657b2b..3653d98 100644 --- a/packages/firebase_app_check_tvos/example/pubspec.yaml +++ b/packages/firebase_app_check_tvos/example/pubspec.yaml @@ -13,10 +13,17 @@ dependencies: firebase_app_check: 0.4.7 firebase_app_check_tvos: path: ../ - firebase_core_tvos: ^0.0.3 + firebase_core_tvos: ^0.0.4 flutter: sdk: flutter +# This plugin requires firebase_core_tvos ^0.0.4 (the first with a +# tvos/Package.swift). Resolve it from the sibling package so the example +# builds before that version is on pub.dev, and builds what this repo has. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos + dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_app_check_tvos/pubspec.yaml b/packages/firebase_app_check_tvos/pubspec.yaml index acba218..7a83a50 100644 --- a/packages/firebase_app_check_tvos/pubspec.yaml +++ b/packages/firebase_app_check_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_app_check_tvos description: >- tvOS (Apple TV) implementation of the firebase_app_check Flutter plugin, providing Firebase App Check on Apple TV (App Attest / DeviceCheck). -version: 0.0.2 +version: 0.0.3 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_app_check_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -28,7 +28,9 @@ dependencies: # constraint but 0.0.1 does not constrain at all. Without this floor pub can # legally pick 0.0.1, whose native Pigeon expects the pre-8.1 FirebaseOptions # payload — a crash at launch instead of a solver error. - firebase_core_tvos: ^0.0.3 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_app_check_tvos/pubspec_overrides.yaml b/packages/firebase_app_check_tvos/pubspec_overrides.yaml new file mode 100644 index 0000000..92f7db4 --- /dev/null +++ b/packages/firebase_app_check_tvos/pubspec_overrides.yaml @@ -0,0 +1,9 @@ +# Local development override: resolve firebase_core_tvos from the sibling +# package in this monorepo for `flutter pub get` and `dart analyze` until the +# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a +# package's own root pubspec_overrides.yaml out of the archive, so consumers get +# the hosted constraint from pubspec.yaml. A no-op once that version is +# published. +dependency_overrides: + firebase_core_tvos: + path: ../firebase_core_tvos diff --git a/packages/firebase_app_check_tvos/tvos/Package.swift b/packages/firebase_app_check_tvos/tvos/Package.swift new file mode 100644 index 0000000..2add2c6 --- /dev/null +++ b/packages/firebase_app_check_tvos/tvos/Package.swift @@ -0,0 +1,45 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +let package = Package( + name: "firebase_app_check_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-app-check-tvos", targets: ["firebase_app_check_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + .target( + name: "firebase_app_check_tvos", + dependencies: [ + // The podspec's Firebase/AppCheck subspec. + .product(name: "FirebaseAppCheck", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + swiftSettings: [ + // Keep Swift `#if TARGET_OS_TV` branches active, matching the podspec. + .define("TARGET_OS_TV"), + ] + ), + ] +) diff --git a/packages/firebase_app_check_tvos/tvos/firebase_app_check_tvos.podspec b/packages/firebase_app_check_tvos/tvos/firebase_app_check_tvos.podspec index 57aff69..de33d79 100644 --- a/packages/firebase_app_check_tvos/tvos/firebase_app_check_tvos.podspec +++ b/packages/firebase_app_check_tvos/tvos/firebase_app_check_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_app_check_tvos' - s.version = '0.0.2' + s.version = '0.0.3' s.summary = 'tvOS implementation of firebase_app_check.' s.description = <<-DESC tvOS implementation of firebase_app_check, the federated platform diff --git a/packages/firebase_auth_tvos/CHANGELOG.md b/packages/firebase_auth_tvos/CHANGELOG.md index c7d8626..299fca8 100644 --- a/packages/firebase_auth_tvos/CHANGELOG.md +++ b/packages/firebase_auth_tvos/CHANGELOG.md @@ -1,3 +1,18 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Objective-C + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. +* Imports firebase_core_tvos's headers as `` when + `` (the CocoaPods layout) is not there. +* `LIBRARY_VERSION` (podspec and Package.swift) now matches the package version. + It said 0.0.1. + ## 0.0.1 * Initial tvOS scaffolding generated by `flutter-tvos plugin port` from diff --git a/packages/firebase_auth_tvos/README.md b/packages/firebase_auth_tvos/README.md index 63dcc4e..e3e252a 100644 --- a/packages/firebase_auth_tvos/README.md +++ b/packages/firebase_auth_tvos/README.md @@ -16,7 +16,7 @@ it: ```yaml dependencies: firebase_auth: ^6.5.4 - firebase_auth_tvos: ^0.0.1 + firebase_auth_tvos: ^0.0.2 ``` The native plugin registers automatically through flutter-tvos' plugin @@ -58,6 +58,14 @@ Calls into the unsupported methods return an `unsupported-platform`/ - Apple TV running tvOS 15.0 or later (the Firebase Apple SDK's minimum). - `firebase_core_tvos` (pulled in automatically). +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_auth_tvos/pubspec.yaml b/packages/firebase_auth_tvos/pubspec.yaml index d19721a..77cb0e6 100644 --- a/packages/firebase_auth_tvos/pubspec.yaml +++ b/packages/firebase_auth_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_auth_tvos description: >- tvOS (Apple TV) implementation of the firebase_auth Flutter plugin, supporting anonymous, email/password and Sign in with Apple authentication on Apple TV. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_auth_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -24,7 +24,9 @@ dependencies: # against locally instead of failing over to upstream's iOS-only pod. # Hosted constraint for pub.dev (path deps can't be published); local # development resolves it via pubspec_overrides.yaml until it's published. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_auth_tvos/tvos/Classes/FLTFirebaseAuthPlugin.m b/packages/firebase_auth_tvos/tvos/Classes/FLTFirebaseAuthPlugin.m index 4561a40..3d9131a 100644 --- a/packages/firebase_auth_tvos/tvos/Classes/FLTFirebaseAuthPlugin.m +++ b/packages/firebase_auth_tvos/tvos/Classes/FLTFirebaseAuthPlugin.m @@ -9,6 +9,8 @@ // pod (which has no tvOS platform declaration) — see PORTING_REPORT.md. #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePluginRegistry.h" #endif @@ -32,6 +34,8 @@ #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebaseCorePlugin.h" #endif diff --git a/packages/firebase_auth_tvos/tvos/Classes/include/Public/FLTFirebaseAuthPlugin.h b/packages/firebase_auth_tvos/tvos/Classes/include/Public/FLTFirebaseAuthPlugin.h index c1b4a9c..5875100 100644 --- a/packages/firebase_auth_tvos/tvos/Classes/include/Public/FLTFirebaseAuthPlugin.h +++ b/packages/firebase_auth_tvos/tvos/Classes/include/Public/FLTFirebaseAuthPlugin.h @@ -19,6 +19,8 @@ // pod (which has no tvOS platform declaration) — see PORTING_REPORT.md. #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePlugin.h" #endif diff --git a/packages/firebase_auth_tvos/tvos/Package.swift b/packages/firebase_auth_tvos/tvos/Package.swift new file mode 100644 index 0000000..0fe623e --- /dev/null +++ b/packages/firebase_auth_tvos/tvos/Package.swift @@ -0,0 +1,53 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +// Keep in step with `version:` in pubspec.yaml and `s.version` in the podspec. +let libraryVersion = "0.0.2" + +let package = Package( + name: "firebase_auth_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-auth-tvos", targets: ["firebase_auth_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + // All Objective-C, so one target (SwiftPM cannot mix languages in one). + .target( + name: "firebase_auth_tvos", + dependencies: [ + // The podspec's Firebase/Auth subspec. + .product(name: "FirebaseAuth", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + publicHeadersPath: "include/Public", + cSettings: [ + .headerSearchPath("include/Private"), + .headerSearchPath("include/Public"), + // The podspec's GCC_PREPROCESSOR_DEFINITIONS. + .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), + .define("LIBRARY_NAME", to: "\"flutter-fire-auth-tvos\""), + ] + ), + ] +) diff --git a/packages/firebase_auth_tvos/tvos/firebase_auth_tvos.podspec b/packages/firebase_auth_tvos/tvos/firebase_auth_tvos.podspec index 48c8165..d239964 100644 --- a/packages/firebase_auth_tvos/tvos/firebase_auth_tvos.podspec +++ b/packages/firebase_auth_tvos/tvos/firebase_auth_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_auth_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of firebase_auth.' s.description = <<-DESC tvOS implementation of firebase_auth, the federated platform @@ -39,7 +39,7 @@ package that ships native code targeting Apple tvOS. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'GCC_PREPROCESSOR_DEFINITIONS' => - '$(inherited) LIBRARY_VERSION=\"0.0.1\" LIBRARY_NAME=\"flutter-fire-auth-tvos\"', + '$(inherited) LIBRARY_VERSION=\"0.0.2\" LIBRARY_NAME=\"flutter-fire-auth-tvos\"', } # The ported Classes/ call into FIRAuth (Firebase/Auth) and into our own diff --git a/packages/firebase_core_tvos/CHANGELOG.md b/packages/firebase_core_tvos/CHANGELOG.md index e3ef9cb..4fd76fa 100644 --- a/packages/firebase_core_tvos/CHANGELOG.md +++ b/packages/firebase_core_tvos/CHANGELOG.md @@ -1,3 +1,20 @@ +## 0.0.4 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Objective-C + target, `include/` as the public headers). flutter-tvos links a plugin that + ships `tvos/Package.swift` through Swift Package Manager and leaves it out of + the Podfile. The tvOS FlutterFire ports that depend on this package move to + SwiftPM in the same change and require `firebase_core_tvos: ^0.0.4`: a port + still on its podspec would no longer find the `firebase_core_tvos` pod. +* Plugins now register with the Firebase SDK under SwiftPM too. + `FIRAppInternal.h` is not reachable there (firebase-ios-sdk vends + FirebaseCoreExtension as no product), so `REGISTER_LIB` was never defined and + `+[FIRApp registerLibrary:withVersion:]` was skipped. The method is now + declared locally when neither header is found, and the call first checks that + `FIRApp` responds to it. +* `LIBRARY_VERSION` (podspec and Package.swift) now matches the package version. + It said 0.0.1. + ## 0.0.3 * Regenerate the native Pigeon sources from `firebase_core` 4.13.0, which decode the diff --git a/packages/firebase_core_tvos/README.md b/packages/firebase_core_tvos/README.md index c5b8e34..8fcdeb2 100644 --- a/packages/firebase_core_tvos/README.md +++ b/packages/firebase_core_tvos/README.md @@ -16,7 +16,7 @@ it: ```yaml dependencies: firebase_core: ^4.13.0 - firebase_core_tvos: ^0.0.3 + firebase_core_tvos: ^0.0.4 ``` The native plugin registers automatically through flutter-tvos' plugin @@ -43,6 +43,15 @@ matrices — see their respective `*_tvos` packages. - Apple TV running tvOS 15.0 or later (the Firebase Apple SDK's minimum). +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. Every tvOS FlutterFire port that depends +on this package ships one too, from the version that requires +`firebase_core_tvos: ^0.0.4`, so they link through SwiftPM together and share +one firebase-ios-sdk (`~> 12.15.0`, as in the podspecs). + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_core_tvos/pubspec.yaml b/packages/firebase_core_tvos/pubspec.yaml index cb43ff0..48cc9ae 100644 --- a/packages/firebase_core_tvos/pubspec.yaml +++ b/packages/firebase_core_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_core_tvos description: >- tvOS (Apple TV) implementation of the firebase_core Flutter plugin, enabling Firebase initialization on Apple TV via the flutter-tvos toolchain. -version: 0.0.3 +version: 0.0.4 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_core_tvos issue_tracker: https://github.com/fluttertv/plugins/issues diff --git a/packages/firebase_core_tvos/tvos/Classes/FLTFirebasePluginRegistry.m b/packages/firebase_core_tvos/tvos/Classes/FLTFirebasePluginRegistry.m index a6f2f56..840aca9 100644 --- a/packages/firebase_core_tvos/tvos/Classes/FLTFirebasePluginRegistry.m +++ b/packages/firebase_core_tvos/tvos/Classes/FLTFirebasePluginRegistry.m @@ -14,6 +14,16 @@ #elif __has_include() #import #define REGISTER_LIB +#else +// Swift Package Manager: firebase-ios-sdk vends FirebaseCoreExtension, which +// holds FIRAppInternal.h, as no product, so neither import above resolves and +// the plugins would never be registered with Firebase. FIRApp implements +// +registerLibrary:withVersion: in every SDK build; declare it here. The call +// below checks for it at runtime. +@interface FIRApp (FLTFirebaseRegisterLibrary) ++ (void)registerLibrary:(nonnull NSString *)name withVersion:(nonnull NSString *)version; +@end +#define REGISTER_LIB #endif @implementation FLTFirebasePluginRegistry { @@ -42,8 +52,10 @@ + (instancetype)sharedInstance { - (void)registerFirebasePlugin:(id)firebasePlugin { // Register the library with the Firebase backend. #ifdef REGISTER_LIB - [FIRApp registerLibrary:[firebasePlugin firebaseLibraryName] - withVersion:[firebasePlugin firebaseLibraryVersion]]; + if ([FIRApp respondsToSelector:@selector(registerLibrary:withVersion:)]) { + [FIRApp registerLibrary:[firebasePlugin firebaseLibraryName] + withVersion:[firebasePlugin firebaseLibraryVersion]]; + } #endif // Store the plugin delegate for later usage. registeredPlugins[[firebasePlugin flutterChannelName]] = firebasePlugin; diff --git a/packages/firebase_core_tvos/tvos/Package.swift b/packages/firebase_core_tvos/tvos/Package.swift new file mode 100644 index 0000000..200dc18 --- /dev/null +++ b/packages/firebase_core_tvos/tvos/Package.swift @@ -0,0 +1,55 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +// +// flutter-tvos links a plugin that ships this file through SwiftPM and leaves +// it out of the Podfile. Every tvOS FlutterFire port that depends on this one +// ships a Package.swift too, and pulls this package in as +// `.package(path: "../firebase_core_tvos")`. +import PackageDescription + +// Keep in step with `version:` in pubspec.yaml and `s.version` in the podspec. +let libraryVersion = "0.0.4" + +let package = Package( + name: "firebase_core_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-core-tvos", targets: ["firebase_core_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + // All Objective-C, so one target (SwiftPM cannot mix languages in one). + // The headers under include/ are the module's public surface, which the + // other tvOS FlutterFire ports import. + .target( + name: "firebase_core_tvos", + dependencies: [ + .product(name: "FirebaseCore", package: "firebase-ios-sdk"), + .product(name: "FirebaseInstallations", package: "firebase-ios-sdk"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + publicHeadersPath: "include", + cSettings: [ + .headerSearchPath("include/firebase_core"), + .headerSearchPath("include"), + // The podspec's GCC_PREPROCESSOR_DEFINITIONS. + .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), + .define("LIBRARY_NAME", to: "\"flutter-fire-core-tvos\""), + ] + ), + ] +) diff --git a/packages/firebase_core_tvos/tvos/firebase_core_tvos.podspec b/packages/firebase_core_tvos/tvos/firebase_core_tvos.podspec index 93a32c4..dbe6de1 100644 --- a/packages/firebase_core_tvos/tvos/firebase_core_tvos.podspec +++ b/packages/firebase_core_tvos/tvos/firebase_core_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_core_tvos' - s.version = '0.0.3' + s.version = '0.0.4' s.summary = 'tvOS implementation of firebase_core.' s.description = <<-DESC tvOS implementation of firebase_core, the federated platform @@ -38,7 +38,7 @@ package that ships native code targeting Apple tvOS. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'GCC_PREPROCESSOR_DEFINITIONS' => - '$(inherited) LIBRARY_VERSION=\"0.0.1\" LIBRARY_NAME=\"flutter-fire-core-tvos\"', + '$(inherited) LIBRARY_VERSION=\"0.0.4\" LIBRARY_NAME=\"flutter-fire-core-tvos\"', } # The ported Classes/ call into FIRApp (FirebaseCore), same as upstream diff --git a/packages/firebase_crashlytics_tvos/CHANGELOG.md b/packages/firebase_crashlytics_tvos/CHANGELOG.md index fda491b..8e1630b 100644 --- a/packages/firebase_crashlytics_tvos/CHANGELOG.md +++ b/packages/firebase_crashlytics_tvos/CHANGELOG.md @@ -1,3 +1,18 @@ +## 0.0.3 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (a Swift target + and an Objective-C target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. +* Sources moved to `Classes/firebase_crashlytics_tvos/` (Swift) and + `Classes/firebase_crashlytics_objc/` (Objective-C), because a SwiftPM target + cannot mix the two. Same split as upstream `firebase_crashlytics`. The podspec + globs match both. + ## 0.0.2 * Re-ported from `firebase_crashlytics` 5.3.0 (Swift + Pigeon). With 0.0.1, diff --git a/packages/firebase_crashlytics_tvos/PORTING_REPORT.md b/packages/firebase_crashlytics_tvos/PORTING_REPORT.md index d94fbc2..9b89cda 100644 --- a/packages/firebase_crashlytics_tvos/PORTING_REPORT.md +++ b/packages/firebase_crashlytics_tvos/PORTING_REPORT.md @@ -138,6 +138,9 @@ upstream 5.3.0's `ios/firebase_crashlytics/Sources/`, verbatim except: `registrar.messenger()` branch also covers `os(tvOS)`. - `FirebaseCrashlyticsMessages.g.swift`: `import Flutter` also covers `os(tvOS)`. - Upstream's Swift and ObjC SPM targets are one pod (`DEFINES_MODULE`). + Since 0.0.3 the sources sit in upstream's two directories + (`Classes/firebase_crashlytics_tvos/`, `Classes/firebase_crashlytics_objc/`) + and `tvos/Package.swift` builds them as the same two SwiftPM targets. - Podspec: `Firebase/Crashlytics ~> 12.15.0` to match `firebase_core_tvos` (upstream uses 12.18.0). diff --git a/packages/firebase_crashlytics_tvos/README.md b/packages/firebase_crashlytics_tvos/README.md index 46044bd..108509e 100644 --- a/packages/firebase_crashlytics_tvos/README.md +++ b/packages/firebase_crashlytics_tvos/README.md @@ -14,9 +14,9 @@ automatically. Apps that already use `firebase_crashlytics` and target tvOS add: ```yaml dependencies: firebase_crashlytics: ^5.3.0 - firebase_crashlytics_tvos: ^0.0.2 + firebase_crashlytics_tvos: ^0.0.3 firebase_core: ^4.14.0 - firebase_core_tvos: ^0.0.3 # tvOS core (this package depends on it) + firebase_core_tvos: ^0.0.4 # tvOS core (this package depends on it) ``` > **Version alignment matters.** This package's native code matches the @@ -48,6 +48,14 @@ flutter-tvos layout lacks). dSYMs are still produced (the podspec sets runs `"${PODS_ROOT}/FirebaseCrashlytics/run"`. Dart `recordError` reports are already symbolicated. +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_crashlytics_tvos/example/pubspec.yaml b/packages/firebase_crashlytics_tvos/example/pubspec.yaml index 5f6a6cf..391b817 100755 --- a/packages/firebase_crashlytics_tvos/example/pubspec.yaml +++ b/packages/firebase_crashlytics_tvos/example/pubspec.yaml @@ -13,10 +13,17 @@ dependencies: firebase_crashlytics: 5.3.0 firebase_crashlytics_tvos: path: ../ - firebase_core_tvos: ^0.0.3 + firebase_core_tvos: ^0.0.4 flutter: sdk: flutter +# This plugin requires firebase_core_tvos ^0.0.4 (the first with a +# tvos/Package.swift). Resolve it from the sibling package so the example +# builds before that version is on pub.dev, and builds what this repo has. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos + dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_crashlytics_tvos/pubspec.yaml b/packages/firebase_crashlytics_tvos/pubspec.yaml index 809586d..1f21b81 100644 --- a/packages/firebase_crashlytics_tvos/pubspec.yaml +++ b/packages/firebase_crashlytics_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_crashlytics_tvos description: >- tvOS (Apple TV) implementation of the firebase_crashlytics Flutter plugin, providing Firebase Crashlytics crash reporting on Apple TV. -version: 0.0.2 +version: 0.0.3 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_crashlytics_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -16,8 +16,9 @@ environment: dependencies: flutter: sdk: flutter - # tvos/Classes/*.g.swift is generated against 5.3.0. 5.4.0 ships the same - # native sources apart from versionNumber. 6.0.0 needs firebase_core 5.x, + # tvos/Classes/firebase_crashlytics_tvos/*.g.swift is generated against + # 5.3.0. 5.4.0 ships the same native sources apart from versionNumber. + # 6.0.0 needs firebase_core 5.x, # which firebase_core_tvos doesn't support yet. firebase_crashlytics: ^5.3.0 # Transitive Dart dependency so the app's dependency graph includes @@ -26,7 +27,9 @@ dependencies: # which the podspec's `s.dependency 'firebase_core_tvos'` then resolves # instead of failing over to upstream's iOS-only firebase_core pod. # 0.0.3+ matches the platform interface 8.1.1 that 5.3.0 needs. - firebase_core_tvos: ^0.0.3 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_crashlytics_tvos/pubspec_overrides.yaml b/packages/firebase_crashlytics_tvos/pubspec_overrides.yaml new file mode 100644 index 0000000..92f7db4 --- /dev/null +++ b/packages/firebase_crashlytics_tvos/pubspec_overrides.yaml @@ -0,0 +1,9 @@ +# Local development override: resolve firebase_core_tvos from the sibling +# package in this monorepo for `flutter pub get` and `dart analyze` until the +# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a +# package's own root pubspec_overrides.yaml out of the archive, so consumers get +# the hosted constraint from pubspec.yaml. A no-op once that version is +# published. +dependency_overrides: + firebase_core_tvos: + path: ../firebase_core_tvos diff --git a/packages/firebase_crashlytics_tvos/tvos/Classes/CrashlyticsPlatformHelpers.m b/packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/CrashlyticsPlatformHelpers.m similarity index 100% rename from packages/firebase_crashlytics_tvos/tvos/Classes/CrashlyticsPlatformHelpers.m rename to packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/CrashlyticsPlatformHelpers.m diff --git a/packages/firebase_crashlytics_tvos/tvos/Classes/include/CrashlyticsPlatformHelpers.h b/packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/include/CrashlyticsPlatformHelpers.h similarity index 100% rename from packages/firebase_crashlytics_tvos/tvos/Classes/include/CrashlyticsPlatformHelpers.h rename to packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/include/CrashlyticsPlatformHelpers.h diff --git a/packages/firebase_crashlytics_tvos/tvos/Classes/include/Crashlytics_Platform.h b/packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/include/Crashlytics_Platform.h similarity index 100% rename from packages/firebase_crashlytics_tvos/tvos/Classes/include/Crashlytics_Platform.h rename to packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/include/Crashlytics_Platform.h diff --git a/packages/firebase_crashlytics_tvos/tvos/Classes/include/ExceptionModel_Platform.h b/packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/include/ExceptionModel_Platform.h similarity index 100% rename from packages/firebase_crashlytics_tvos/tvos/Classes/include/ExceptionModel_Platform.h rename to packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_objc/include/ExceptionModel_Platform.h diff --git a/packages/firebase_crashlytics_tvos/tvos/Classes/Constants.swift b/packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_tvos/Constants.swift similarity index 100% rename from packages/firebase_crashlytics_tvos/tvos/Classes/Constants.swift rename to packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_tvos/Constants.swift diff --git a/packages/firebase_crashlytics_tvos/tvos/Classes/FirebaseCrashlyticsMessages.g.swift b/packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_tvos/FirebaseCrashlyticsMessages.g.swift similarity index 100% rename from packages/firebase_crashlytics_tvos/tvos/Classes/FirebaseCrashlyticsMessages.g.swift rename to packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_tvos/FirebaseCrashlyticsMessages.g.swift diff --git a/packages/firebase_crashlytics_tvos/tvos/Classes/FirebaseCrashlyticsPlugin.swift b/packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_tvos/FirebaseCrashlyticsPlugin.swift similarity index 100% rename from packages/firebase_crashlytics_tvos/tvos/Classes/FirebaseCrashlyticsPlugin.swift rename to packages/firebase_crashlytics_tvos/tvos/Classes/firebase_crashlytics_tvos/FirebaseCrashlyticsPlugin.swift diff --git a/packages/firebase_crashlytics_tvos/tvos/Package.swift b/packages/firebase_crashlytics_tvos/tvos/Package.swift new file mode 100644 index 0000000..36d7bfd --- /dev/null +++ b/packages/firebase_crashlytics_tvos/tvos/Package.swift @@ -0,0 +1,62 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The targets reuse +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +let package = Package( + name: "firebase_crashlytics_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-crashlytics-tvos", targets: ["firebase_crashlytics_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + // SwiftPM cannot mix Swift and Objective-C in one target, so the + // Objective-C helpers get their own target, as in upstream + // firebase_crashlytics. The Swift plugin imports it under + // `#if canImport(firebase_crashlytics_objc)`; CocoaPods builds both + // directories into one module. + .target( + name: "firebase_crashlytics_objc", + dependencies: [ + .product(name: "FirebaseCrashlytics", package: "firebase-ios-sdk"), + ], + path: "Classes/firebase_crashlytics_objc", + publicHeadersPath: "include", + cSettings: [ + .headerSearchPath("include"), + ] + ), + .target( + name: "firebase_crashlytics_tvos", + dependencies: [ + "firebase_crashlytics_objc", + // The podspec's Firebase/Crashlytics subspec. + .product(name: "FirebaseCrashlytics", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes/firebase_crashlytics_tvos", + swiftSettings: [ + // Keep Swift `#if TARGET_OS_TV` branches active, matching the podspec. + .define("TARGET_OS_TV"), + ] + ), + ] +) diff --git a/packages/firebase_crashlytics_tvos/tvos/firebase_crashlytics_tvos.podspec b/packages/firebase_crashlytics_tvos/tvos/firebase_crashlytics_tvos.podspec index e97c034..a65a124 100644 --- a/packages/firebase_crashlytics_tvos/tvos/firebase_crashlytics_tvos.podspec +++ b/packages/firebase_crashlytics_tvos/tvos/firebase_crashlytics_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_crashlytics_tvos' - s.version = '0.0.2' + s.version = '0.0.3' s.summary = 'tvOS implementation of firebase_crashlytics.' s.description = <<-DESC tvOS implementation of firebase_crashlytics, the federated platform diff --git a/packages/firebase_messaging_tvos/CHANGELOG.md b/packages/firebase_messaging_tvos/CHANGELOG.md index c8e3dca..cf4c7c6 100644 --- a/packages/firebase_messaging_tvos/CHANGELOG.md +++ b/packages/firebase_messaging_tvos/CHANGELOG.md @@ -1,3 +1,18 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Objective-C + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. +* Imports firebase_core_tvos's headers as `` when + `` (the CocoaPods layout) is not there. +* `LIBRARY_VERSION` (podspec and Package.swift) now matches the package version. + It said 0.0.1. + ## 0.0.1 * Initial tvOS scaffolding generated by `flutter-tvos plugin port` from diff --git a/packages/firebase_messaging_tvos/README.md b/packages/firebase_messaging_tvos/README.md index 5405ed1..dc9bd06 100644 --- a/packages/firebase_messaging_tvos/README.md +++ b/packages/firebase_messaging_tvos/README.md @@ -16,7 +16,7 @@ alongside it: ```yaml dependencies: firebase_messaging: ^16.4.1 - firebase_messaging_tvos: ^0.0.1 + firebase_messaging_tvos: ^0.0.2 ``` The native plugin registers automatically through flutter-tvos' plugin @@ -63,6 +63,14 @@ verification questions. - A push-enabled provisioning profile and APNs setup, as for any FCM app. - `firebase_core_tvos` (pulled in automatically). +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_messaging_tvos/pubspec.yaml b/packages/firebase_messaging_tvos/pubspec.yaml index dd88133..6e64c21 100644 --- a/packages/firebase_messaging_tvos/pubspec.yaml +++ b/packages/firebase_messaging_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_messaging_tvos description: >- tvOS (Apple TV) implementation of the firebase_messaging Flutter plugin, providing Firebase Cloud Messaging push notifications on Apple TV. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_messaging_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -24,7 +24,9 @@ dependencies: # against locally instead of failing over to upstream's iOS-only pod. # Hosted constraint for pub.dev (path deps can't be published); local # development resolves it via pubspec_overrides.yaml until it's published. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_messaging_tvos/tvos/Classes/FLTFirebaseMessagingPlugin.m b/packages/firebase_messaging_tvos/tvos/Classes/FLTFirebaseMessagingPlugin.m index 84ce978..f5796b2 100644 --- a/packages/firebase_messaging_tvos/tvos/Classes/FLTFirebaseMessagingPlugin.m +++ b/packages/firebase_messaging_tvos/tvos/Classes/FLTFirebaseMessagingPlugin.m @@ -6,6 +6,8 @@ #import #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePluginRegistry.h" #endif diff --git a/packages/firebase_messaging_tvos/tvos/Classes/include/FLTFirebaseMessagingPlugin.h b/packages/firebase_messaging_tvos/tvos/Classes/include/FLTFirebaseMessagingPlugin.h index 3fc6214..bf061b7 100644 --- a/packages/firebase_messaging_tvos/tvos/Classes/include/FLTFirebaseMessagingPlugin.h +++ b/packages/firebase_messaging_tvos/tvos/Classes/include/FLTFirebaseMessagingPlugin.h @@ -16,6 +16,8 @@ #if __has_include() #import +#elif __has_include() // SwiftPM +#import #else #import "FLTFirebasePlugin.h" #endif diff --git a/packages/firebase_messaging_tvos/tvos/Package.swift b/packages/firebase_messaging_tvos/tvos/Package.swift new file mode 100644 index 0000000..84fb02b --- /dev/null +++ b/packages/firebase_messaging_tvos/tvos/Package.swift @@ -0,0 +1,52 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +// Keep in step with `version:` in pubspec.yaml and `s.version` in the podspec. +let libraryVersion = "0.0.2" + +let package = Package( + name: "firebase_messaging_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-messaging-tvos", targets: ["firebase_messaging_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + // All Objective-C, so one target (SwiftPM cannot mix languages in one). + .target( + name: "firebase_messaging_tvos", + dependencies: [ + // The podspec's Firebase/Messaging subspec. + .product(name: "FirebaseMessaging", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + publicHeadersPath: "include", + cSettings: [ + .headerSearchPath("include"), + // The podspec's GCC_PREPROCESSOR_DEFINITIONS. + .define("LIBRARY_VERSION", to: "\"\(libraryVersion)\""), + .define("LIBRARY_NAME", to: "\"flutter-fire-fcm-tvos\""), + ] + ), + ] +) diff --git a/packages/firebase_messaging_tvos/tvos/firebase_messaging_tvos.podspec b/packages/firebase_messaging_tvos/tvos/firebase_messaging_tvos.podspec index 5c50234..1d235e8 100644 --- a/packages/firebase_messaging_tvos/tvos/firebase_messaging_tvos.podspec +++ b/packages/firebase_messaging_tvos/tvos/firebase_messaging_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_messaging_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of firebase_messaging.' s.description = <<-DESC tvOS implementation of firebase_messaging, the federated platform @@ -39,7 +39,7 @@ package that ships native code targeting Apple tvOS. s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES', 'GCC_PREPROCESSOR_DEFINITIONS' => - '$(inherited) LIBRARY_VERSION=\"0.0.1\" LIBRARY_NAME=\"flutter-fire-fcm-tvos\"', + '$(inherited) LIBRARY_VERSION=\"0.0.2\" LIBRARY_NAME=\"flutter-fire-fcm-tvos\"', } # The ported Classes/ call into FIRMessaging (Firebase/Messaging) and into diff --git a/packages/firebase_performance_tvos/CHANGELOG.md b/packages/firebase_performance_tvos/CHANGELOG.md index a768ae1..52fc1a1 100644 --- a/packages/firebase_performance_tvos/CHANGELOG.md +++ b/packages/firebase_performance_tvos/CHANGELOG.md @@ -1,3 +1,14 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Swift + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. + ## 0.0.1 * Initial tvOS (Apple TV) implementation of `firebase_performance`, ported from diff --git a/packages/firebase_performance_tvos/README.md b/packages/firebase_performance_tvos/README.md index 1873638..bd13251 100644 --- a/packages/firebase_performance_tvos/README.md +++ b/packages/firebase_performance_tvos/README.md @@ -14,9 +14,9 @@ automatically. Apps that already use `firebase_performance` and target tvOS add: ```yaml dependencies: firebase_performance: ^0.11.4+3 - firebase_performance_tvos: ^0.0.1 + firebase_performance_tvos: ^0.0.2 firebase_core: ^4.11.0 - firebase_core_tvos: ^0.0.1 # tvOS core (this package depends on it) + firebase_core_tvos: ^0.0.4 # tvOS core (this package depends on it) ``` > **Version alignment matters.** This package's native code matches the @@ -36,6 +36,14 @@ All `firebase_performance` APIs are available (no tvOS feature disables) — custom traces + HTTP metrics. (Performance dashboard data is batched and can take up to ~12h to appear; the console log confirms capture immediately.) +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_performance_tvos/example/pubspec.yaml b/packages/firebase_performance_tvos/example/pubspec.yaml index b81ef30..03f2ef9 100755 --- a/packages/firebase_performance_tvos/example/pubspec.yaml +++ b/packages/firebase_performance_tvos/example/pubspec.yaml @@ -8,15 +8,23 @@ environment: dependencies: # firebase_core is pinned exact; its train picks the matching firebase_core_tvos - # (4.11.x -> pi 7.1.0 -> 0.0.2); floating it breaks the native Pigeon ABI. - firebase_core: 4.11.0 - firebase_performance: 0.11.4+3 + # (4.14.x -> pi 8.1.1 -> 0.0.3 and later); floating it breaks the native + # Pigeon ABI. firebase_core_tvos 0.0.4 requires firebase_core ^4.13.0. + firebase_core: 4.14.0 + firebase_performance: 0.11.4+6 firebase_performance_tvos: path: ../ - firebase_core_tvos: ^0.0.1 + firebase_core_tvos: ^0.0.4 flutter: sdk: flutter +# This plugin requires firebase_core_tvos ^0.0.4 (the first with a +# tvos/Package.swift). Resolve it from the sibling package so the example +# builds before that version is on pub.dev, and builds what this repo has. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos + dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_performance_tvos/pubspec.yaml b/packages/firebase_performance_tvos/pubspec.yaml index 457438f..6ff1ad2 100644 --- a/packages/firebase_performance_tvos/pubspec.yaml +++ b/packages/firebase_performance_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_performance_tvos description: >- tvOS (Apple TV) implementation of the firebase_performance Flutter plugin, providing Firebase Performance Monitoring on Apple TV. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_performance_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -22,7 +22,9 @@ dependencies: # package's native pod to the generated Podfile if it's reachable here, # which the podspec's `s.dependency 'firebase_core_tvos'` then resolves # instead of failing over to upstream's iOS-only firebase_core pod. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_performance_tvos/pubspec_overrides.yaml b/packages/firebase_performance_tvos/pubspec_overrides.yaml new file mode 100644 index 0000000..92f7db4 --- /dev/null +++ b/packages/firebase_performance_tvos/pubspec_overrides.yaml @@ -0,0 +1,9 @@ +# Local development override: resolve firebase_core_tvos from the sibling +# package in this monorepo for `flutter pub get` and `dart analyze` until the +# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a +# package's own root pubspec_overrides.yaml out of the archive, so consumers get +# the hosted constraint from pubspec.yaml. A no-op once that version is +# published. +dependency_overrides: + firebase_core_tvos: + path: ../firebase_core_tvos diff --git a/packages/firebase_performance_tvos/tvos/Package.swift b/packages/firebase_performance_tvos/tvos/Package.swift new file mode 100644 index 0000000..0c140a3 --- /dev/null +++ b/packages/firebase_performance_tvos/tvos/Package.swift @@ -0,0 +1,45 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +let package = Package( + name: "firebase_performance_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-performance-tvos", targets: ["firebase_performance_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + .target( + name: "firebase_performance_tvos", + dependencies: [ + // The podspec's Firebase/Performance subspec. + .product(name: "FirebasePerformance", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + swiftSettings: [ + // Keep Swift `#if TARGET_OS_TV` branches active, matching the podspec. + .define("TARGET_OS_TV"), + ] + ), + ] +) diff --git a/packages/firebase_performance_tvos/tvos/firebase_performance_tvos.podspec b/packages/firebase_performance_tvos/tvos/firebase_performance_tvos.podspec index 368fb48..9d2f52e 100644 --- a/packages/firebase_performance_tvos/tvos/firebase_performance_tvos.podspec +++ b/packages/firebase_performance_tvos/tvos/firebase_performance_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_performance_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of firebase_performance.' s.description = <<-DESC tvOS implementation of firebase_performance, the federated platform diff --git a/packages/firebase_remote_config_tvos/CHANGELOG.md b/packages/firebase_remote_config_tvos/CHANGELOG.md index ac973e6..3dc5a7e 100644 --- a/packages/firebase_remote_config_tvos/CHANGELOG.md +++ b/packages/firebase_remote_config_tvos/CHANGELOG.md @@ -1,3 +1,14 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Swift + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. + ## 0.0.1 * Initial tvOS (Apple TV) implementation of `firebase_remote_config`, ported from diff --git a/packages/firebase_remote_config_tvos/README.md b/packages/firebase_remote_config_tvos/README.md index ed5c2e1..4865c9a 100644 --- a/packages/firebase_remote_config_tvos/README.md +++ b/packages/firebase_remote_config_tvos/README.md @@ -14,9 +14,9 @@ automatically. Apps that already use `firebase_remote_config` and target tvOS ad ```yaml dependencies: firebase_remote_config: ^6.5.3 - firebase_remote_config_tvos: ^0.0.1 + firebase_remote_config_tvos: ^0.0.2 firebase_core: ^4.11.0 - firebase_core_tvos: ^0.0.1 # tvOS core (this package depends on it) + firebase_core_tvos: ^0.0.4 # tvOS core (this package depends on it) ``` > **Version alignment matters.** This package's native code matches the @@ -41,6 +41,14 @@ and real-time config updates. > last-activated config under disk pressure. Set in-app defaults and don't rely > on a previously-activated value persisting across launches. +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_remote_config_tvos/example/pubspec.yaml b/packages/firebase_remote_config_tvos/example/pubspec.yaml index 7ef3f36..918159b 100644 --- a/packages/firebase_remote_config_tvos/example/pubspec.yaml +++ b/packages/firebase_remote_config_tvos/example/pubspec.yaml @@ -8,15 +8,23 @@ environment: dependencies: # firebase_core is pinned exact; its train picks the matching firebase_core_tvos - # (4.11.x -> pi 7.1.0 -> 0.0.2); floating it breaks the native Pigeon ABI. - firebase_core: 4.11.0 - firebase_remote_config: 6.5.3 + # (4.14.x -> pi 8.1.1 -> 0.0.3 and later); floating it breaks the native + # Pigeon ABI. firebase_core_tvos 0.0.4 requires firebase_core ^4.13.0. + firebase_core: 4.14.0 + firebase_remote_config: 6.5.6 firebase_remote_config_tvos: path: ../ - firebase_core_tvos: ^0.0.1 + firebase_core_tvos: ^0.0.4 flutter: sdk: flutter +# This plugin requires firebase_core_tvos ^0.0.4 (the first with a +# tvos/Package.swift). Resolve it from the sibling package so the example +# builds before that version is on pub.dev, and builds what this repo has. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos + dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_remote_config_tvos/pubspec.yaml b/packages/firebase_remote_config_tvos/pubspec.yaml index 5560548..90faafa 100644 --- a/packages/firebase_remote_config_tvos/pubspec.yaml +++ b/packages/firebase_remote_config_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_remote_config_tvos description: >- tvOS (Apple TV) implementation of the firebase_remote_config Flutter plugin, providing Firebase Remote Config on Apple TV. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_remote_config_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -22,7 +22,9 @@ dependencies: # package's native pod to the generated Podfile if it's reachable here, # which the podspec's `s.dependency 'firebase_core_tvos'` then resolves # instead of failing over to upstream's iOS-only firebase_core pod. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_remote_config_tvos/pubspec_overrides.yaml b/packages/firebase_remote_config_tvos/pubspec_overrides.yaml new file mode 100644 index 0000000..92f7db4 --- /dev/null +++ b/packages/firebase_remote_config_tvos/pubspec_overrides.yaml @@ -0,0 +1,9 @@ +# Local development override: resolve firebase_core_tvos from the sibling +# package in this monorepo for `flutter pub get` and `dart analyze` until the +# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a +# package's own root pubspec_overrides.yaml out of the archive, so consumers get +# the hosted constraint from pubspec.yaml. A no-op once that version is +# published. +dependency_overrides: + firebase_core_tvos: + path: ../firebase_core_tvos diff --git a/packages/firebase_remote_config_tvos/tvos/Package.swift b/packages/firebase_remote_config_tvos/tvos/Package.swift new file mode 100644 index 0000000..4da09eb --- /dev/null +++ b/packages/firebase_remote_config_tvos/tvos/Package.swift @@ -0,0 +1,45 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +let package = Package( + name: "firebase_remote_config_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-remote-config-tvos", targets: ["firebase_remote_config_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + .target( + name: "firebase_remote_config_tvos", + dependencies: [ + // The podspec's Firebase/RemoteConfig subspec. + .product(name: "FirebaseRemoteConfig", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + swiftSettings: [ + // Keep Swift `#if TARGET_OS_TV` branches active, matching the podspec. + .define("TARGET_OS_TV"), + ] + ), + ] +) diff --git a/packages/firebase_remote_config_tvos/tvos/firebase_remote_config_tvos.podspec b/packages/firebase_remote_config_tvos/tvos/firebase_remote_config_tvos.podspec index 18ef55b..a172e89 100644 --- a/packages/firebase_remote_config_tvos/tvos/firebase_remote_config_tvos.podspec +++ b/packages/firebase_remote_config_tvos/tvos/firebase_remote_config_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_remote_config_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of firebase_remote_config.' s.description = <<-DESC tvOS implementation of firebase_remote_config, the federated platform diff --git a/packages/firebase_storage_tvos/CHANGELOG.md b/packages/firebase_storage_tvos/CHANGELOG.md index 2c15bfc..ccb6c89 100644 --- a/packages/firebase_storage_tvos/CHANGELOG.md +++ b/packages/firebase_storage_tvos/CHANGELOG.md @@ -1,3 +1,14 @@ +## 0.0.2 + +* Add Swift Package Manager support: ships `tvos/Package.swift` (one Swift + target, with `firebase_core_tvos` as the sibling package + `../firebase_core_tvos`). flutter-tvos links a plugin that ships + `tvos/Package.swift` through Swift Package Manager and leaves it out of the + Podfile. +* Requires `firebase_core_tvos: ^0.0.4`, the first version with a + `tvos/Package.swift`. firebase_core_tvos 0.0.4 is no longer in the Podfile, so + this package's podspec could not resolve its `firebase_core_tvos` dependency. + ## 0.0.1 * Initial tvOS scaffolding generated by `flutter-tvos plugin port` from diff --git a/packages/firebase_storage_tvos/README.md b/packages/firebase_storage_tvos/README.md index 1e74c2a..0bd72c6 100644 --- a/packages/firebase_storage_tvos/README.md +++ b/packages/firebase_storage_tvos/README.md @@ -16,7 +16,7 @@ alongside it: ```yaml dependencies: firebase_storage: ^13.4.3 - firebase_storage_tvos: ^0.0.1 + firebase_storage_tvos: ^0.0.2 ``` The native plugin registers automatically through flutter-tvos' plugin @@ -42,6 +42,14 @@ Storage features are disabled here: - Apple TV running tvOS 15.0 or later (the Firebase Apple SDK's minimum). - `firebase_core_tvos` (pulled in automatically). +## Swift Package Manager + +This package ships a `tvos/Package.swift`. flutter-tvos links a plugin that +ships `tvos/Package.swift` through Swift Package Manager and leaves it out of +the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` +0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the +podspec. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_storage_tvos/pubspec.yaml b/packages/firebase_storage_tvos/pubspec.yaml index 0feafbd..b38a946 100644 --- a/packages/firebase_storage_tvos/pubspec.yaml +++ b/packages/firebase_storage_tvos/pubspec.yaml @@ -2,7 +2,7 @@ name: firebase_storage_tvos description: >- tvOS (Apple TV) implementation of the firebase_storage Flutter plugin, bringing Cloud Storage for Firebase to Apple TV apps via flutter-tvos. -version: 0.0.1 +version: 0.0.2 homepage: https://fluttertv.dev repository: https://github.com/fluttertv/plugins/tree/main/packages/firebase_storage_tvos issue_tracker: https://github.com/fluttertv/plugins/issues @@ -24,7 +24,9 @@ dependencies: # against locally instead of failing over to upstream's iOS-only pod. # Hosted constraint for pub.dev (path deps can't be published); local # development resolves it via pubspec_overrides.yaml until it's published. - firebase_core_tvos: ^0.0.1 + # ^0.0.4 (0.0.4 exactly): the first firebase_core_tvos with a + # tvos/Package.swift, which tvos/Package.swift here needs as a sibling. + firebase_core_tvos: ^0.0.4 dev_dependencies: flutter_lints: ^4.0.0 diff --git a/packages/firebase_storage_tvos/tvos/Package.swift b/packages/firebase_storage_tvos/tvos/Package.swift new file mode 100644 index 0000000..5beb01d --- /dev/null +++ b/packages/firebase_storage_tvos/tvos/Package.swift @@ -0,0 +1,45 @@ +// swift-tools-version: 5.9 +// Lets the package be consumed via Swift Package Manager. The target reuses +// the same `Classes/` sources the CocoaPods podspec compiles, so both +// dependency managers stay in sync from a single source tree. +import PackageDescription + +let package = Package( + name: "firebase_storage_tvos", + platforms: [ + // Firebase 12.x requires tvOS 15.0, as in the podspec. + .tvOS("15.0"), + ], + products: [ + .library(name: "firebase-storage-tvos", targets: ["firebase_storage_tvos"]), + ], + dependencies: [ + // The podspecs' `~> 12.15.0`. Every tvOS FlutterFire port declares this + // same range, so an app resolves one firebase-ios-sdk for all of them. + .package(url: "https://github.com/firebase/firebase-ios-sdk", .upToNextMinor(from: "12.15.0")), + // FlutterFire's shared plugin registry. flutter-tvos places every SwiftPM + // plugin side by side, so the sibling path resolves like FlutterFramework. + // FirebaseCore comes in through it, from the same firebase-ios-sdk. + .package(name: "firebase_core_tvos", path: "../firebase_core_tvos"), + // Lets the target import Flutter. flutter-tvos generates a FlutterFramework + // package as a sibling of this package under the app's ephemeral SwiftPM + // packages, so `../FlutterFramework` resolves at build time. + .package(name: "FlutterFramework", path: "../FlutterFramework"), + ], + targets: [ + .target( + name: "firebase_storage_tvos", + dependencies: [ + // The podspec's Firebase/Storage subspec. + .product(name: "FirebaseStorage", package: "firebase-ios-sdk"), + .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), + .product(name: "FlutterFramework", package: "FlutterFramework"), + ], + path: "Classes", + swiftSettings: [ + // Keep Swift `#if TARGET_OS_TV` branches active, matching the podspec. + .define("TARGET_OS_TV"), + ] + ), + ] +) diff --git a/packages/firebase_storage_tvos/tvos/firebase_storage_tvos.podspec b/packages/firebase_storage_tvos/tvos/firebase_storage_tvos.podspec index 6ca3478..e1d2593 100644 --- a/packages/firebase_storage_tvos/tvos/firebase_storage_tvos.podspec +++ b/packages/firebase_storage_tvos/tvos/firebase_storage_tvos.podspec @@ -6,7 +6,7 @@ # Pod::Spec.new do |s| s.name = 'firebase_storage_tvos' - s.version = '0.0.1' + s.version = '0.0.2' s.summary = 'tvOS implementation of firebase_storage.' s.description = <<-DESC tvOS implementation of firebase_storage, the federated platform From 40d6f56c64f23d7ae4cdd4d1835ddedf28cf42ea Mon Sep 17 00:00:00 2001 From: Pix Date: Mon, 9 Nov 2026 08:58:06 +0100 Subject: [PATCH 2/2] chore(firebase): consistent core overrides, .pubignore, app_check FirebaseCore, flutter-tvos floor - All ten dependents carry the same root and example/pubspec_overrides.yaml: they resolve firebase_core_tvos from the sibling package so the repo's CI builds against the in-repo 0.0.4 until it is on pub.dev, and can be deleted then. The six examples that had dependency_overrides in pubspec.yaml now use example/pubspec_overrides.yaml like the other four. - Each dependent's .pubignore excludes pubspec_overrides.yaml (root and example/, check_repo R4) and repeats the package's .gitignore rules, since a .pubignore replaces that directory's .gitignore for `dart pub publish`. - firebase_app_check_tvos: Package.swift declares the FirebaseCore product, which FirebaseAppCheckPlugin.swift imports directly. - READMEs: SwiftPM needs flutter-tvos 1.3.0 or later (the release that added SwiftPM plugin linking, the side-by-side package layout and the Podfile skip). Co-Authored-By: Claude Opus 5.5 --- packages/cloud_firestore_tvos/.pubignore | 37 +++++++++++++++++-- packages/cloud_firestore_tvos/README.md | 4 ++ .../example/pubspec_overrides.yaml | 9 +++-- .../pubspec_overrides.yaml | 11 +++--- packages/cloud_functions_tvos/.pubignore | 34 +++++++++++++++++ packages/cloud_functions_tvos/README.md | 4 ++ .../cloud_functions_tvos/example/pubspec.yaml | 7 ---- .../example/pubspec_overrides.yaml | 8 ++++ .../pubspec_overrides.yaml | 12 +++--- packages/firebase_analytics_tvos/.pubignore | 34 +++++++++++++++++ packages/firebase_analytics_tvos/README.md | 4 ++ .../example/pubspec.yaml | 7 ---- .../example/pubspec_overrides.yaml | 8 ++++ .../pubspec_overrides.yaml | 12 +++--- packages/firebase_app_check_tvos/.pubignore | 34 +++++++++++++++++ packages/firebase_app_check_tvos/README.md | 4 ++ .../example/pubspec.yaml | 7 ---- .../example/pubspec_overrides.yaml | 8 ++++ .../pubspec_overrides.yaml | 12 +++--- .../tvos/Package.swift | 2 + packages/firebase_auth_tvos/.pubignore | 37 +++++++++++++++++-- packages/firebase_auth_tvos/README.md | 4 ++ .../example/pubspec_overrides.yaml | 12 +++--- .../firebase_auth_tvos/pubspec_overrides.yaml | 15 +++----- packages/firebase_core_tvos/README.md | 4 ++ packages/firebase_crashlytics_tvos/.pubignore | 34 +++++++++++++++++ packages/firebase_crashlytics_tvos/README.md | 4 ++ .../example/pubspec.yaml | 7 ---- .../example/pubspec_overrides.yaml | 8 ++++ .../pubspec_overrides.yaml | 12 +++--- packages/firebase_messaging_tvos/.pubignore | 37 +++++++++++++++++-- packages/firebase_messaging_tvos/README.md | 4 ++ .../example/pubspec_overrides.yaml | 9 +++-- .../pubspec_overrides.yaml | 11 +++--- packages/firebase_performance_tvos/.pubignore | 34 +++++++++++++++++ packages/firebase_performance_tvos/README.md | 4 ++ .../example/pubspec.yaml | 7 ---- .../example/pubspec_overrides.yaml | 8 ++++ .../pubspec_overrides.yaml | 12 +++--- .../firebase_remote_config_tvos/.pubignore | 34 +++++++++++++++++ .../firebase_remote_config_tvos/README.md | 4 ++ .../example/pubspec.yaml | 7 ---- .../example/pubspec_overrides.yaml | 8 ++++ .../pubspec_overrides.yaml | 12 +++--- packages/firebase_storage_tvos/.pubignore | 37 +++++++++++++++++-- packages/firebase_storage_tvos/README.md | 4 ++ .../example/pubspec_overrides.yaml | 9 +++-- .../pubspec_overrides.yaml | 11 +++--- 48 files changed, 510 insertions(+), 137 deletions(-) create mode 100644 packages/cloud_functions_tvos/.pubignore create mode 100644 packages/cloud_functions_tvos/example/pubspec_overrides.yaml create mode 100644 packages/firebase_analytics_tvos/.pubignore create mode 100644 packages/firebase_analytics_tvos/example/pubspec_overrides.yaml create mode 100644 packages/firebase_app_check_tvos/.pubignore create mode 100644 packages/firebase_app_check_tvos/example/pubspec_overrides.yaml create mode 100644 packages/firebase_crashlytics_tvos/.pubignore create mode 100644 packages/firebase_crashlytics_tvos/example/pubspec_overrides.yaml create mode 100644 packages/firebase_performance_tvos/.pubignore create mode 100644 packages/firebase_performance_tvos/example/pubspec_overrides.yaml create mode 100644 packages/firebase_remote_config_tvos/.pubignore create mode 100644 packages/firebase_remote_config_tvos/example/pubspec_overrides.yaml diff --git a/packages/cloud_firestore_tvos/.pubignore b/packages/cloud_firestore_tvos/.pubignore index f104497..022eec5 100644 --- a/packages/cloud_firestore_tvos/.pubignore +++ b/packages/cloud_firestore_tvos/.pubignore @@ -1,5 +1,34 @@ -# Local-development dependency overrides — resolve firebase_core_tvos from the -# sibling package before it is published. Committed so a fresh checkout builds, -# but excluded from the published package (consumers get the hosted `^0.0.1` -# constraint from pubspec.yaml). +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/cloud_firestore_tvos/README.md b/packages/cloud_firestore_tvos/README.md index cfbf4fb..3015353 100644 --- a/packages/cloud_firestore_tvos/README.md +++ b/packages/cloud_firestore_tvos/README.md @@ -54,6 +54,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/cloud_firestore_tvos/example/pubspec_overrides.yaml b/packages/cloud_firestore_tvos/example/pubspec_overrides.yaml index e45a494..c828a42 100644 --- a/packages/cloud_firestore_tvos/example/pubspec_overrides.yaml +++ b/packages/cloud_firestore_tvos/example/pubspec_overrides.yaml @@ -1,7 +1,8 @@ -# Local development override for the example app. Forces firebase_core_tvos -# to the sibling package so the example resolves against the plugin's hosted -# `^0.0.1` constraint before that package is published. Gitignored; examples -# are not published. Remove once firebase_core_tvos 0.0.1 is on pub.dev. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. dependency_overrides: firebase_core_tvos: path: ../../firebase_core_tvos diff --git a/packages/cloud_firestore_tvos/pubspec_overrides.yaml b/packages/cloud_firestore_tvos/pubspec_overrides.yaml index 38a6605..842e5c8 100644 --- a/packages/cloud_firestore_tvos/pubspec_overrides.yaml +++ b/packages/cloud_firestore_tvos/pubspec_overrides.yaml @@ -1,8 +1,9 @@ -# Local development override. firebase_core_tvos is not yet on pub.dev, so -# resolve it from the sibling package in this monorepo for `flutter pub get`, -# `flutter test`, and `flutter analyze`. Gitignored and excluded from the -# published package — the pubspec.yaml hosted `firebase_core_tvos: ^0.0.1` -# constraint is what consumers get. Becomes a no-op once it is published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/cloud_functions_tvos/.pubignore b/packages/cloud_functions_tvos/.pubignore new file mode 100644 index 0000000..022eec5 --- /dev/null +++ b/packages/cloud_functions_tvos/.pubignore @@ -0,0 +1,34 @@ +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. +pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/cloud_functions_tvos/README.md b/packages/cloud_functions_tvos/README.md index 6856944..8e50e2c 100644 --- a/packages/cloud_functions_tvos/README.md +++ b/packages/cloud_functions_tvos/README.md @@ -44,6 +44,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/cloud_functions_tvos/example/pubspec.yaml b/packages/cloud_functions_tvos/example/pubspec.yaml index 287805c..844ddd4 100755 --- a/packages/cloud_functions_tvos/example/pubspec.yaml +++ b/packages/cloud_functions_tvos/example/pubspec.yaml @@ -18,13 +18,6 @@ dependencies: flutter: sdk: flutter -# This plugin requires firebase_core_tvos ^0.0.4 (the first with a -# tvos/Package.swift). Resolve it from the sibling package so the example -# builds before that version is on pub.dev, and builds what this repo has. -dependency_overrides: - firebase_core_tvos: - path: ../../firebase_core_tvos - dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/cloud_functions_tvos/example/pubspec_overrides.yaml b/packages/cloud_functions_tvos/example/pubspec_overrides.yaml new file mode 100644 index 0000000..c828a42 --- /dev/null +++ b/packages/cloud_functions_tvos/example/pubspec_overrides.yaml @@ -0,0 +1,8 @@ +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos diff --git a/packages/cloud_functions_tvos/pubspec_overrides.yaml b/packages/cloud_functions_tvos/pubspec_overrides.yaml index 92f7db4..842e5c8 100644 --- a/packages/cloud_functions_tvos/pubspec_overrides.yaml +++ b/packages/cloud_functions_tvos/pubspec_overrides.yaml @@ -1,9 +1,9 @@ -# Local development override: resolve firebase_core_tvos from the sibling -# package in this monorepo for `flutter pub get` and `dart analyze` until the -# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a -# package's own root pubspec_overrides.yaml out of the archive, so consumers get -# the hosted constraint from pubspec.yaml. A no-op once that version is -# published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_analytics_tvos/.pubignore b/packages/firebase_analytics_tvos/.pubignore new file mode 100644 index 0000000..022eec5 --- /dev/null +++ b/packages/firebase_analytics_tvos/.pubignore @@ -0,0 +1,34 @@ +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. +pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_analytics_tvos/README.md b/packages/firebase_analytics_tvos/README.md index 6ffb57b..49dd75b 100644 --- a/packages/firebase_analytics_tvos/README.md +++ b/packages/firebase_analytics_tvos/README.md @@ -48,6 +48,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_analytics_tvos/example/pubspec.yaml b/packages/firebase_analytics_tvos/example/pubspec.yaml index d4ffc1a..ba4f2a7 100755 --- a/packages/firebase_analytics_tvos/example/pubspec.yaml +++ b/packages/firebase_analytics_tvos/example/pubspec.yaml @@ -18,13 +18,6 @@ dependencies: flutter: sdk: flutter -# This plugin requires firebase_core_tvos ^0.0.4 (the first with a -# tvos/Package.swift). Resolve it from the sibling package so the example -# builds before that version is on pub.dev, and builds what this repo has. -dependency_overrides: - firebase_core_tvos: - path: ../../firebase_core_tvos - dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_analytics_tvos/example/pubspec_overrides.yaml b/packages/firebase_analytics_tvos/example/pubspec_overrides.yaml new file mode 100644 index 0000000..c828a42 --- /dev/null +++ b/packages/firebase_analytics_tvos/example/pubspec_overrides.yaml @@ -0,0 +1,8 @@ +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos diff --git a/packages/firebase_analytics_tvos/pubspec_overrides.yaml b/packages/firebase_analytics_tvos/pubspec_overrides.yaml index 92f7db4..842e5c8 100644 --- a/packages/firebase_analytics_tvos/pubspec_overrides.yaml +++ b/packages/firebase_analytics_tvos/pubspec_overrides.yaml @@ -1,9 +1,9 @@ -# Local development override: resolve firebase_core_tvos from the sibling -# package in this monorepo for `flutter pub get` and `dart analyze` until the -# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a -# package's own root pubspec_overrides.yaml out of the archive, so consumers get -# the hosted constraint from pubspec.yaml. A no-op once that version is -# published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_app_check_tvos/.pubignore b/packages/firebase_app_check_tvos/.pubignore new file mode 100644 index 0000000..022eec5 --- /dev/null +++ b/packages/firebase_app_check_tvos/.pubignore @@ -0,0 +1,34 @@ +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. +pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_app_check_tvos/README.md b/packages/firebase_app_check_tvos/README.md index dcb8e7e..56f03cd 100644 --- a/packages/firebase_app_check_tvos/README.md +++ b/packages/firebase_app_check_tvos/README.md @@ -61,6 +61,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_app_check_tvos/example/pubspec.yaml b/packages/firebase_app_check_tvos/example/pubspec.yaml index 3653d98..84a041a 100644 --- a/packages/firebase_app_check_tvos/example/pubspec.yaml +++ b/packages/firebase_app_check_tvos/example/pubspec.yaml @@ -17,13 +17,6 @@ dependencies: flutter: sdk: flutter -# This plugin requires firebase_core_tvos ^0.0.4 (the first with a -# tvos/Package.swift). Resolve it from the sibling package so the example -# builds before that version is on pub.dev, and builds what this repo has. -dependency_overrides: - firebase_core_tvos: - path: ../../firebase_core_tvos - dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_app_check_tvos/example/pubspec_overrides.yaml b/packages/firebase_app_check_tvos/example/pubspec_overrides.yaml new file mode 100644 index 0000000..c828a42 --- /dev/null +++ b/packages/firebase_app_check_tvos/example/pubspec_overrides.yaml @@ -0,0 +1,8 @@ +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos diff --git a/packages/firebase_app_check_tvos/pubspec_overrides.yaml b/packages/firebase_app_check_tvos/pubspec_overrides.yaml index 92f7db4..842e5c8 100644 --- a/packages/firebase_app_check_tvos/pubspec_overrides.yaml +++ b/packages/firebase_app_check_tvos/pubspec_overrides.yaml @@ -1,9 +1,9 @@ -# Local development override: resolve firebase_core_tvos from the sibling -# package in this monorepo for `flutter pub get` and `dart analyze` until the -# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a -# package's own root pubspec_overrides.yaml out of the archive, so consumers get -# the hosted constraint from pubspec.yaml. A no-op once that version is -# published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_app_check_tvos/tvos/Package.swift b/packages/firebase_app_check_tvos/tvos/Package.swift index 2add2c6..4fdd779 100644 --- a/packages/firebase_app_check_tvos/tvos/Package.swift +++ b/packages/firebase_app_check_tvos/tvos/Package.swift @@ -32,6 +32,8 @@ let package = Package( dependencies: [ // The podspec's Firebase/AppCheck subspec. .product(name: "FirebaseAppCheck", package: "firebase-ios-sdk"), + // FirebaseAppCheckPlugin.swift imports FirebaseCore directly. + .product(name: "FirebaseCore", package: "firebase-ios-sdk"), .product(name: "firebase-core-tvos", package: "firebase_core_tvos"), .product(name: "FlutterFramework", package: "FlutterFramework"), ], diff --git a/packages/firebase_auth_tvos/.pubignore b/packages/firebase_auth_tvos/.pubignore index f104497..022eec5 100644 --- a/packages/firebase_auth_tvos/.pubignore +++ b/packages/firebase_auth_tvos/.pubignore @@ -1,5 +1,34 @@ -# Local-development dependency overrides — resolve firebase_core_tvos from the -# sibling package before it is published. Committed so a fresh checkout builds, -# but excluded from the published package (consumers get the hosted `^0.0.1` -# constraint from pubspec.yaml). +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_auth_tvos/README.md b/packages/firebase_auth_tvos/README.md index e3e252a..19f6fe3 100644 --- a/packages/firebase_auth_tvos/README.md +++ b/packages/firebase_auth_tvos/README.md @@ -66,6 +66,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_auth_tvos/example/pubspec_overrides.yaml b/packages/firebase_auth_tvos/example/pubspec_overrides.yaml index 3651e60..c828a42 100644 --- a/packages/firebase_auth_tvos/example/pubspec_overrides.yaml +++ b/packages/firebase_auth_tvos/example/pubspec_overrides.yaml @@ -1,10 +1,8 @@ -# Local development override for the example app. The plugin's published -# pubspec.yaml pins `firebase_core_tvos: ^0.0.1` (hosted), but that package -# isn't on pub.dev yet, so force it to resolve from the sibling package in -# this monorepo. A dependency override wins over the transitive hosted -# constraint regardless of source, which a plain path dependency cannot do. -# Not published (examples are not published packages anyway). Remove once -# firebase_core_tvos 0.0.1 is on pub.dev. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. dependency_overrides: firebase_core_tvos: path: ../../firebase_core_tvos diff --git a/packages/firebase_auth_tvos/pubspec_overrides.yaml b/packages/firebase_auth_tvos/pubspec_overrides.yaml index 5d3c17f..842e5c8 100644 --- a/packages/firebase_auth_tvos/pubspec_overrides.yaml +++ b/packages/firebase_auth_tvos/pubspec_overrides.yaml @@ -1,12 +1,9 @@ -# Local development override. firebase_core_tvos is not yet on pub.dev, so -# resolve it from the sibling package in this monorepo for `flutter pub get`, -# `flutter test`, and `flutter analyze`. -# -# This file is NOT part of the published package — `dart pub publish` excludes -# pubspec_overrides.yaml from the archive automatically, so the published -# pubspec.yaml's hosted `firebase_core_tvos: ^0.0.1` constraint is what -# consumers actually get. Remove this file (or it becomes a no-op) once -# firebase_core_tvos 0.0.1 is published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_core_tvos/README.md b/packages/firebase_core_tvos/README.md index 8fcdeb2..736a2b2 100644 --- a/packages/firebase_core_tvos/README.md +++ b/packages/firebase_core_tvos/README.md @@ -52,6 +52,10 @@ on this package ships one too, from the version that requires `firebase_core_tvos: ^0.0.4`, so they link through SwiftPM together and share one firebase-ios-sdk (`~> 12.15.0`, as in the podspecs). +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_crashlytics_tvos/.pubignore b/packages/firebase_crashlytics_tvos/.pubignore new file mode 100644 index 0000000..022eec5 --- /dev/null +++ b/packages/firebase_crashlytics_tvos/.pubignore @@ -0,0 +1,34 @@ +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. +pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_crashlytics_tvos/README.md b/packages/firebase_crashlytics_tvos/README.md index 108509e..dbef474 100644 --- a/packages/firebase_crashlytics_tvos/README.md +++ b/packages/firebase_crashlytics_tvos/README.md @@ -56,6 +56,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_crashlytics_tvos/example/pubspec.yaml b/packages/firebase_crashlytics_tvos/example/pubspec.yaml index 391b817..597797b 100755 --- a/packages/firebase_crashlytics_tvos/example/pubspec.yaml +++ b/packages/firebase_crashlytics_tvos/example/pubspec.yaml @@ -17,13 +17,6 @@ dependencies: flutter: sdk: flutter -# This plugin requires firebase_core_tvos ^0.0.4 (the first with a -# tvos/Package.swift). Resolve it from the sibling package so the example -# builds before that version is on pub.dev, and builds what this repo has. -dependency_overrides: - firebase_core_tvos: - path: ../../firebase_core_tvos - dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_crashlytics_tvos/example/pubspec_overrides.yaml b/packages/firebase_crashlytics_tvos/example/pubspec_overrides.yaml new file mode 100644 index 0000000..c828a42 --- /dev/null +++ b/packages/firebase_crashlytics_tvos/example/pubspec_overrides.yaml @@ -0,0 +1,8 @@ +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos diff --git a/packages/firebase_crashlytics_tvos/pubspec_overrides.yaml b/packages/firebase_crashlytics_tvos/pubspec_overrides.yaml index 92f7db4..842e5c8 100644 --- a/packages/firebase_crashlytics_tvos/pubspec_overrides.yaml +++ b/packages/firebase_crashlytics_tvos/pubspec_overrides.yaml @@ -1,9 +1,9 @@ -# Local development override: resolve firebase_core_tvos from the sibling -# package in this monorepo for `flutter pub get` and `dart analyze` until the -# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a -# package's own root pubspec_overrides.yaml out of the archive, so consumers get -# the hosted constraint from pubspec.yaml. A no-op once that version is -# published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_messaging_tvos/.pubignore b/packages/firebase_messaging_tvos/.pubignore index f104497..022eec5 100644 --- a/packages/firebase_messaging_tvos/.pubignore +++ b/packages/firebase_messaging_tvos/.pubignore @@ -1,5 +1,34 @@ -# Local-development dependency overrides — resolve firebase_core_tvos from the -# sibling package before it is published. Committed so a fresh checkout builds, -# but excluded from the published package (consumers get the hosted `^0.0.1` -# constraint from pubspec.yaml). +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_messaging_tvos/README.md b/packages/firebase_messaging_tvos/README.md index dc9bd06..30af1d9 100644 --- a/packages/firebase_messaging_tvos/README.md +++ b/packages/firebase_messaging_tvos/README.md @@ -71,6 +71,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_messaging_tvos/example/pubspec_overrides.yaml b/packages/firebase_messaging_tvos/example/pubspec_overrides.yaml index e45a494..c828a42 100644 --- a/packages/firebase_messaging_tvos/example/pubspec_overrides.yaml +++ b/packages/firebase_messaging_tvos/example/pubspec_overrides.yaml @@ -1,7 +1,8 @@ -# Local development override for the example app. Forces firebase_core_tvos -# to the sibling package so the example resolves against the plugin's hosted -# `^0.0.1` constraint before that package is published. Gitignored; examples -# are not published. Remove once firebase_core_tvos 0.0.1 is on pub.dev. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. dependency_overrides: firebase_core_tvos: path: ../../firebase_core_tvos diff --git a/packages/firebase_messaging_tvos/pubspec_overrides.yaml b/packages/firebase_messaging_tvos/pubspec_overrides.yaml index 38a6605..842e5c8 100644 --- a/packages/firebase_messaging_tvos/pubspec_overrides.yaml +++ b/packages/firebase_messaging_tvos/pubspec_overrides.yaml @@ -1,8 +1,9 @@ -# Local development override. firebase_core_tvos is not yet on pub.dev, so -# resolve it from the sibling package in this monorepo for `flutter pub get`, -# `flutter test`, and `flutter analyze`. Gitignored and excluded from the -# published package — the pubspec.yaml hosted `firebase_core_tvos: ^0.0.1` -# constraint is what consumers get. Becomes a no-op once it is published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_performance_tvos/.pubignore b/packages/firebase_performance_tvos/.pubignore new file mode 100644 index 0000000..022eec5 --- /dev/null +++ b/packages/firebase_performance_tvos/.pubignore @@ -0,0 +1,34 @@ +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. +pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_performance_tvos/README.md b/packages/firebase_performance_tvos/README.md index bd13251..0da2a31 100644 --- a/packages/firebase_performance_tvos/README.md +++ b/packages/firebase_performance_tvos/README.md @@ -44,6 +44,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_performance_tvos/example/pubspec.yaml b/packages/firebase_performance_tvos/example/pubspec.yaml index 03f2ef9..f6b4134 100755 --- a/packages/firebase_performance_tvos/example/pubspec.yaml +++ b/packages/firebase_performance_tvos/example/pubspec.yaml @@ -18,13 +18,6 @@ dependencies: flutter: sdk: flutter -# This plugin requires firebase_core_tvos ^0.0.4 (the first with a -# tvos/Package.swift). Resolve it from the sibling package so the example -# builds before that version is on pub.dev, and builds what this repo has. -dependency_overrides: - firebase_core_tvos: - path: ../../firebase_core_tvos - dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_performance_tvos/example/pubspec_overrides.yaml b/packages/firebase_performance_tvos/example/pubspec_overrides.yaml new file mode 100644 index 0000000..c828a42 --- /dev/null +++ b/packages/firebase_performance_tvos/example/pubspec_overrides.yaml @@ -0,0 +1,8 @@ +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos diff --git a/packages/firebase_performance_tvos/pubspec_overrides.yaml b/packages/firebase_performance_tvos/pubspec_overrides.yaml index 92f7db4..842e5c8 100644 --- a/packages/firebase_performance_tvos/pubspec_overrides.yaml +++ b/packages/firebase_performance_tvos/pubspec_overrides.yaml @@ -1,9 +1,9 @@ -# Local development override: resolve firebase_core_tvos from the sibling -# package in this monorepo for `flutter pub get` and `dart analyze` until the -# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a -# package's own root pubspec_overrides.yaml out of the archive, so consumers get -# the hosted constraint from pubspec.yaml. A no-op once that version is -# published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_remote_config_tvos/.pubignore b/packages/firebase_remote_config_tvos/.pubignore new file mode 100644 index 0000000..022eec5 --- /dev/null +++ b/packages/firebase_remote_config_tvos/.pubignore @@ -0,0 +1,34 @@ +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. +pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_remote_config_tvos/README.md b/packages/firebase_remote_config_tvos/README.md index 4865c9a..29d6352 100644 --- a/packages/firebase_remote_config_tvos/README.md +++ b/packages/firebase_remote_config_tvos/README.md @@ -49,6 +49,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_remote_config_tvos/example/pubspec.yaml b/packages/firebase_remote_config_tvos/example/pubspec.yaml index 918159b..e9983ef 100644 --- a/packages/firebase_remote_config_tvos/example/pubspec.yaml +++ b/packages/firebase_remote_config_tvos/example/pubspec.yaml @@ -18,13 +18,6 @@ dependencies: flutter: sdk: flutter -# This plugin requires firebase_core_tvos ^0.0.4 (the first with a -# tvos/Package.swift). Resolve it from the sibling package so the example -# builds before that version is on pub.dev, and builds what this repo has. -dependency_overrides: - firebase_core_tvos: - path: ../../firebase_core_tvos - dev_dependencies: flutter_lints: ^4.0.0 flutter_test: diff --git a/packages/firebase_remote_config_tvos/example/pubspec_overrides.yaml b/packages/firebase_remote_config_tvos/example/pubspec_overrides.yaml new file mode 100644 index 0000000..c828a42 --- /dev/null +++ b/packages/firebase_remote_config_tvos/example/pubspec_overrides.yaml @@ -0,0 +1,8 @@ +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. +dependency_overrides: + firebase_core_tvos: + path: ../../firebase_core_tvos diff --git a/packages/firebase_remote_config_tvos/pubspec_overrides.yaml b/packages/firebase_remote_config_tvos/pubspec_overrides.yaml index 92f7db4..842e5c8 100644 --- a/packages/firebase_remote_config_tvos/pubspec_overrides.yaml +++ b/packages/firebase_remote_config_tvos/pubspec_overrides.yaml @@ -1,9 +1,9 @@ -# Local development override: resolve firebase_core_tvos from the sibling -# package in this monorepo for `flutter pub get` and `dart analyze` until the -# version pubspec.yaml requires is on pub.dev. `dart pub publish` leaves a -# package's own root pubspec_overrides.yaml out of the archive, so consumers get -# the hosted constraint from pubspec.yaml. A no-op once that version is -# published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos diff --git a/packages/firebase_storage_tvos/.pubignore b/packages/firebase_storage_tvos/.pubignore index f104497..022eec5 100644 --- a/packages/firebase_storage_tvos/.pubignore +++ b/packages/firebase_storage_tvos/.pubignore @@ -1,5 +1,34 @@ -# Local-development dependency overrides — resolve firebase_core_tvos from the -# sibling package before it is published. Committed so a fresh checkout builds, -# but excluded from the published package (consumers get the hosted `^0.0.1` -# constraint from pubspec.yaml). +# A .pubignore replaces this directory's .gitignore for `dart pub publish`, so +# the .gitignore rules are repeated below. +# +# pubspec_overrides.yaml (here and in example/) points firebase_core_tvos at the +# sibling package until firebase_core_tvos 0.0.4 is on pub.dev. It is for the +# repo's CI only and must not ship. pubspec_overrides.yaml + +# Dart / Flutter +.dart_tool/ +build/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub/ + +# CocoaPods +tvos/Pods/ +tvos/Podfile.lock +tvos/.symlinks/ +tvos/Flutter/Flutter.framework +tvos/Flutter/Flutter.podspec + +# Xcode / SwiftPM (per-user, generated when tvos/Package.swift is opened) +**/.swiftpm/ +**/xcuserdata/ + +# IDE +.idea/ +.vscode/ +*.iml + +# macOS +.DS_Store diff --git a/packages/firebase_storage_tvos/README.md b/packages/firebase_storage_tvos/README.md index 0bd72c6..5a70d99 100644 --- a/packages/firebase_storage_tvos/README.md +++ b/packages/firebase_storage_tvos/README.md @@ -50,6 +50,10 @@ the Podfile. No manual setup is needed. It depends on `firebase_core_tvos` 0.0.4, which ships one too, and takes firebase-ios-sdk `~> 12.15.0`, as in the podspec. +Needs flutter-tvos 1.3.0 or later, the first release that links plugins through +SwiftPM, places them side by side (so `../firebase_core_tvos` and +`../FlutterFramework` resolve) and leaves them out of the Podfile. + ## License fluttertv, under a BSD-3-Clause license. See `LICENSE` for the full text. diff --git a/packages/firebase_storage_tvos/example/pubspec_overrides.yaml b/packages/firebase_storage_tvos/example/pubspec_overrides.yaml index e45a494..c828a42 100644 --- a/packages/firebase_storage_tvos/example/pubspec_overrides.yaml +++ b/packages/firebase_storage_tvos/example/pubspec_overrides.yaml @@ -1,7 +1,8 @@ -# Local development override for the example app. Forces firebase_core_tvos -# to the sibling package so the example resolves against the plugin's hosted -# `^0.0.1` constraint before that package is published. Gitignored; examples -# are not published. Remove once firebase_core_tvos 0.0.1 is on pub.dev. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this example against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. The package's +# .pubignore keeps it out of the published archive. dependency_overrides: firebase_core_tvos: path: ../../firebase_core_tvos diff --git a/packages/firebase_storage_tvos/pubspec_overrides.yaml b/packages/firebase_storage_tvos/pubspec_overrides.yaml index 38a6605..842e5c8 100644 --- a/packages/firebase_storage_tvos/pubspec_overrides.yaml +++ b/packages/firebase_storage_tvos/pubspec_overrides.yaml @@ -1,8 +1,9 @@ -# Local development override. firebase_core_tvos is not yet on pub.dev, so -# resolve it from the sibling package in this monorepo for `flutter pub get`, -# `flutter test`, and `flutter analyze`. Gitignored and excluded from the -# published package — the pubspec.yaml hosted `firebase_core_tvos: ^0.0.1` -# constraint is what consumers get. Becomes a no-op once it is published. +# Resolves firebase_core_tvos from the sibling package in this monorepo, so the +# repo's CI (`flutter pub get`, `dart analyze`) resolves this package against +# the in-repo firebase_core_tvos 0.0.4 until that version is on pub.dev. Delete +# this file once firebase_core_tvos 0.0.4 is published. `dart pub publish` +# leaves it out of the archive, so consumers get the hosted constraint from +# pubspec.yaml. dependency_overrides: firebase_core_tvos: path: ../firebase_core_tvos