Skip to content

Commit 31aab4a

Browse files
MichaelVerdonMichaelVerdon
committed
chore(deps): Unify versions into gobal config and update AGP version to 8.2.1
1 parent 89d1aa3 commit 31aab4a

54 files changed

Lines changed: 264 additions & 143 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎gradle/global-config.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
ext {
2+
javaVersion = JavaVersion.VERSION_17
3+
compileSdk = 35
4+
minSdk = 21
5+
targetSdk = 35
6+
}

‎packages/cloud_firestore/cloud_firestore/android/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.1.2'
11+
classpath 'com.android.tools.build:gradle:8.2.1'
1212
}
1313
}
1414

@@ -20,6 +20,7 @@ allprojects {
2020
}
2121

2222
apply plugin: 'com.android.library'
23+
apply from: file("../../../../gradle/global-config.gradle")
2324

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

43-
compileSdk 35
44+
compileSdkVersion project.ext.compileSdk
4445

4546
defaultConfig {
46-
minSdk 21
47+
minSdkVersion project.ext.minSdk
4748
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4849
}
4950

5051
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_17
52-
targetCompatibility JavaVersion.VERSION_17
52+
sourceCompatibility project.ext.javaVersion
53+
targetCompatibility project.ext.javaVersion
5354
}
5455

5556
buildFeatures {

‎packages/cloud_firestore/cloud_firestore/example/android/app/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
88
id "dev.flutter.flutter-gradle-plugin"
99
}
10+
apply from: file("../../../../../../gradle/global-config.gradle")
1011

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

3435
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_17
36-
targetCompatibility = JavaVersion.VERSION_17
36+
sourceCompatibility = project.ext.javaVersion
37+
targetCompatibility = project.ext.javaVersion
38+
}
39+
40+
kotlinOptions {
41+
jvmTarget = "17"
3742
}
3843

3944
defaultConfig {

‎packages/cloud_firestore/cloud_firestore/example/android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "8.1.0" apply false
21+
id "com.android.application" version "8.2.1" apply false
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration

‎packages/cloud_functions/cloud_functions/android/build.gradle‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.1.2'
11+
classpath 'com.android.tools.build:gradle:8.2.1'
1212
}
1313
}
1414

@@ -20,6 +20,7 @@ rootProject.allprojects {
2020
}
2121

2222
apply plugin: 'com.android.library'
23+
apply from: file("../../../../gradle/global-config.gradle")
2324

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

43-
compileSdk 35
44+
compileSdkVersion project.ext.compileSdk
4445

4546
defaultConfig {
46-
minSdk 21
47-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
47+
minSdkVersion project.ext.minSdk
48+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4849
}
4950

5051
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_17
52-
targetCompatibility JavaVersion.VERSION_17
52+
sourceCompatibility project.ext.javaVersion
53+
targetCompatibility project.ext.javaVersion
5354
}
55+
5456
buildFeatures {
5557
buildConfig = true
5658
}

‎packages/cloud_functions/cloud_functions/example/android/app/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
88
id "dev.flutter.flutter-gradle-plugin"
99
}
10+
apply from: file("../../../../../../gradle/global-config.gradle")
1011

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

3435
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_17
36-
targetCompatibility = JavaVersion.VERSION_17
36+
sourceCompatibility = project.ext.javaVersion
37+
targetCompatibility = project.ext.javaVersion
38+
}
39+
40+
kotlinOptions {
41+
jvmTarget = "17"
3742
}
3843

3944
defaultConfig {

‎packages/cloud_functions/cloud_functions/example/android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
21+
id "com.android.application" version "8.2.1" apply false
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration

‎packages/firebase_analytics/firebase_analytics/android/build.gradle‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
group 'io.flutter.plugins.firebase.analytics'
22
version '1.0-SNAPSHOT'
3+
apply from: rootProject.file('gradle/global-config.gradle')
34

45
buildscript {
56
repositories {
@@ -8,7 +9,7 @@ buildscript {
89
}
910

1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:8.1.4'
12+
classpath 'com.android.tools.build:gradle:8.2.1'
1213
}
1314
}
1415

@@ -20,6 +21,7 @@ rootProject.allprojects {
2021
}
2122

2223
apply plugin: 'com.android.library'
24+
apply from: file("../../../../gradle/global-config.gradle")
2325

2426
def firebaseCoreProject = findProject(':firebase_core')
2527
if (firebaseCoreProject == null) {
@@ -40,16 +42,16 @@ android {
4042
namespace 'io.flutter.plugins.firebase.analytics'
4143
}
4244

43-
compileSdk 35
45+
compileSdkVersion project.ext.compileSdk
4446

4547
defaultConfig {
46-
minSdk 21
48+
minSdkVersion project.ext.minSdk
4749
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4850
}
4951

5052
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_17
52-
targetCompatibility JavaVersion.VERSION_17
53+
sourceCompatibility project.ext.javaVersion
54+
targetCompatibility project.ext.javaVersion
5355
}
5456

5557
buildFeatures {

‎packages/firebase_analytics/firebase_analytics/example/android/app/build.gradle‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ plugins {
77
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
88
id "dev.flutter.flutter-gradle-plugin"
99
}
10+
apply from: file("../../../../../../gradle/global-config.gradle")
1011

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

3435
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_17
36-
targetCompatibility = JavaVersion.VERSION_17
36+
sourceCompatibility = project.ext.javaVersion
37+
targetCompatibility = project.ext.javaVersion
38+
}
39+
40+
kotlinOptions {
41+
jvmTarget = "17"
3742
}
3843

3944
defaultConfig {

‎packages/firebase_analytics/firebase_analytics/example/android/settings.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version "7.3.0" apply false
21+
id "com.android.application" version "8.2.1" apply false
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration

0 commit comments

Comments
 (0)