fix: java version for nibel-compiler

open-turo · Aug 18, 2023 · 2dbff20 · 2dbff20
1 parent 09165e9
commit 2dbff20
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/build-tools/conventions/src/main/kotlin/NibelAndroidCommonPlugin.kt b/build-tools/conventions/src/main/kotlin/NibelAndroidCommonPlugin.kt
@@ -2,10 +2,8 @@ import com.turo.nibel.buildtools.CommonExtension
 import com.turo.nibel.buildtools.NibelConventionPlugin
 import com.turo.nibel.buildtools.android
 import com.turo.nibel.buildtools.implementation
-import com.turo.nibel.buildtools.kotlin
 import com.turo.nibel.buildtools.kotlinOptions
 import com.turo.nibel.buildtools.libs
-import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.withType
 
@@ -41,12 +39,6 @@ class NibelAndroidCommonPlugin : NibelConventionPlugin({
         }
     }
 
-    kotlin {
-        jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(NibelMetadata.JAVA_VERSION.toString()))
-        }
-    }
-
     dependencies {
         implementation(platform(libs.bom.kotlin))
     }

diff --git a/build-tools/conventions/src/main/kotlin/NibelKotlinJvmLibraryPlugin.kt b/build-tools/conventions/src/main/kotlin/NibelKotlinJvmLibraryPlugin.kt
@@ -1,8 +1,6 @@
 import com.turo.nibel.buildtools.NibelConventionPlugin
-import com.turo.nibel.buildtools.kotlin
 import com.turo.nibel.buildtools.libs
 import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.jvm.toolchain.JavaLanguageVersion
 import org.gradle.kotlin.dsl.withType
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -21,10 +19,4 @@ class NibelKotlinJvmLibraryPlugin : NibelConventionPlugin({
         targetCompatibility = NibelMetadata.JAVA_VERSION.toString()
         sourceCompatibility = NibelMetadata.JAVA_VERSION.toString()
     }
-
-    kotlin {
-        jvmToolchain {
-            languageVersion.set(JavaLanguageVersion.of(NibelMetadata.JAVA_VERSION.toString()))
-        }
-    }
 })
diff --git a/nibel-compiler/build.gradle.kts b/nibel-compiler/build.gradle.kts
@@ -1,7 +1,6 @@
 plugins {
-    alias(libs.plugins.nibel.metadata)
+    alias(libs.plugins.nibel.kotlin.jvm.library)
     alias(libs.plugins.nibel.maven.publish)
-    alias(libs.plugins.kotlin.jvm)
     alias(libs.plugins.ksp)
     alias(libs.plugins.dokka)
 }