Skip to content

chore(deps): Unify versions into global config and update AGP version to 8.2.1 #17272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 35 commits into
base: main
Choose a base branch
from
Open

chore(deps): Unify versions into global config and update AGP version to 8.2.1 #17272

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
31aab4a
chore(deps): Unify versions into gobal config and update AGP version …
MichaelVerdon Apr 10, 2025
85b93a6
chore(deps): bump gradle wrapper gradle version
MichaelVerdon Apr 10, 2025
025ce20
fix(deps): get analytics
MichaelVerdon Apr 11, 2025
161dc41
fix(deps): Fix performance
MichaelVerdon Apr 11, 2025
27a600a
fix(deps): expose firebaseCoreProject
MichaelVerdon Apr 11, 2025
6d0660a
fix(deps): ensure desugaring enabled
MichaelVerdon Apr 11, 2025
7c2f834
fix(deps): create local configs for each package
MichaelVerdon Apr 11, 2025
6ffeef3
chore(deps): local configs to example apps
MichaelVerdon Apr 11, 2025
d80c0d9
chore(deps): dataconnect config
MichaelVerdon Apr 11, 2025
5bcf242
feat(deps): started script file to change java and compile versions
MichaelVerdon Apr 11, 2025
44b182e
chore(deps): automated script working
MichaelVerdon Apr 16, 2025
8b15b09
fix: cleanup and make script copy gradle files only
MichaelVerdon Apr 17, 2025
06f4498
fix: change path of global-config
MichaelVerdon Apr 17, 2025
84b2f86
chore: specific handling for auth
MichaelVerdon Apr 17, 2025
537e480
fix: revert melos.yaml change
MichaelVerdon Apr 17, 2025
3f57b8a
chore: more meaningful comment
MichaelVerdon Apr 17, 2025
84d3c01
chore: match android-sdk versions
MichaelVerdon Apr 17, 2025
51f9e28
fix: support gradle
MichaelVerdon Apr 23, 2025
578b531
fix: ext issue
MichaelVerdon Apr 23, 2025
de70f87
fix: removed random change
MichaelVerdon Apr 23, 2025
1196c9c
fix: ext issue
MichaelVerdon Apr 23, 2025
b7cea82
fix: test
MichaelVerdon Apr 24, 2025
3bf1a76
feat: add AGP version support
MichaelVerdon Apr 30, 2025
ece4349
chore: run script
MichaelVerdon Apr 30, 2025
b883c6b
Merge branch 'main' into global-versions
MichaelVerdon Apr 30, 2025
ed5b110
feat: added supprot for example apps
MichaelVerdon May 8, 2025
ec89897
feat: handle vertexai example app
MichaelVerdon May 8, 2025
c4d4c79
feat: more unification and cleanup
MichaelVerdon May 9, 2025
826a49d
chore: make settings.gradle apply properties
MichaelVerdon May 9, 2025
7e7a0b1
fix: last fixes, add note to script and include data-connect
MichaelVerdon May 9, 2025
13fad94
Merge branch 'main' into global-versions
MichaelVerdon May 21, 2025
e5f9b4b
Update scripts/generate_versions_gradle.dart
MichaelVerdon Jun 4, 2025
0f0a40d
Update scripts/generate_versions_gradle.dart
MichaelVerdon Jun 4, 2025
b253183
chore: individualise each case to display what is going on
MichaelVerdon Jun 4, 2025
a2257d0
Merge branch 'main' into global-versions
MichaelVerdon Jun 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions melos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ command:
dart run scripts/generate_vertexai_version.dart && \
dart run scripts/generate_dataconnect_version.dart && \
dart run scripts/generate_versions_spm.dart && \
dart run scripts/generate_versions_gradle.dart && \
git add packages/firebase_vertexai/firebase_vertexai/lib/src/vertex_version.dart && \
git add packages/firebase_data_connect/firebase_data_connect/lib/src/dataconnect_version.dart
post: |
Expand Down
11 changes: 6 additions & 5 deletions packages/cloud_firestore/cloud_firestore/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.android.tools.build:gradle:8.2.1'
}
}

Expand All @@ -20,6 +20,7 @@ allprojects {
}

apply plugin: 'com.android.library'
apply from: file("local-config.gradle")

def firebaseCoreProject = findProject(':firebase_core')
if (firebaseCoreProject == null) {
Expand All @@ -40,16 +41,16 @@ android {
namespace 'io.flutter.plugins.firebase.firestore'
}

compileSdk 35
compileSdkVersion project.ext.compileSdk

defaultConfig {
minSdk 21
minSdkVersion project.ext.minSdk
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility project.ext.javaVersion
targetCompatibility project.ext.javaVersion
}

buildFeatures {
Expand Down
6 changes: 6 additions & 0 deletions packages/cloud_firestore/cloud_firestore/android/local-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ext {
compileSdk=35
minSdk=21
targetSdk=35
javaVersion = JavaVersion.toVersion(17)
}
9 changes: 7 additions & 2 deletions packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}
apply from: file("../../../android/local-config.gradle")

def localProperties = new Properties()
def localPropertiesFile = rootProject.file("local.properties")
Expand All @@ -32,8 +33,12 @@ android {
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = project.ext.javaVersion
targetCompatibility = project.ext.javaVersion
}

kotlinOptions {
jvmTarget = "17"
}

defaultConfig {
Expand Down
4 changes: 4 additions & 0 deletions packages/cloud_firestore/cloud_firestore/example/android/app/generated_android_versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
javaVersion=17
compileSdk=35
minSdk=21
targetSdk=35
2 changes: 1 addition & 1 deletion packages/cloud_firestore/cloud_firestore/example/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.1.0" apply false
id "com.android.application" version "8.2.1" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
Expand Down
14 changes: 8 additions & 6 deletions packages/cloud_functions/cloud_functions/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.android.tools.build:gradle:8.2.1'
}
}

Expand All @@ -20,6 +20,7 @@ rootProject.allprojects {
}

apply plugin: 'com.android.library'
apply from: file("local-config.gradle")

def firebaseCoreProject = findProject(':firebase_core')
if (firebaseCoreProject == null) {
Expand All @@ -40,17 +41,18 @@ android {
namespace 'io.flutter.plugins.firebase.functions'
}

compileSdk 35
compileSdkVersion project.ext.compileSdk

defaultConfig {
minSdk 21
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
minSdkVersion project.ext.minSdk
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility project.ext.javaVersion
targetCompatibility project.ext.javaVersion
}

buildFeatures {
buildConfig = true
}
Expand Down
6 changes: 6 additions & 0 deletions packages/cloud_functions/cloud_functions/android/local-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ext {
compileSdk=35
minSdk=21
targetSdk=35
javaVersion = JavaVersion.toVersion(17)
}
9 changes: 7 additions & 2 deletions packages/cloud_functions/cloud_functions/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}
apply from: file("../../../android/local-config.gradle")

def localProperties = new Properties()
def localPropertiesFile = rootProject.file("local.properties")
Expand All @@ -32,8 +33,12 @@ android {
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = project.ext.javaVersion
targetCompatibility = project.ext.javaVersion
}

kotlinOptions {
jvmTarget = "17"
}

defaultConfig {
Expand Down
2 changes: 1 addition & 1 deletion packages/cloud_functions/cloud_functions/example/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "com.android.application" version "8.2.1" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
Expand Down
11 changes: 6 additions & 5 deletions packages/firebase_analytics/firebase_analytics/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.4'
classpath 'com.android.tools.build:gradle:8.2.1'
}
}

Expand All @@ -20,6 +20,7 @@ rootProject.allprojects {
}

apply plugin: 'com.android.library'
apply from: file("local-config.gradle")

def firebaseCoreProject = findProject(':firebase_core')
if (firebaseCoreProject == null) {
Expand All @@ -40,16 +41,16 @@ android {
namespace 'io.flutter.plugins.firebase.analytics'
}

compileSdk 35
compileSdkVersion project.ext.compileSdk

defaultConfig {
minSdk 21
minSdkVersion project.ext.minSdk
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility project.ext.javaVersion
targetCompatibility project.ext.javaVersion
}

buildFeatures {
Expand Down
6 changes: 6 additions & 0 deletions packages/firebase_analytics/firebase_analytics/android/local-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ext {
compileSdk=35
minSdk=21
targetSdk=35
javaVersion = JavaVersion.toVersion(17)
}
9 changes: 7 additions & 2 deletions packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}
apply from: file("../../../android/local-config.gradle")

def localProperties = new Properties()
def localPropertiesFile = rootProject.file("local.properties")
Expand All @@ -32,8 +33,12 @@ android {
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = project.ext.javaVersion
targetCompatibility = project.ext.javaVersion
}

kotlinOptions {
jvmTarget = "17"
}

defaultConfig {
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_analytics/firebase_analytics/example/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "com.android.application" version "8.2.1" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
Expand Down
11 changes: 6 additions & 5 deletions packages/firebase_app_check/firebase_app_check/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.android.tools.build:gradle:8.2.1'
}
}

Expand All @@ -20,6 +20,7 @@ rootProject.allprojects {
}

apply plugin: 'com.android.library'
apply from: file("local-config.gradle")

def firebaseCoreProject = findProject(':firebase_core')
if (firebaseCoreProject == null) {
Expand All @@ -40,16 +41,16 @@ android {
namespace 'io.flutter.plugins.firebase.appcheck'
}

compileSdk 35
compileSdkVersion project.ext.compileSdk

defaultConfig {
minSdk 21
minSdkVersion project.ext.minSdk
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility project.ext.javaVersion
targetCompatibility project.ext.javaVersion
}

buildFeatures {
Expand Down
6 changes: 6 additions & 0 deletions packages/firebase_app_check/firebase_app_check/android/local-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ext {
compileSdk=35
minSdk=21
targetSdk=35
javaVersion = JavaVersion.toVersion(17)
}
9 changes: 7 additions & 2 deletions packages/firebase_app_check/firebase_app_check/example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ plugins {
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
id "dev.flutter.flutter-gradle-plugin"
}
apply from: file("../../../android/local-config.gradle")

def localProperties = new Properties()
def localPropertiesFile = rootProject.file("local.properties")
Expand All @@ -32,8 +33,12 @@ android {
ndkVersion = flutter.ndkVersion

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = project.ext.javaVersion
targetCompatibility = project.ext.javaVersion
}

kotlinOptions {
jvmTarget = "17"
}

defaultConfig {
Expand Down
2 changes: 1 addition & 1 deletion packages/firebase_app_check/firebase_app_check/example/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.3.0" apply false
id "com.android.application" version "8.2.1" apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.3.15" apply false
// END: FlutterFire Configuration
Expand Down
14 changes: 8 additions & 6 deletions packages/firebase_app_installations/firebase_app_installations/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.2'
classpath 'com.android.tools.build:gradle:8.2.1'
}
}

Expand All @@ -20,8 +20,9 @@ rootProject.allprojects {
}

apply plugin: 'com.android.library'
apply from: file("local-config.gradle")

def firebaseCoreProject = findProject(':firebase_core')
def firebaseCoreProject = rootProject.subprojects.find { it.name == "firebase_core" }
if (firebaseCoreProject == null) {
throw new GradleException('Could not find the firebase_core FlutterFire plugin, have you added it as a dependency in your pubspec?')
} else if (!firebaseCoreProject.properties['FirebaseSDKVersion']) {
Expand All @@ -40,15 +41,16 @@ android {
namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations'
}

compileSdk 35
compileSdkVersion project.ext.compileSdk

defaultConfig {
minSdk 21
minSdkVersion project.ext.minSdk
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
sourceCompatibility project.ext.javaVersion
targetCompatibility project.ext.javaVersion
}

buildFeatures {
Expand Down
6 changes: 6 additions & 0 deletions packages/firebase_app_installations/firebase_app_installations/android/local-config.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ext {
compileSdk=35
minSdk=21
targetSdk=35
javaVersion = JavaVersion.toVersion(17)
}
Loading
Loading