Auto-resolve JDK for included builds too.

Fixes #6.
christiandeange · Feb 11, 2024 · 0bfa15c · 0bfa15c
1 parent b1d43dd
commit 0bfa15c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts
@@ -5,6 +5,12 @@ plugins {
   kotlin("jvm") version libs.versions.kotlin
 }
 
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of("11"))
+  }
+}
+
 dependencies {
   implementation(libs.kotlinx.abi)
   implementation(libs.maven.publish)

diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts
@@ -20,4 +20,8 @@ dependencyResolutionManagement {
   }
 }
 
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "build-logic"
diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts
@@ -12,6 +12,12 @@ plugins {
 setProperty("POM_NAME", "AT Protocol for Kotlin Generator")
 setProperty("POM_DESCRIPTION", "Gradle Plugin to generate AT Protocol classes.")
 
+kotlin {
+  jvmToolchain {
+    languageVersion.set(JavaLanguageVersion.of("11"))
+  }
+}
+
 dependencies {
   api(kotlin("gradle-plugin"))
   api(kotlin("serialization"))

diff --git a/generator/settings.gradle.kts b/generator/settings.gradle.kts
@@ -20,6 +20,10 @@ dependencyResolutionManagement {
   }
 }
 
+plugins {
+  id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
 rootProject.name = "generator"
 
 include(":api-gen-runtime")