diff --git a/packages/_flutterfire_internals/pubspec.yaml b/packages/_flutterfire_internals/pubspec.yaml index 5803402de664..f6c317105740 100755 --- a/packages/_flutterfire_internals/pubspec.yaml +++ b/packages/_flutterfire_internals/pubspec.yaml @@ -6,8 +6,8 @@ version: 1.3.79 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: collection: ^1.0.0 diff --git a/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml index 6966b00b1e2a..a85b9d8472be 100755 --- a/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firestore plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: cloud_firestore: ^7.1.0 diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_aggregate.dart b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_aggregate.dart index 19430073bba9..a45acd0e90f9 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_aggregate.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_aggregate.dart @@ -25,9 +25,9 @@ class AliasedAggregateFunction implements PipelineSerializable { final PipelineAggregateFunction aggregateFunction; AliasedAggregateFunction({ - required String alias, + required this._alias, required this.aggregateFunction, - }) : _alias = alias; + }); String get alias => _alias; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_expression.dart b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_expression.dart index 8b2ed0d9059b..0b35e8284d73 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_expression.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_expression.dart @@ -1952,8 +1952,7 @@ class AliasedExpression extends Selectable { @override final Expression expression; - AliasedExpression({required String alias, required this.expression}) - : _alias = alias; + AliasedExpression({required this._alias, required this.expression}); @override String get name => 'alias'; diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_search.dart b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_search.dart index 4a1f2e700c30..61d2b2054884 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_search.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_search.dart @@ -20,22 +20,15 @@ final class SearchStage implements PipelineSerializable { final int? _retrievalDepth; SearchStage._({ - required _SearchQueryType queryType, - required Object query, - List? sort, - List? addFields, - String? languageCode, - int? limit, - int? offset, - int? retrievalDepth, - }) : _queryType = queryType, - _query = query, - _sort = sort, - _addFields = addFields, - _languageCode = languageCode, - _limit = limit, - _offset = offset, - _retrievalDepth = retrievalDepth; + required this._queryType, + required this._query, + this._sort, + this._addFields, + this._languageCode, + this._limit, + this._offset, + this._retrievalDepth, + }); /// Creates a search stage from a raw query string. SearchStage.withQuery( diff --git a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_snapshot.dart b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_snapshot.dart index 1a078d31945e..386bccbb1966 100644 --- a/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_snapshot.dart +++ b/packages/cloud_firestore/cloud_firestore/lib/src/pipeline_snapshot.dart @@ -18,12 +18,7 @@ class PipelineResult { /// Retrieves all fields in the result as a map. final Map? _data; - PipelineResult({ - this.document, - this.createTime, - this.updateTime, - Map? data, - }) : _data = data; + PipelineResult({this.document, this.createTime, this.updateTime, this._data}); /// Retrieves all fields in the result as a map. Map? data() => _data; diff --git a/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml index ab2bafdee3fa..4886ae0d7f13 100644 --- a/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pipeline_example/pubspec.yaml @@ -20,8 +20,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/packages/cloud_firestore/cloud_firestore/pubspec.yaml b/packages/cloud_firestore/cloud_firestore/pubspec.yaml index 0dfd89e96555..3e66556ff6d3 100755 --- a/packages/cloud_firestore/cloud_firestore/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - dartpad/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: cloud_firestore_platform_interface: ^8.1.0 diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_aggregate_query_snapshot.dart b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_aggregate_query_snapshot.dart index aaa4564bc41d..4d15b8219603 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_aggregate_query_snapshot.dart +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/lib/src/platform_interface/platform_interface_aggregate_query_snapshot.dart @@ -9,13 +9,10 @@ import 'package:plugin_platform_interface/plugin_platform_interface.dart'; /// [AggregateQuerySnapshotPlatform] represents a response to an [AggregateQueryPlatform] request. class AggregateQuerySnapshotPlatform extends PlatformInterface { AggregateQuerySnapshotPlatform({ - required int? count, - required List sum, - required List average, - }) : _count = count, - _sum = sum, - _average = average, - super(token: _token); + required this._count, + required this._sum, + required this._average, + }) : super(token: _token); static final Object _token = Object(); diff --git a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml index 0c1e7b12e638..7c33663ee752 100644 --- a/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore_platform_interface/pubspec.yaml @@ -6,8 +6,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/cloud_fires repository: https://github.com/firebase/flutterfire/tree/main/packages/cloud_firestore/cloud_firestore_platform_interface environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml b/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml index 980b16671588..897059bed2b4 100644 --- a/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml +++ b/packages/cloud_firestore/cloud_firestore_web/pubspec.yaml @@ -7,8 +7,8 @@ version: 5.8.0 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index a3dc942ecd37..813e4bc3e434 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -4,15 +4,14 @@ version = '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} buildscript { repositories { @@ -87,12 +86,20 @@ android { } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/cloud_functions/cloud_functions/example/pubspec.yaml b/packages/cloud_functions/cloud_functions/example/pubspec.yaml index ebd2168b59be..f8bfd5ed78ae 100644 --- a/packages/cloud_functions/cloud_functions/example/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the cloud_functions plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: cloud_functions: ^7.0.1 diff --git a/packages/cloud_functions/cloud_functions/pubspec.yaml b/packages/cloud_functions/cloud_functions/pubspec.yaml index c6c6ef39dd68..49fb464a9ea2 100644 --- a/packages/cloud_functions/cloud_functions/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: cloud_functions_platform_interface: ^6.1.1 diff --git a/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml b/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml index c792db6118d5..5c7dc7f8e455 100644 --- a/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions_platform_interface/pubspec.yaml @@ -9,8 +9,8 @@ version: 6.1.1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/cloud_functions/cloud_functions_web/pubspec.yaml b/packages/cloud_functions/cloud_functions_web/pubspec.yaml index 82c932c962a0..1e4cfadb3a85 100644 --- a/packages/cloud_functions/cloud_functions_web/pubspec.yaml +++ b/packages/cloud_functions/cloud_functions_web/pubspec.yaml @@ -7,8 +7,8 @@ version: 5.1.15 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: cloud_functions_platform_interface: ^6.1.1 diff --git a/packages/firebase_ai/firebase_ai/android/build.gradle b/packages/firebase_ai/firebase_ai/android/build.gradle index 057ea35d5fae..39ead815c354 100644 --- a/packages/firebase_ai/firebase_ai/android/build.gradle +++ b/packages/firebase_ai/firebase_ai/android/build.gradle @@ -4,15 +4,14 @@ version = '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} buildscript { repositories { @@ -75,12 +74,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_ai/firebase_ai/example/pubspec.yaml b/packages/firebase_ai/firebase_ai/example/pubspec.yaml index 7cff04d37a46..14250a8fd69d 100644 --- a/packages/firebase_ai/firebase_ai/example/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/example/pubspec.yaml @@ -8,8 +8,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' # Dependencies specify other packages that your package needs in order to work. # To automatically upgrade your package dependencies to the latest versions diff --git a/packages/firebase_ai/firebase_ai/lib/src/base_model.dart b/packages/firebase_ai/firebase_ai/lib/src/base_model.dart index 2aecc89fc182..531d5668a0ea 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/base_model.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/base_model.dart @@ -268,11 +268,7 @@ final class _TemplateGoogleAIUri implements _TemplateUri { /// This class provides the basic functionality for interacting with the /// Firebase AI API. It is not intended to be instantiated directly. abstract class BaseModel { - BaseModel._({ - required SerializationStrategy serializationStrategy, - required _ModelUri modelUri, - }) : _serializationStrategy = serializationStrategy, - _modelUri = modelUri; + BaseModel._({required this._serializationStrategy, required this._modelUri}); final SerializationStrategy _serializationStrategy; final _ModelUri _modelUri; @@ -339,9 +335,8 @@ abstract class BaseApiClientModel extends BaseModel { BaseApiClientModel({ required super.serializationStrategy, required super.modelUri, - required ApiClient client, - }) : _client = client, - super._(); + required this._client, + }) : super._(); final ApiClient _client; @@ -368,8 +363,8 @@ abstract class BaseTemplateApiClientModel extends BaseApiClientModel { required super.serializationStrategy, required super.modelUri, required super.client, - required _TemplateUri templateUri, - }) : _templateUri = templateUri; + required this._templateUri, + }); final _TemplateUri _templateUri; diff --git a/packages/firebase_ai/firebase_ai/lib/src/client.dart b/packages/firebase_ai/firebase_ai/lib/src/client.dart index 585abc69faa5..580871656401 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/client.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/client.dart @@ -43,14 +43,12 @@ final _utf8Json = json.fuse(utf8); final class HttpApiClient implements ApiClient { ///Constructor HttpApiClient({ - required String apiKey, + required this._apiKey, http.Client? httpClient, - FutureOr> Function()? requestHeaders, - }) : _apiKey = apiKey, - // package:http top-level helpers (http.post, Request.send) create and + this._requestHeaders, + }) : // package:http top-level helpers (http.post, Request.send) create and // close a Client per call, which prevents TCP/TLS connection reuse. - _httpClient = httpClient ?? http.Client(), - _requestHeaders = requestHeaders; + _httpClient = httpClient ?? http.Client(); final String _apiKey; final http.Client _httpClient; diff --git a/packages/firebase_ai/firebase_ai/lib/src/content.dart b/packages/firebase_ai/firebase_ai/lib/src/content.dart index e1d0c2df92ce..aa5b6faf0912 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/content.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/content.dart @@ -223,8 +223,7 @@ Part parsePart(Object? jsonObject) { /// A datatype containing media that is part of a multi-part [Content] message. sealed class Part { // ignore: public_member_api_docs - const Part({this.isThought, String? thoughtSignature}) - : _thoughtSignature = thoughtSignature; + const Part({this.isThought, this._thoughtSignature}); // ignore: public_member_api_docs final bool? isThought; diff --git a/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart b/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart index 073ec9f2e5dc..7db32f139444 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/firebase_ai.dart @@ -33,12 +33,11 @@ class FirebaseAI extends FirebasePlugin { FirebaseAI._({ required this.app, required this.location, - required bool useAgentPlatform, + required this._useAgentPlatform, this.appCheck, this.auth, this.useLimitedUseAppCheckTokens = false, - }) : _useAgentPlatform = useAgentPlatform, - super(app.name, 'plugins.flutter.io/firebase_vertexai') { + }) : super(app.name, 'plugins.flutter.io/firebase_vertexai') { registerWebLibraryVersion('flutter-fire-ai', packageVersion); } diff --git a/packages/firebase_ai/firebase_ai/lib/src/generative_model.dart b/packages/firebase_ai/firebase_ai/lib/src/generative_model.dart index a1eda95288eb..61f3e3e47eca 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/generative_model.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/generative_model.dart @@ -41,15 +41,12 @@ final class GenerativeModel extends BaseApiClientModel { FirebaseAppCheck? appCheck, FirebaseAuth? auth, List? safetySettings, - GenerationConfig? generationConfig, + this._generationConfig, this.tools, - ToolConfig? toolConfig, - Content? systemInstruction, + this._toolConfig, + this._systemInstruction, http.Client? httpClient, }) : _safetySettings = safetySettings ?? [], - _generationConfig = generationConfig, - _toolConfig = toolConfig, - _systemInstruction = systemInstruction, super( serializationStrategy: useAgentPlatform ? AgentPlatformSerialization() @@ -78,15 +75,12 @@ final class GenerativeModel extends BaseApiClientModel { FirebaseAppCheck? appCheck, FirebaseAuth? auth, List? safetySettings, - GenerationConfig? generationConfig, + this._generationConfig, this.tools, - ToolConfig? toolConfig, - Content? systemInstruction, + this._toolConfig, + this._systemInstruction, ApiClient? apiClient, }) : _safetySettings = safetySettings ?? [], - _generationConfig = generationConfig, - _toolConfig = toolConfig, - _systemInstruction = systemInstruction, super( serializationStrategy: useAgentPlatform ? AgentPlatformSerialization() diff --git a/packages/firebase_ai/firebase_ai/lib/src/live_model.dart b/packages/firebase_ai/firebase_ai/lib/src/live_model.dart index c1f8c1885e15..13e0112ae9a8 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/live_model.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/live_model.dart @@ -35,21 +35,15 @@ final class LiveGenerativeModel extends BaseModel { required String location, required FirebaseApp app, required bool useAgentPlatform, - bool? useLimitedUseAppCheckTokens, - FirebaseAppCheck? appCheck, - FirebaseAuth? auth, - LiveGenerationConfig? liveGenerationConfig, - List? tools, - Content? systemInstruction, + this._useLimitedUseAppCheckTokens, + this._appCheck, + this._auth, + this._liveGenerationConfig, + this._tools, + this._systemInstruction, }) : _app = app, _location = location, _useAgentPlatform = useAgentPlatform, - _appCheck = appCheck, - _auth = auth, - _liveGenerationConfig = liveGenerationConfig, - _tools = tools, - _systemInstruction = systemInstruction, - _useLimitedUseAppCheckTokens = useLimitedUseAppCheckTokens, super._( serializationStrategy: AgentPlatformSerialization(), modelUri: useAgentPlatform diff --git a/packages/firebase_ai/firebase_ai/lib/src/live_session.dart b/packages/firebase_ai/firebase_ai/lib/src/live_session.dart index 8423931c187e..b0400f88dbc0 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/live_session.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/live_session.dart @@ -42,20 +42,14 @@ class LiveSession { // ignore: public_member_api_docs LiveSession._( this._ws, { - required String uri, - required LiveHeadersProvider headersProvider, - required String modelString, - Content? systemInstruction, - List? tools, - LiveGenerationConfig? liveGenerationConfig, + required this._uri, + required this._headersProvider, + required this._modelString, + this._systemInstruction, + this._tools, + this._liveGenerationConfig, LiveWebSocketConnector? connector, - }) : _uri = uri, - _headersProvider = headersProvider, - _modelString = modelString, - _systemInstruction = systemInstruction, - _tools = tools, - _liveGenerationConfig = liveGenerationConfig, - _connector = connector ?? connectWebSocket, + }) : _connector = connector ?? connectWebSocket, _messageController = StreamController.broadcast() { _listenToWebSocket(); } diff --git a/packages/firebase_ai/firebase_ai/lib/src/server_template/template_tool.dart b/packages/firebase_ai/firebase_ai/lib/src/server_template/template_tool.dart index 119a542e79cc..aaf52103c499 100644 --- a/packages/firebase_ai/firebase_ai/lib/src/server_template/template_tool.dart +++ b/packages/firebase_ai/firebase_ai/lib/src/server_template/template_tool.dart @@ -106,8 +106,7 @@ final class TemplateAutoFunctionDeclaration /// Config for template tools to use with server prompts. final class TemplateToolConfig { // ignore: public_member_api_docs - TemplateToolConfig({RetrievalConfig? retrievalConfig}) - : _retrievalConfig = retrievalConfig; + TemplateToolConfig({this._retrievalConfig}); final RetrievalConfig? _retrievalConfig; diff --git a/packages/firebase_ai/firebase_ai/pubspec.yaml b/packages/firebase_ai/firebase_ai/pubspec.yaml index 36cfd9bee36f..7606b2240017 100644 --- a/packages/firebase_ai/firebase_ai/pubspec.yaml +++ b/packages/firebase_ai/firebase_ai/pubspec.yaml @@ -17,8 +17,8 @@ platforms: web: environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_app_check: ^0.5.1 diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index f26a1f15439e..4ed4834edab9 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -18,15 +18,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -80,12 +79,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml b/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml index 3fd941e7bfc7..690b4b34d9ae 100755 --- a/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_analytics plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_analytics: ^13.0.1 diff --git a/packages/firebase_analytics/firebase_analytics/lib/observer.dart b/packages/firebase_analytics/firebase_analytics/lib/observer.dart index ebffd8aeff5c..089f1b67e713 100644 --- a/packages/firebase_analytics/firebase_analytics/lib/observer.dart +++ b/packages/firebase_analytics/firebase_analytics/lib/observer.dart @@ -72,8 +72,8 @@ class FirebaseAnalyticsObserver extends RouteObserver> { required this.analytics, this.nameExtractor = defaultNameExtractor, this.routeFilter = defaultRouteFilter, - Function(PlatformException error)? onError, - }) : _onError = onError; + this._onError, + }); final FirebaseAnalytics analytics; final ScreenNameExtractor nameExtractor; diff --git a/packages/firebase_analytics/firebase_analytics/pubspec.yaml b/packages/firebase_analytics/firebase_analytics/pubspec.yaml index c8b3d252ce78..a62baabf10b9 100755 --- a/packages/firebase_analytics/firebase_analytics/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_analytics_platform_interface: ^6.0.9 diff --git a/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml b/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml index 6bced11837d1..0cbdcd5d9eba 100644 --- a/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics_platform_interface/pubspec.yaml @@ -6,8 +6,8 @@ version: 6.0.9 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_analytics/firebase_analytics_web/pubspec.yaml b/packages/firebase_analytics/firebase_analytics_web/pubspec.yaml index e181c40a6f69..068e0028e601 100644 --- a/packages/firebase_analytics/firebase_analytics_web/pubspec.yaml +++ b/packages/firebase_analytics/firebase_analytics_web/pubspec.yaml @@ -6,8 +6,8 @@ version: 0.6.3+15 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_app_check/firebase_app_check/android/build.gradle b/packages/firebase_app_check/firebase_app_check/android/build.gradle index 962b079e461c..482edc0245e7 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -18,15 +18,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -82,12 +81,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml index b95f997888ca..ad7e91eb3990 100644 --- a/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: cloud_firestore: ^7.1.0 diff --git a/packages/firebase_app_check/firebase_app_check/pubspec.yaml b/packages/firebase_app_check/firebase_app_check/pubspec.yaml index bd08bda08de0..24ba7545a856 100644 --- a/packages/firebase_app_check/firebase_app_check/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_app_check_platform_interface: ^0.5.1+3 diff --git a/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml b/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml index b35f4cf9dde8..f77b813f58de 100644 --- a/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check_platform_interface/pubspec.yaml @@ -5,8 +5,8 @@ version: 0.5.1+3 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_app_check/firebase_app_check_web/pubspec.yaml b/packages/firebase_app_check/firebase_app_check_web/pubspec.yaml index aa3e13ddc39b..214fa3d67dc0 100644 --- a/packages/firebase_app_check/firebase_app_check_web/pubspec.yaml +++ b/packages/firebase_app_check/firebase_app_check_web/pubspec.yaml @@ -5,8 +5,8 @@ version: 0.3.1+3 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle index f3836b0e83b7..ad1c9e496379 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -22,15 +22,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def firebaseCoreProject = rootProject.subprojects.find { it.name == "firebase_core" } if (firebaseCoreProject == null) { @@ -83,12 +82,20 @@ dependencies { implementation 'androidx.annotation:annotation:1.7.0' } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml index d808e7c9d7d8..9fd89e6b9d57 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml index 11615e9e221e..e078e6dcd49c 100644 --- a/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_app_installations_platform_interface: ^0.1.7 diff --git a/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml index 558c19b2225c..f7634d0768d0 100644 --- a/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations_platform_interface/pubspec.yaml @@ -6,8 +6,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_ap repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_app_installations/firebase_app_installations_platform_interface environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml b/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml index cf57f49d08bb..f364aa2f67de 100644 --- a/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml +++ b/packages/firebase_app_installations/firebase_app_installations_web/pubspec.yaml @@ -6,8 +6,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_ap repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_app_installations/firebase_app_installations_web environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index 206708365460..281eff61cd8b 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -18,15 +18,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -79,12 +78,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_auth/firebase_auth/example/pubspec.yaml b/packages/firebase_auth/firebase_auth/example/pubspec.yaml index 832a5f1ce54a..ff20c79d72b3 100644 --- a/packages/firebase_auth/firebase_auth/example/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_auth plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: barcode_widget: ^2.0.4 diff --git a/packages/firebase_auth/firebase_auth/pubspec.yaml b/packages/firebase_auth/firebase_auth/pubspec.yaml index 3a2949a05612..2f55704c8a32 100755 --- a/packages/firebase_auth/firebase_auth/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_auth_platform_interface: ^9.1.2 diff --git a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/action_code_info.dart b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/action_code_info.dart index 2f79ed7a652f..3a88d8ed05c4 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/lib/src/action_code_info.dart +++ b/packages/firebase_auth/firebase_auth_platform_interface/lib/src/action_code_info.dart @@ -10,8 +10,7 @@ import 'package:meta/meta.dart'; class ActionCodeInfo { // ignore: public_member_api_docs @protected - ActionCodeInfo({required this.operation, required ActionCodeInfoData data}) - : _data = data; + ActionCodeInfo({required this.operation, required this._data}); ActionCodeInfoOperation operation; diff --git a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml index f7d2903f6b85..5385d8e8d0c3 100644 --- a/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth_platform_interface/pubspec.yaml @@ -8,8 +8,8 @@ version: 9.1.2 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_auth/firebase_auth_web/pubspec.yaml b/packages/firebase_auth/firebase_auth_web/pubspec.yaml index 48ecd0a8bd5c..b86e88dbd978 100644 --- a/packages/firebase_auth/firebase_auth_web/pubspec.yaml +++ b/packages/firebase_auth/firebase_auth_web/pubspec.yaml @@ -6,8 +6,8 @@ version: 6.3.2 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_auth_platform_interface: ^9.1.2 diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 7711ae9943ca..af143664ae74 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -18,15 +18,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def getRootProjectExtOrDefaultProperty(name) { if (!rootProject.ext.has("FlutterFire")) return project.properties[name] @@ -73,12 +72,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_core/firebase_core/example/pubspec.yaml b/packages/firebase_core/firebase_core/example/pubspec.yaml index 3eaf91e9816f..bcf57cde9279 100644 --- a/packages/firebase_core/firebase_core/example/pubspec.yaml +++ b/packages/firebase_core/firebase_core/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_core plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml index eb0152213806..83b556dcf411 100644 --- a/packages/firebase_core/firebase_core/pubspec.yaml +++ b/packages/firebase_core/firebase_core/pubspec.yaml @@ -13,8 +13,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core_platform_interface: ^8.1.1 diff --git a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml index 5c5bdc315fdf..e96906bfe5ff 100644 --- a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml +++ b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml @@ -8,8 +8,8 @@ version: 8.1.1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: collection: ^1.0.0 diff --git a/packages/firebase_core/firebase_core_web/pubspec.yaml b/packages/firebase_core/firebase_core_web/pubspec.yaml index c2ff9f730580..fcf06da49445 100644 --- a/packages/firebase_core/firebase_core_web/pubspec.yaml +++ b/packages/firebase_core/firebase_core_web/pubspec.yaml @@ -6,8 +6,8 @@ version: 4.1.0 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core_platform_interface: ^8.1.1 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index cac981addf07..23d9d22c5fef 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -18,15 +18,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -84,12 +83,20 @@ dependencies { testImplementation 'junit:junit:4.13.2' } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml index a013f3424ec0..aaca5c9ffb47 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_crashlytics plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_analytics: ^13.0.1 diff --git a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml index 2a27b5a1e85b..e4cc9526c57b 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml index 5a0894a7ab05..de0972150ed5 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml +++ b/packages/firebase_crashlytics/firebase_crashlytics_platform_interface/pubspec.yaml @@ -6,8 +6,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_cr repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_crashlytics/firebase_crashlytics_platform_interface environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml index 6827a35ed030..97c354c64659 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/example/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: flutter: diff --git a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml index c4fef8ed8149..8a9baabfa9ec 100644 --- a/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml +++ b/packages/firebase_data_connect/firebase_data_connect/pubspec.yaml @@ -13,8 +13,8 @@ platforms: web: environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: crypto: ^3.0.6 diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index 84bd5d56cafa..da198ac6211d 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -4,15 +4,14 @@ version = '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} buildscript { repositories { @@ -83,12 +82,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_database/firebase_database/example/pubspec.yaml b/packages/firebase_database/firebase_database/example/pubspec.yaml index 3526653d49d4..763ee48fb273 100755 --- a/packages/firebase_database/firebase_database/example/pubspec.yaml +++ b/packages/firebase_database/firebase_database/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_database plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_database/firebase_database/pubspec.yaml b/packages/firebase_database/firebase_database/pubspec.yaml index 30027278baa9..db7a3d9c79f9 100755 --- a/packages/firebase_database/firebase_database/pubspec.yaml +++ b/packages/firebase_database/firebase_database/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml index 3f4ed33c9803..c751dcb29367 100755 --- a/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml +++ b/packages/firebase_database/firebase_database_platform_interface/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_database/firebase_database_platform_interface environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_database/firebase_database_web/pubspec.yaml b/packages/firebase_database/firebase_database_web/pubspec.yaml index e6bc5977c15a..4270149429b5 100644 --- a/packages/firebase_database/firebase_database_web/pubspec.yaml +++ b/packages/firebase_database/firebase_database_web/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_database/firebase_database_web environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: collection: ^1.18.0 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle index 45b3935a96d9..bd83f4f928f0 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/build.gradle @@ -22,15 +22,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -85,12 +84,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml index 71420f063dda..16b976b25750 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/pubspec.yaml @@ -4,8 +4,8 @@ resolution: workspace publish_to: 'none' environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_analytics: ^13.0.1 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml index 2c7d73f27a40..d8d4980fa366 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/in_app_message.dart b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/in_app_message.dart index 6ac8e885a8a6..f24c8c6dbc34 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/in_app_message.dart +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/lib/src/in_app_message.dart @@ -80,14 +80,11 @@ class InAppMessage { this.primaryAction, this.secondaryAction, this.data = const {}, - required Future Function() onImpress, - required Future Function(InAppMessageAction action) onClick, - required Future Function(InAppMessagingDismissType type) onDismiss, - required Future Function(String reason) onError, - }) : _onImpress = onImpress, - _onClick = onClick, - _onDismiss = onDismiss, - _onError = onError; + required this._onImpress, + required this._onClick, + required this._onDismiss, + required this._onError, + }); final Future Function() _onImpress; final Future Function(InAppMessageAction action) _onClick; diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml index 6264b525c0f0..52fbe071ea98 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging_platform_interface/pubspec.yaml @@ -7,8 +7,8 @@ version: 0.2.7+30 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml index 3b2ce73a8876..083c01bd4c6e 100644 --- a/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_messaging plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_messaging/firebase_messaging/pubspec.yaml b/packages/firebase_messaging/firebase_messaging/pubspec.yaml index 1e8c9a8914bb..4ca0acfe9a28 100644 --- a/packages/firebase_messaging/firebase_messaging/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging/pubspec.yaml @@ -14,8 +14,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml b/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml index 5923ecaa56b7..ca4deb22025c 100644 --- a/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging_platform_interface/pubspec.yaml @@ -6,8 +6,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_me repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_messaging/firebase_messaging_platform_interface environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_messaging/firebase_messaging_web/pubspec.yaml b/packages/firebase_messaging/firebase_messaging_web/pubspec.yaml index 07a1ae70127c..57ad69b559d0 100644 --- a/packages/firebase_messaging/firebase_messaging_web/pubspec.yaml +++ b/packages/firebase_messaging/firebase_messaging_web/pubspec.yaml @@ -6,8 +6,8 @@ version: 4.3.1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index da747d1f4704..79ca673a7074 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -4,15 +4,14 @@ version = '1.0-SNAPSHOT' apply plugin: 'com.android.library' apply from: file("local-config.gradle") -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} buildscript { repositories { @@ -80,12 +79,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_performance/firebase_performance/example/pubspec.yaml b/packages/firebase_performance/firebase_performance/example/pubspec.yaml index f36728092da3..9750ce300e11 100644 --- a/packages/firebase_performance/firebase_performance/example/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/example/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace publish_to: none environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_performance/firebase_performance/pubspec.yaml b/packages/firebase_performance/firebase_performance/pubspec.yaml index a98ad0a5d9b9..216dbcd2aff8 100644 --- a/packages/firebase_performance/firebase_performance/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance/pubspec.yaml @@ -17,8 +17,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_performance/firebase_performance_platform_interface/pubspec.yaml b/packages/firebase_performance/firebase_performance_platform_interface/pubspec.yaml index 684cef34a39b..191e44549761 100644 --- a/packages/firebase_performance/firebase_performance_platform_interface/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance_platform_interface/pubspec.yaml @@ -5,8 +5,8 @@ resolution: workspace homepage: https://firebase.google.com/docs/perf-mon/flutter/get-started environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_performance/firebase_performance_web/pubspec.yaml b/packages/firebase_performance/firebase_performance_web/pubspec.yaml index 7e57ce3e076d..c1de157466a2 100644 --- a/packages/firebase_performance/firebase_performance_web/pubspec.yaml +++ b/packages/firebase_performance/firebase_performance_web/pubspec.yaml @@ -5,8 +5,8 @@ version: 0.1.10+15 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle index 8ea2fe64e061..9c2e2ba67049 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -18,15 +18,14 @@ rootProject.allprojects { } } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (agpMajor < 9 || !builtInKotlin) { - apply plugin: 'kotlin-android' -} def firebaseCoreProject = findProject(':firebase_core') if (firebaseCoreProject == null) { @@ -80,12 +79,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml index 082412118a67..171b61443c56 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_remote_config plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: # The following adds the Cupertino Icons font to your application. diff --git a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml index 693ada29d460..acb80e1f1b62 100644 --- a/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml index 1222edaeae99..106ded6cacd3 100644 --- a/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config_platform_interface/pubspec.yaml @@ -8,8 +8,8 @@ version: 3.0.9 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_remote_config/firebase_remote_config_web/pubspec.yaml b/packages/firebase_remote_config/firebase_remote_config_web/pubspec.yaml index c6cedd3aa0e9..e541c8bfafc7 100644 --- a/packages/firebase_remote_config/firebase_remote_config_web/pubspec.yaml +++ b/packages/firebase_remote_config/firebase_remote_config_web/pubspec.yaml @@ -7,8 +7,8 @@ version: 1.10.16 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 9baa3cb74bfd..852c6675ca42 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -39,15 +39,14 @@ def getRootProjectExtOrCoreProperty(name, firebaseCoreProject) { return rootProject.ext.get('FlutterFire').get(name) } -// AGP 9+ has built-in Kotlin support unless Flutter opts out via android.builtInKotlin=false. +// AGP 9+ uses built-in Kotlin unless android.builtInKotlin=false. +// Do not apply the Kotlin Gradle Plugin. Flutter flags that apply line +// even inside a version check, and AGP 10 rejects it. def agpMajor = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')[0] as int def builtInKotlin = providers.gradleProperty("android.builtInKotlin") .map { it.toBoolean() } .orElse(agpMajor >= 9) .get() -if (!builtInKotlin) { - apply plugin: 'kotlin-android' -} android { // Conditional for compatibility with AGP <4.2. @@ -88,12 +87,20 @@ android { } } -plugins.withId("org.jetbrains.kotlin.android") { +if (agpMajor >= 9 && builtInKotlin) { kotlin { compilerOptions { jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) } } +} else { + plugins.withId("org.jetbrains.kotlin.android") { + kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.fromTarget(project.ext.javaVersion.toString()) + } + } + } } apply from: file("./user-agent.gradle") diff --git a/packages/firebase_storage/firebase_storage/example/pubspec.yaml b/packages/firebase_storage/firebase_storage/example/pubspec.yaml index 91b3d331bab7..63f4a8b7181c 100755 --- a/packages/firebase_storage/firebase_storage/example/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/example/pubspec.yaml @@ -3,8 +3,8 @@ description: Demonstrates how to use the firebase_storage plugin. resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_storage/firebase_storage/pubspec.yaml b/packages/firebase_storage/firebase_storage/pubspec.yaml index babb0650dbb7..4e9419fdc295 100755 --- a/packages/firebase_storage/firebase_storage/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage/pubspec.yaml @@ -16,8 +16,8 @@ false_secrets: - example/** environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: firebase_core: ^5.1.0 diff --git a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml index b1cb2e0cb4f2..e0f72f357104 100644 --- a/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage_platform_interface/pubspec.yaml @@ -6,8 +6,8 @@ homepage: https://github.com/firebase/flutterfire/tree/main/packages/firebase_st repository: https://github.com/firebase/flutterfire/tree/main/packages/firebase_storage/firebase_storage_platform_interface environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/packages/firebase_storage/firebase_storage_web/pubspec.yaml b/packages/firebase_storage/firebase_storage_web/pubspec.yaml index c95d7236b764..a0cae34e2dd8 100644 --- a/packages/firebase_storage/firebase_storage_web/pubspec.yaml +++ b/packages/firebase_storage/firebase_storage_web/pubspec.yaml @@ -6,8 +6,8 @@ version: 3.11.15 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: _flutterfire_internals: ^1.3.79 diff --git a/pubspec.yaml b/pubspec.yaml index db616dc25616..f0f1f4c02a3d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: flutterfire_workspace environment: - sdk: '^3.10.0' + sdk: '^3.12.0' workspace: - packages/_flutterfire_internals diff --git a/tests/pubspec.yaml b/tests/pubspec.yaml index 62421b3d4aad..340255b335d0 100644 --- a/tests/pubspec.yaml +++ b/tests/pubspec.yaml @@ -6,8 +6,8 @@ version: 1.0.0+1 resolution: workspace environment: - sdk: '^3.10.0' - flutter: '>=3.38.0' + sdk: '^3.12.0' + flutter: '>=3.44.0' dependencies: cloud_functions: ^7.0.1