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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 3 additions & 3 deletions
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 {

0 commit comments

Comments
 (0)