Fix inconsistent JVM-target

nakamuuu · nakamuuu · commit b2b47d8b9c42 · 2025-10-24T13:42:44.000+09:00
diff --git a/library/build.gradle b/library/build.gradle
@@ -28,11 +28,12 @@ android {
         }
     }
     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'
     }
 }
 
diff --git a/opencv/build.gradle b/opencv/build.gradle
@@ -98,7 +98,7 @@ println "OpenCV: " +openCVersionName + " " + project.buildscript.sourceFile
 
 android {
     namespace 'org.opencv'
-    compileSdkVersion 26
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 21
@@ -129,9 +129,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_6
-        targetCompatibility JavaVersion.VERSION_1_6
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     sourceSets {
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -29,12 +29,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '21'
         freeCompilerArgs += [
                 "-Xopt-in=kotlin.RequiresOptIn",
         ]

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,12 @@ android {`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`compileOptions {`
`31`		`- sourceCompatibility JavaVersion.VERSION_1_8`
`32`		`- targetCompatibility JavaVersion.VERSION_1_8`
	`31`	`+ sourceCompatibility JavaVersion.VERSION_21`
	`32`	`+ targetCompatibility JavaVersion.VERSION_21`
`33`	`33`	`}`
	`34`	`+`
`34`	`35`	`kotlinOptions {`
`35`		`- jvmTarget = '1.8'`
	`36`	`+ jvmTarget = '21'`
`36`	`37`	`}`
`37`	`38`	`}`
`38`	`39`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ println "OpenCV: " +openCVersionName + " " + project.buildscript.sourceFile`
`98`	`98`
`99`	`99`	`android {`
`100`	`100`	`namespace 'org.opencv'`
`101`		`- compileSdkVersion 26`
	`101`	`+ compileSdkVersion 30`
`102`	`102`
`103`	`103`	`defaultConfig {`
`104`	`104`	`minSdkVersion 21`
`@@ -129,9 +129,10 @@ android {`
`129`	`129`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'`
`130`	`130`	`}`
`131`	`131`	`}`
	`132`	`+`
`132`	`133`	`compileOptions {`
`133`		`- sourceCompatibility JavaVersion.VERSION_1_6`
`134`		`- targetCompatibility JavaVersion.VERSION_1_6`
	`134`	`+ sourceCompatibility JavaVersion.VERSION_21`
	`135`	`+ targetCompatibility JavaVersion.VERSION_21`
`135`	`136`	`}`
`136`	`137`
`137`	`138`	`sourceSets {`
Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,12 @@ android {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`compileOptions {`
`32`		`- sourceCompatibility JavaVersion.VERSION_11`
`33`		`- targetCompatibility JavaVersion.VERSION_11`
	`32`	`+ sourceCompatibility JavaVersion.VERSION_21`
	`33`	`+ targetCompatibility JavaVersion.VERSION_21`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`kotlinOptions {`
`37`		`- jvmTarget = '1.8'`
	`37`	`+ jvmTarget = '21'`
`38`	`38`	`freeCompilerArgs += [`
`39`	`39`	`"-Xopt-in=kotlin.RequiresOptIn",`
`40`	`40`	`]`