android: bump kotlin to 2.1.0, change Java compatibility version to 1.8

Harry-Chen · Harry-Chen · commit d6c8eb728c8a · 2024-12-21T14:15:48.000+08:00
Signed-off-by: Harry Chen &lt;i@harrychen.xyz&gt;
diff --git a/android/build.gradle b/android/build.gradle
@@ -18,15 +18,15 @@ android {
         namespace 'im.nfc.ccid'
     }
 
-    compileSdk 34
+    compileSdk 35
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     sourceSets {
@@ -36,5 +36,6 @@ android {
 
     defaultConfig {
         minSdkVersion 26
+        targetSdk flutter.targetSdkVersion
     }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 AGPVersion=8.7.3
-KotlinVersion=1.9.23
+KotlinVersion=2.1.0
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -27,12 +27,12 @@ android {
     compileSdk flutter.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     sourceSets {
@@ -42,8 +42,7 @@ android {
     defaultConfig {
         applicationId "im.nfc.ccid.example"
         minSdkVersion 26
-        targetSdkVersion 34
-        compileSdkVersion 34
+        targetSdk flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
     }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -2,4 +2,4 @@ org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
 AGPVersion=8.7.3
-KotlinVersion=1.9.23
+KotlinVersion=2.1.0

Original file line number	Diff line number	Diff line change
`@@ -18,15 +18,15 @@ android {`
`18`	`18`	`namespace 'im.nfc.ccid'`
`19`	`19`	`}`
`20`	`20`
`21`		`- compileSdk 34`
	`21`	`+ compileSdk 35`
`22`	`22`
`23`	`23`	`compileOptions {`
`24`		`- sourceCompatibility JavaVersion.VERSION_17`
`25`		`- targetCompatibility JavaVersion.VERSION_17`
	`24`	`+ sourceCompatibility JavaVersion.VERSION_1_8`
	`25`	`+ targetCompatibility JavaVersion.VERSION_1_8`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`kotlinOptions {`
`29`		`- jvmTarget = '17'`
	`29`	`+ jvmTarget = JavaVersion.VERSION_1_8`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`sourceSets {`
`@@ -36,5 +36,6 @@ android {`
`36`	`36`
`37`	`37`	`defaultConfig {`
`38`	`38`	`minSdkVersion 26`
	`39`	`+ targetSdk flutter.targetSdkVersion`
`39`	`40`	`}`
`40`	`41`	`}`