Fix the actual gradle plugin (#64)

ZacSweers · Oct 15, 2021 · 9ec63d7 · 9ec63d7
1 parent f4d13cb
commit 9ec63d7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/redacted-compiler-plugin-gradle/build.gradle b/redacted-compiler-plugin-gradle/build.gradle
@@ -5,6 +5,16 @@ plugins {
     id("com.vanniktech.maven.publish") version "0.18.0"
 }
 
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.release.set(8)
+}
+
 //region Version.kt template for setting the project version in the build
 sourceSets {
     main.java.srcDirs += "$buildDir/generated/sources/version-templates/kotlin/main"
@@ -21,6 +31,9 @@ TaskProvider copyVersionTemplatesProvider = tasks.register("copyVersionTemplates
 
 compileKotlin {
     dependsOn copyVersionTemplatesProvider
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
 }
 
 gradlePlugin {

diff --git a/redacted-compiler-plugin/build.gradle b/redacted-compiler-plugin/build.gradle
@@ -5,20 +5,9 @@ plugins {
   id("com.google.devtools.ksp")
 }
 
-java {
-  toolchain {
-    languageVersion.set(JavaLanguageVersion.of(17))
-  }
-}
-
-tasks.withType(JavaCompile).configureEach {
-  options.release.set(8)
-}
-
 compileKotlin {
   kotlinOptions {
     freeCompilerArgs += "-Xopt-in=kotlin.RequiresOptIn"
-    jvmTarget = "1.8"
   }
 }