From 845a52940e85b6cae8b7bf4eb8ce7581d74a2e12 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 10 Apr 2025 13:56:04 +0100 Subject: [PATCH 1/2] chore(deps): use version catalogue --- gradle/libs.versions.toml | 6 ++++++ .../cloud_firestore/android/build.gradle | 8 ++++---- .../cloud_firestore/android/settings.gradle | 8 ++++++++ .../cloud_firestore/example/android/app/build.gradle | 4 ++-- .../cloud_functions/android/build.gradle | 9 +++++---- .../cloud_functions/example/android/app/build.gradle | 4 ++-- .../firebase_analytics/android/build.gradle | 8 ++++---- .../firebase_analytics/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_app_check/android/build.gradle | 10 +++++----- .../firebase_app_check/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_app_installations/android/build.gradle | 8 ++++---- .../android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_auth/firebase_auth/android/build.gradle | 9 +++++---- .../firebase_auth/android/settings.gradle | 8 ++++++++ .../firebase_auth/example/android/app/build.gradle | 6 +++--- .../firebase_core/firebase_core/android/build.gradle | 8 ++++---- .../firebase_core/android/settings.gradle | 8 ++++++++ .../firebase_core/example/android/app/build.gradle | 4 ++-- .../firebase_crashlytics/android/build.gradle | 10 +++++----- .../firebase_crashlytics/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../example/android/app/build.gradle | 6 +++--- .../firebase_database/android/build.gradle | 8 ++++---- .../firebase_database/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_dynamic_links/android/build.gradle | 8 ++++---- .../firebase_dynamic_links/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_in_app_messaging/android/build.gradle | 10 +++++----- .../android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_messaging/android/build.gradle | 10 +++++----- .../firebase_messaging/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../android/build.gradle | 10 +++++----- .../android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_performance/android/build.gradle | 8 ++++---- .../firebase_performance/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_remote_config/android/build.gradle | 8 ++++---- .../firebase_remote_config/android/settings.gradle | 8 ++++++++ .../example/android/app/build.gradle | 4 ++-- .../firebase_storage/android/build.gradle | 8 ++++---- .../firebase_storage/android/settings.gradle | 8 ++++++++ tests/android/app/build.gradle | 12 ++++++------ 49 files changed, 237 insertions(+), 109 deletions(-) create mode 100644 gradle/libs.versions.toml diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000000..81a0b0e84110 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,6 @@ +[versions] +java = "17" +kotlin = "1.9.22" +compile-sdk = "35" +min-sdk = "21" +target-sdk = "35" diff --git a/packages/cloud_firestore/cloud_firestore/android/build.gradle b/packages/cloud_firestore/cloud_firestore/android/build.gradle index f4c27a4f460c..05e48e2ed1ca 100755 --- a/packages/cloud_firestore/cloud_firestore/android/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.firestore' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/cloud_firestore/cloud_firestore/android/settings.gradle b/packages/cloud_firestore/cloud_firestore/android/settings.gradle index caf10656889a..15b72b4e85c8 100755 --- a/packages/cloud_firestore/cloud_firestore/android/settings.gradle +++ b/packages/cloud_firestore/cloud_firestore/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'cloud_firestore' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle index 9f10cb25819c..f8e454b04d81 100644 --- a/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle +++ b/packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/cloud_functions/cloud_functions/android/build.gradle b/packages/cloud_functions/cloud_functions/android/build.gradle index 849cf1bec6c1..d6e905697a88 100644 --- a/packages/cloud_functions/cloud_functions/android/build.gradle +++ b/packages/cloud_functions/cloud_functions/android/build.gradle @@ -40,17 +40,18 @@ android { namespace 'io.flutter.plugins.firebase.functions' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } + buildFeatures { buildConfig = true } diff --git a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle index c731b21805fa..5bb1426bcdf9 100644 --- a/packages/cloud_functions/cloud_functions/example/android/app/build.gradle +++ b/packages/cloud_functions/cloud_functions/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_analytics/firebase_analytics/android/build.gradle b/packages/firebase_analytics/firebase_analytics/android/build.gradle index cec9a11fa95e..77bee23ba6b8 100755 --- a/packages/firebase_analytics/firebase_analytics/android/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.analytics' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_analytics/firebase_analytics/android/settings.gradle b/packages/firebase_analytics/firebase_analytics/android/settings.gradle index 4b80dda8afc7..7cebb967ff52 100755 --- a/packages/firebase_analytics/firebase_analytics/android/settings.gradle +++ b/packages/firebase_analytics/firebase_analytics/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_analytics' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle index 0f4ded4a249f..caad3e17b1a7 100644 --- a/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle +++ b/packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { 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 01f3ad92061e..a48b86766eff 100644 --- a/packages/firebase_app_check/firebase_app_check/android/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.appcheck' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdk libs.versions.min.sdk.get().toInteger() + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_app_check/firebase_app_check/android/settings.gradle b/packages/firebase_app_check/firebase_app_check/android/settings.gradle index 5cd8520f8176..601b39b7f89c 100644 --- a/packages/firebase_app_check/firebase_app_check/android/settings.gradle +++ b/packages/firebase_app_check/firebase_app_check/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_app_check' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle index 684e3b6d72bb..d2459113f484 100644 --- a/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle +++ b/packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { 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 20b145376854..e30159a4c0e4 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/build.gradle @@ -40,15 +40,15 @@ android { namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle b/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle index aee00677e78a..22369ce67c72 100644 --- a/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_app_installations' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle index 1b9bb1a8e8c4..7c66d1d455ad 100644 --- a/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle +++ b/packages/firebase_app_installations/firebase_app_installations/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_auth/firebase_auth/android/build.gradle b/packages/firebase_auth/firebase_auth/android/build.gradle index a6abd8a18c3a..9406d194dbf6 100755 --- a/packages/firebase_auth/firebase_auth/android/build.gradle +++ b/packages/firebase_auth/firebase_auth/android/build.gradle @@ -40,15 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.auth' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 23 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_auth/firebase_auth/android/settings.gradle b/packages/firebase_auth/firebase_auth/android/settings.gradle index acfe1855910f..e9c5f325cb51 100755 --- a/packages/firebase_auth/firebase_auth/android/settings.gradle +++ b/packages/firebase_auth/firebase_auth/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_auth' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle index 9103f89547dc..4bbef78e27a0 100644 --- a/packages/firebase_auth/firebase_auth/example/android/app/build.gradle +++ b/packages/firebase_auth/firebase_auth/example/android/app/build.gradle @@ -31,11 +31,11 @@ android { compileSdk = flutter.compileSdkVersion ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17 + jvmTarget = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_core/firebase_core/android/build.gradle b/packages/firebase_core/firebase_core/android/build.gradle index 6f9775b69f7a..2dd6d84e6e02 100644 --- a/packages/firebase_core/firebase_core/android/build.gradle +++ b/packages/firebase_core/firebase_core/android/build.gradle @@ -26,16 +26,16 @@ android { namespace 'io.flutter.plugins.firebase.core' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_core/firebase_core/android/settings.gradle b/packages/firebase_core/firebase_core/android/settings.gradle index 6b9f7039d668..eafbf0235f6f 100644 --- a/packages/firebase_core/firebase_core/android/settings.gradle +++ b/packages/firebase_core/firebase_core/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_core' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_core/firebase_core/example/android/app/build.gradle b/packages/firebase_core/firebase_core/example/android/app/build.gradle index fed55ad43d2a..4aee51123f91 100644 --- a/packages/firebase_core/firebase_core/example/android/app/build.gradle +++ b/packages/firebase_core/firebase_core/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle index 71f56c75d5ac..a542dc50fca5 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle @@ -39,16 +39,16 @@ android { namespace 'io.flutter.plugins.firebase.crashlytics' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdk libs.versions.min.sdk.get().toInteger() + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle b/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle index 0db0f63e40fd..c53055e8200c 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_crashlytics' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle index af82ea6d4ada..81fb48af614b 100644 --- a/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle +++ b/packages/firebase_crashlytics/firebase_crashlytics/example/android/app/build.gradle @@ -33,8 +33,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle index 1e2e2b673008..32248fbb0fb4 100644 --- a/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle +++ b/packages/firebase_data_connect/firebase_data_connect/example/android/app/build.gradle @@ -29,8 +29,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { @@ -38,7 +38,7 @@ android { applicationId = "io.flutter.plugins.firebase.dataconnect.example" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. - minSdk = 23 + minSdk = flutter.minSdkVersion targetSdk = flutter.targetSdkVersion versionCode = flutterVersionCode.toInteger() versionName = flutterVersionName diff --git a/packages/firebase_database/firebase_database/android/build.gradle b/packages/firebase_database/firebase_database/android/build.gradle index f24038466b3f..7122a051d7e5 100755 --- a/packages/firebase_database/firebase_database/android/build.gradle +++ b/packages/firebase_database/firebase_database/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.database' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_database/firebase_database/android/settings.gradle b/packages/firebase_database/firebase_database/android/settings.gradle index 853b33390159..55ecac96b310 100755 --- a/packages/firebase_database/firebase_database/android/settings.gradle +++ b/packages/firebase_database/firebase_database/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_database' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_database/firebase_database/example/android/app/build.gradle b/packages/firebase_database/firebase_database/example/android/app/build.gradle index f58f58e5d8e3..42a6c7a6dc85 100644 --- a/packages/firebase_database/firebase_database/example/android/app/build.gradle +++ b/packages/firebase_database/firebase_database/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle index 305f207a726f..8a899d0a45bb 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.dynamiclinks' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle index 2a833554f85c..0e2e45ad8148 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_dynamic_links' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle index 9b5983cf9f9a..d97bc79e45de 100644 --- a/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle +++ b/packages/firebase_dynamic_links/firebase_dynamic_links/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { 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 c9de2381db8b..4f120b499e3a 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 @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.inappmessaging' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdk libs.versions.min.sdk.get().toInteger() + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle index 727175685e2b..2c2e8946c848 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_in_app_messaging' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle index 401f578edc37..208b56aa1e82 100644 --- a/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle +++ b/packages/firebase_in_app_messaging/firebase_in_app_messaging/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_messaging/firebase_messaging/android/build.gradle b/packages/firebase_messaging/firebase_messaging/android/build.gradle index f93b9ef3f0f9..737eb6cfbf99 100644 --- a/packages/firebase_messaging/firebase_messaging/android/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.messaging' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdk libs.versions.min.sdk.get().toInteger() + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_messaging/firebase_messaging/android/settings.gradle b/packages/firebase_messaging/firebase_messaging/android/settings.gradle index f82964eb43a1..9ca77a3ab1ac 100644 --- a/packages/firebase_messaging/firebase_messaging/android/settings.gradle +++ b/packages/firebase_messaging/firebase_messaging/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_messaging' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle index f2684a27ec57..d2464009d605 100644 --- a/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle +++ b/packages/firebase_messaging/firebase_messaging/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle index c3210371a6f2..d86bcd12fd28 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.firebase_ml_model_downloader' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + minSdk libs.versions.min.sdk.get().toInteger() + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle index a9eadb293261..c9cd9e1bbe16 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_ml_model_downloader' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle index 401f578edc37..208b56aa1e82 100644 --- a/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle +++ b/packages/firebase_ml_model_downloader/firebase_ml_model_downloader/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_performance/firebase_performance/android/build.gradle b/packages/firebase_performance/firebase_performance/android/build.gradle index d3323b7ef988..ae77b74bdc46 100644 --- a/packages/firebase_performance/firebase_performance/android/build.gradle +++ b/packages/firebase_performance/firebase_performance/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.performance' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_performance/firebase_performance/android/settings.gradle b/packages/firebase_performance/firebase_performance/android/settings.gradle index 50c3a2d77af8..5f478d4a4189 100644 --- a/packages/firebase_performance/firebase_performance/android/settings.gradle +++ b/packages/firebase_performance/firebase_performance/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_performance' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle index 228d0bc23eda..227cb4b0260d 100644 --- a/packages/firebase_performance/firebase_performance/example/android/app/build.gradle +++ b/packages/firebase_performance/firebase_performance/example/android/app/build.gradle @@ -33,8 +33,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { 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 58952364c46d..3ca09ef92754 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/build.gradle @@ -40,16 +40,16 @@ android { namespace 'io.flutter.plugins.firebase.firebaseremoteconfig' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle b/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle index 1ab71539c02f..c85f50ed2ac0 100644 --- a/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_remote_config' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle index 20aeafddf497..5505c38f14e2 100644 --- a/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle +++ b/packages/firebase_remote_config/firebase_remote_config/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { diff --git a/packages/firebase_storage/firebase_storage/android/build.gradle b/packages/firebase_storage/firebase_storage/android/build.gradle index 629d0f3a60eb..f1990a966de2 100755 --- a/packages/firebase_storage/firebase_storage/android/build.gradle +++ b/packages/firebase_storage/firebase_storage/android/build.gradle @@ -48,16 +48,16 @@ android { namespace 'io.flutter.plugins.firebase.storage' } - compileSdk 35 + compileSdk libs.versions.compile.sdk.get().toInteger() defaultConfig { - minSdk 21 + minSdk libs.versions.min.sdk.get().toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } buildFeatures { diff --git a/packages/firebase_storage/firebase_storage/android/settings.gradle b/packages/firebase_storage/firebase_storage/android/settings.gradle index f0aec4453e6d..bce60efff6eb 100755 --- a/packages/firebase_storage/firebase_storage/android/settings.gradle +++ b/packages/firebase_storage/firebase_storage/android/settings.gradle @@ -1 +1,9 @@ rootProject.name = 'firebase_storage' + +dependencyResolutionManagement { + versionCatalogs { + libs { + from(files(rootDir.toPath().resolve("gradle/libs.versions.toml"))) + } + } +} diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 3af574d0809e..f9aed5c732d6 100644 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -25,23 +25,23 @@ if (flutterVersionName == null) { android { namespace = "io.flutter.plugins.firebase.tests" - compileSdk = 35 + compileSdk = libs.versions.compile.sdk.get().toInteger() ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } kotlinOptions { - jvmTarget = JavaVersion.VERSION_17 + jvmTarget = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig { applicationId = "io.flutter.plugins.firebase.tests" // auth requires minSdk 23 - minSdk = 23 - targetSdk = 35 + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion versionCode = flutterVersionCode.toInteger() versionName = flutterVersionName } From 796998327cc92c9f82cbcf90b5f0b227214cc370 Mon Sep 17 00:00:00 2001 From: MichaelVerdon Date: Thu, 10 Apr 2025 13:56:21 +0100 Subject: [PATCH 2/2] chore(deps): use version catalogue --- .../firebase_storage/example/android/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle index 6ba7545f3ca7..150d3fd2335e 100644 --- a/packages/firebase_storage/firebase_storage/example/android/app/build.gradle +++ b/packages/firebase_storage/firebase_storage/example/android/app/build.gradle @@ -32,8 +32,8 @@ android { ndkVersion = flutter.ndkVersion compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.toVersion(libs.versions.java.get()) + targetCompatibility = JavaVersion.toVersion(libs.versions.java.get()) } defaultConfig {