Revert jvm toolchain change

FacilityApi · Aug 14, 2023 · f05a0be · f05a0be
1 parent 48fd039
commit f05a0be
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,7 @@
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 import org.jetbrains.grammarkit.tasks.GenerateLexerTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 fun properties(key: String) = project.findProperty(key).toString()
 
@@ -62,11 +63,18 @@ qodana {
     showReport.set(System.getenv("QODANA_SHOW_REPORT").toBoolean())
 }
 
-kotlin {
-    jvmToolchain(properties("javaVersion").toInt())
-}
-
 tasks {
+    // TODO: figure out why gradle jvm toolchains causes issues with GH workflows
+    properties("javaVersion").let {
+        withType<JavaCompile> {
+            sourceCompatibility = it
+            targetCompatibility = it
+        }
+        withType<KotlinCompile> {
+            kotlinOptions.jvmTarget = it
+        }
+    }
+
     wrapper {
         gradleVersion = properties("gradleVersion")
     }