Properly compile sources for Java 11 bytecode.

christiandeange · Jan 31, 2023 · f81d766 · f81d766
1 parent 5632502
commit f81d766
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -10,6 +10,10 @@ dependencies {
   implementation(libs.maven.publish)
 }
 
+kotlinDslPluginOptions {
+  jvmTarget.set("11")
+}
+
 gradlePlugin {
   plugins {
     create("build-logic") {

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -2,9 +2,9 @@ rootProject.name = "build-logic"
 
 pluginManagement {
   repositories {
-    gradlePluginPortal()
     google()
     mavenCentral()
+    gradlePluginPortal()
   }
 }
 
@@ -19,5 +19,6 @@ dependencyResolutionManagement {
   repositories {
     google()
     mavenCentral()
+    gradlePluginPortal()
   }
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -36,8 +36,8 @@ tasks.test {
   }
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = "11"
+kotlinDslPluginOptions {
+  jvmTarget.set("11")
 }
 
 kotlin {
@@ -48,6 +48,4 @@ kotlin {
       }
     }
   }
-
-  jvmToolchain(11)
 }
diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -16,8 +16,8 @@ dependencies {
   implementation(libs.agp.api)
 }
 
-tasks.withType<KotlinCompile> {
-  kotlinOptions.jvmTarget = "11"
+kotlinDslPluginOptions {
+  jvmTarget.set("11")
 }
 
 kotlin {
@@ -28,8 +28,6 @@ kotlin {
       }
     }
   }
-
-  jvmToolchain(11)
 }
 
 gradlePlugin {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -2,9 +2,9 @@ rootProject.name = "aaraar"
 
 pluginManagement {
   repositories {
-    gradlePluginPortal()
     google()
     mavenCentral()
+    gradlePluginPortal()
   }
 }
 
@@ -13,6 +13,7 @@ dependencyResolutionManagement {
   repositories {
     google()
     mavenCentral()
+    gradlePluginPortal()
   }
 }