Merge pull request #26 from RedMadRobot/feature/update-jvm-version

AleksandrTabolin · web-flow · commit f2527079f198 · 2024-09-02T13:55:10.000+03:00
update JavaVersion to VERSION_11
diff --git a/panel-common/build.gradle.kts b/panel-common/build.gradle.kts
@@ -28,15 +28,16 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs += "-Xexplicit-api=strict"
     }
 
+
     buildFeatures {
         viewBinding = true
     }
diff --git a/panel-core/build.gradle.kts b/panel-core/build.gradle.kts
@@ -28,12 +28,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")
     }
 
diff --git a/panel-no-op/build.gradle.kts b/panel-no-op/build.gradle.kts
@@ -27,12 +27,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     namespace = "com.redmadrobot.debug.noop"
diff --git a/plugins/plugin-accounts/build.gradle.kts b/plugins/plugin-accounts/build.gradle.kts
@@ -28,12 +28,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     kapt {
diff --git a/plugins/plugin-app-settings/build.gradle.kts b/plugins/plugin-app-settings/build.gradle.kts
@@ -28,12 +28,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     buildFeatures {
diff --git a/plugins/plugin-flipper/build.gradle.kts b/plugins/plugin-flipper/build.gradle.kts
@@ -28,12 +28,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs += "-Xexplicit-api=strict"
     }
 
diff --git a/plugins/plugin-konfeature/build.gradle.kts b/plugins/plugin-konfeature/build.gradle.kts
@@ -28,12 +28,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs += "-Xexplicit-api=strict"
     }
 
diff --git a/plugins/plugin-servers/build.gradle.kts b/plugins/plugin-servers/build.gradle.kts
@@ -28,12 +28,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     buildFeatures {
diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -13,12 +13,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = JavaVersion.VERSION_11.toString()
     }
 
     buildFeatures {

Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,16 @@ android {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`compileOptions {`
`31`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`32`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`31`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`32`	`+ targetCompatibility = JavaVersion.VERSION_11`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`kotlinOptions {`
`36`		`- jvmTarget = "1.8"`
	`36`	`+ jvmTarget = JavaVersion.VERSION_11.toString()`
`37`	`37`	`freeCompilerArgs += "-Xexplicit-api=strict"`
`38`	`38`	`}`
`39`	`39`
	`40`	`+`
`40`	`41`	`buildFeatures {`
`41`	`42`	`viewBinding = true`
`42`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,12 +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_11`
	`32`	`+ targetCompatibility = JavaVersion.VERSION_11`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`kotlinOptions {`
`36`		`- jvmTarget = "1.8"`
	`36`	`+ jvmTarget = JavaVersion.VERSION_11.toString()`
`37`	`37`	`freeCompilerArgs += listOf("-opt-in=kotlin.RequiresOptIn")`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,12 @@ android {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`compileOptions {`
`30`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`31`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`30`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`31`	`+ targetCompatibility = JavaVersion.VERSION_11`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`kotlinOptions {`
`35`		`- jvmTarget = "1.8"`
	`35`	`+ jvmTarget = JavaVersion.VERSION_11.toString()`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`namespace = "com.redmadrobot.debug.noop"`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ android {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`compileOptions {`
`16`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`17`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`16`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`17`	`+ targetCompatibility = JavaVersion.VERSION_11`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`kotlinOptions {`
`21`		`- jvmTarget = "1.8"`
	`21`	`+ jvmTarget = JavaVersion.VERSION_11.toString()`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`buildFeatures {`