Skip to content

Commit 89d1aa3

Browse files
MichaelVerdonMichaelVerdon
authored
chore(deps): Update Java Versions from 8 to 17 and Kotlin (#17269)
* chore(deps): Update from java 8 to java 11 * chore(deps): Change compile target * chore(deps): bump kotlin version * chore(deps): try downgrade 17 -> 11 java version on CI * chore(deps): bump java version to 17 to match CI * chore(deps): bump to java 17 * chore(deps): last file to bump to Java 17
1 parent a13deae commit 89d1aa3

File tree

54 files changed

+110
-109
lines changed

Some content is hidden

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

54 files changed

+110
-109
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040
namespace 'io.flutter.plugins.firebase.firestore'
4141
}
4242

43-
compileSdk 34
43+
compileSdk 35
4444

4545
defaultConfig {
4646
minSdk 21
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4848
}
4949

5050
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_1_8
52-
targetCompatibility JavaVersion.VERSION_1_8
51+
sourceCompatibility JavaVersion.VERSION_17
52+
targetCompatibility JavaVersion.VERSION_17
5353
}
5454

5555
buildFeatures {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
ndkVersion = flutter.ndkVersion
3333

3434
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_1_8
36-
targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
3737
}
3838

3939
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040
namespace 'io.flutter.plugins.firebase.functions'
4141
}
4242

43-
compileSdk 34
43+
compileSdk 35
4444

4545
defaultConfig {
4646
minSdk 21
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4848
}
4949

5050
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_1_8
52-
targetCompatibility JavaVersion.VERSION_1_8
51+
sourceCompatibility JavaVersion.VERSION_17
52+
targetCompatibility JavaVersion.VERSION_17
5353
}
5454
buildFeatures {
5555
buildConfig = true

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
ndkVersion = flutter.ndkVersion
3333

3434
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_1_8
36-
targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
3737
}
3838

3939
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040
namespace 'io.flutter.plugins.firebase.analytics'
4141
}
4242

43-
compileSdk 34
43+
compileSdk 35
4444

4545
defaultConfig {
4646
minSdk 21
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4848
}
4949

5050
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_1_8
52-
targetCompatibility JavaVersion.VERSION_1_8
51+
sourceCompatibility JavaVersion.VERSION_17
52+
targetCompatibility JavaVersion.VERSION_17
5353
}
5454

5555
buildFeatures {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
ndkVersion = flutter.ndkVersion
3333

3434
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_1_8
36-
targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
3737
}
3838

3939
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

‎packages/firebase_app_check/firebase_app_check/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040
namespace 'io.flutter.plugins.firebase.appcheck'
4141
}
4242

43-
compileSdk 34
43+
compileSdk 35
4444

4545
defaultConfig {
4646
minSdk 21
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4848
}
4949

5050
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_1_8
52-
targetCompatibility JavaVersion.VERSION_1_8
51+
sourceCompatibility JavaVersion.VERSION_17
52+
targetCompatibility JavaVersion.VERSION_17
5353
}
5454

5555
buildFeatures {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
ndkVersion = flutter.ndkVersion
3333

3434
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_1_8
36-
targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
3737
}
3838

3939
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

‎packages/firebase_app_installations/firebase_app_installations/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ android {
4040
namespace 'io.flutter.plugins.firebase.installations.firebase_app_installations'
4141
}
4242

43-
compileSdk 34
43+
compileSdk 35
4444

4545
defaultConfig {
4646
minSdk 21
4747
}
4848

4949
compileOptions {
50-
sourceCompatibility JavaVersion.VERSION_1_8
51-
targetCompatibility JavaVersion.VERSION_1_8
50+
sourceCompatibility JavaVersion.VERSION_17
51+
targetCompatibility JavaVersion.VERSION_17
5252
}
5353

5454
buildFeatures {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
ndkVersion = flutter.ndkVersion
3333

3434
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_1_8
36-
targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
3737
}
3838

3939
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

‎packages/firebase_auth/firebase_auth/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ android {
4040
namespace 'io.flutter.plugins.firebase.auth'
4141
}
4242

43-
compileSdk 34
43+
compileSdk 35
4444

4545
defaultConfig {
4646
minSdk 23
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4848
}
4949
compileOptions {
50-
sourceCompatibility JavaVersion.VERSION_1_8
51-
targetCompatibility JavaVersion.VERSION_1_8
50+
sourceCompatibility JavaVersion.VERSION_17
51+
targetCompatibility JavaVersion.VERSION_17
5252
}
5353

5454
buildFeatures {

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ android {
3131
compileSdk = flutter.compileSdkVersion
3232
ndkVersion = flutter.ndkVersion
3333
compileOptions {
34-
sourceCompatibility = JavaVersion.VERSION_1_8
35-
targetCompatibility = JavaVersion.VERSION_1_8
34+
sourceCompatibility = JavaVersion.VERSION_17
35+
targetCompatibility = JavaVersion.VERSION_17
3636
}
3737
kotlinOptions {
38-
jvmTarget = JavaVersion.VERSION_1_8
38+
jvmTarget = JavaVersion.VERSION_17
3939
}
4040

4141
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.9.0" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

‎packages/firebase_core/firebase_core/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ android {
2626
namespace 'io.flutter.plugins.firebase.core'
2727
}
2828

29-
compileSdk 34
29+
compileSdk 35
3030

3131
defaultConfig {
3232
minSdk 21
3333
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3434
}
3535

3636
compileOptions {
37-
sourceCompatibility JavaVersion.VERSION_1_8
38-
targetCompatibility JavaVersion.VERSION_1_8
37+
sourceCompatibility JavaVersion.VERSION_17
38+
targetCompatibility JavaVersion.VERSION_17
3939
}
4040

4141
buildFeatures {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
ndkVersion = flutter.ndkVersion
3333

3434
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_1_8
36-
targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
3737
}
3838

3939
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

‎packages/firebase_crashlytics/firebase_crashlytics/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ android {
3939
namespace 'io.flutter.plugins.firebase.crashlytics'
4040
}
4141

42-
compileSdk 34
42+
compileSdk 35
4343

4444
defaultConfig {
4545
minSdk 21
4646
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4747
}
4848

4949
compileOptions {
50-
sourceCompatibility JavaVersion.VERSION_1_8
51-
targetCompatibility JavaVersion.VERSION_1_8
50+
sourceCompatibility JavaVersion.VERSION_17
51+
targetCompatibility JavaVersion.VERSION_17
5252
}
5353

5454
buildFeatures {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ android {
3333
ndkVersion = flutter.ndkVersion
3434

3535
compileOptions {
36-
sourceCompatibility = JavaVersion.VERSION_1_8
37-
targetCompatibility = JavaVersion.VERSION_1_8
36+
sourceCompatibility = JavaVersion.VERSION_17
37+
targetCompatibility = JavaVersion.VERSION_17
3838
}
3939

4040
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ plugins {
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
id "com.google.firebase.crashlytics" version "2.8.1" apply false
2525
// END: FlutterFire Configuration
26-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
26+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2727
}
2828

2929
include ":app"

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
ndkVersion = flutter.ndkVersion
3030

3131
compileOptions {
32-
sourceCompatibility = JavaVersion.VERSION_1_8
33-
targetCompatibility = JavaVersion.VERSION_1_8
32+
sourceCompatibility = JavaVersion.VERSION_17
33+
targetCompatibility = JavaVersion.VERSION_17
3434
}
3535

3636
defaultConfig {

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ pluginManagement {
1818

1919
plugins {
2020
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
21-
id "com.android.application" version '8.7.0' apply false
22-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
21+
22+
id "com.android.application" version "8.1.0" apply false
23+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2324
}
2425

2526
include ":app"

‎packages/firebase_database/firebase_database/android/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ android {
4040
namespace 'io.flutter.plugins.firebase.database'
4141
}
4242

43-
compileSdk 34
43+
compileSdk 35
4444

4545
defaultConfig {
4646
minSdk 21
4747
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4848
}
4949

5050
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_1_8
52-
targetCompatibility JavaVersion.VERSION_1_8
51+
sourceCompatibility JavaVersion.VERSION_17
52+
targetCompatibility JavaVersion.VERSION_17
5353
}
5454

5555
buildFeatures {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ android {
3232
ndkVersion = flutter.ndkVersion
3333

3434
compileOptions {
35-
sourceCompatibility = JavaVersion.VERSION_1_8
36-
targetCompatibility = JavaVersion.VERSION_1_8
35+
sourceCompatibility = JavaVersion.VERSION_17
36+
targetCompatibility = JavaVersion.VERSION_17
3737
}
3838

3939
defaultConfig {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
// START: FlutterFire Configuration
2323
id "com.google.gms.google-services" version "4.3.15" apply false
2424
// END: FlutterFire Configuration
25-
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
25+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
2626
}
2727

2828
include ":app"

0 commit comments

Comments
 (0)