Update toolchain logic

smithy-lang · Dec 9, 2024 · 616d6f8 · 616d6f8
1 parent 608ab4b
commit 616d6f8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,6 +33,7 @@ jobs:
         run: git config --system core.longpaths true
 
       - name: Integration tests
+        if: matrix.java == 17
         run: ./gradlew integ -Plog-tests --stacktrace
 
       - uses: actions/upload-artifact@v4

diff --git a/buildSrc/src/main/kotlin/smithy.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/smithy.java-conventions.gradle.kts
@@ -28,7 +28,8 @@ val licenseSpec = copySpec {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(8)
+        setSourceCompatibility(8)
+        setTargetCompatibility(8)
     }
 }
 

diff --git a/smithy-cli/build.gradle.kts b/smithy-cli/build.gradle.kts
@@ -141,6 +141,7 @@ runtime {
 
     // This is needed to ensure that jlink is available (jlink is Java 9+), we should use the JDK that
     // is configured for the runtime
+    // NOTE: For the runtime task, you *must* have the right JDK set up in your environment (17 at the time of writing)
     javaHome = javaToolchains.launcherFor {
         languageVersion.set(JavaLanguageVersion.of(imageJreVersion))
     }.map { it.metadata.installationPath.asFile.path }