feat: Upgrade to Java 21, Gradle 8.13, Kotlin 2.1.0

baync180705 · baync180705 · commit 38733b8868f2 · 2025-03-13T02:38:32.000+05:30
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -38,12 +38,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '21'
     }
 
     sourceSets {
@@ -85,5 +85,5 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.7.10'
+    ext.kotlin_version = '2.1.0'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath 'com.android.tools.build:gradle:8.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

Original file line number	Diff line number	Diff line change
`@@ -38,12 +38,12 @@ android {`
`38`	`38`	`ndkVersion flutter.ndkVersion`
`39`	`39`
`40`	`40`	`compileOptions {`
`41`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`42`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`41`	`+ sourceCompatibility JavaVersion.VERSION_21`
	`42`	`+ targetCompatibility JavaVersion.VERSION_21`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`kotlinOptions {`
`46`		`- jvmTarget = '1.8'`
	`46`	`+ jvmTarget = '21'`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`sourceSets {`
`@@ -85,5 +85,5 @@ flutter {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`dependencies {`
`88`		`- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"`
	`88`	`+ implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`buildscript {`
`2`		`- ext.kotlin_version = '1.7.10'`
	`2`	`+ ext.kotlin_version = '2.1.0'`
`3`	`3`	`repositories {`
`4`	`4`	`google()`
`5`	`5`	`mavenCentral()`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:7.3.0'`
	`9`	`+ classpath 'com.android.tools.build:gradle:8.2.1'`
`10`	`10`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`11`	`11`	`}`
`12`	`12`	`}`