Use Java 21 and bump min IDEA requirement

ComposeGears · Aug 7, 2024 · 6da6766 · 6da6766
1 parent a6fca73
commit 6da6766
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -28,7 +28,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - uses: gradle/actions/setup-gradle@v4
 

diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
 
       - uses: gradle/actions/setup-gradle@v4
 

diff --git a/idea-plugin/build.gradle.kts b/idea-plugin/build.gradle.kts
@@ -64,7 +64,7 @@ composeCompiler {
 intellijPlatform {
     buildSearchableOptions = false
     pluginConfiguration.ideaVersion {
-        sinceBuild = "241"
+        sinceBuild = "242"
         untilBuild = "242.*"
     }
     signing {
@@ -78,25 +78,18 @@ intellijPlatform {
     publishing.token = providers.environmentVariable("PUBLISH_TOKEN")
 }
 
+java {
+    // IDEA 2024.2 or above requires Java 21.
+    toolchain.languageVersion = JavaLanguageVersion.of(21)
+}
+
 tasks {
-    run {
-        // workaround for https://youtrack.jetbrains.com/issue/IDEA-285839/Classpath-clash-when-using-coroutines-in-an-unbundled-IntelliJ-plugin
-        buildPlugin {
-            exclude { "coroutines" in it.name }
-            archiveFileName = "${rootProject.name}-$version.zip"
-        }
-        prepareSandbox {
-            exclude { "coroutines" in it.name }
-        }
+    // workaround for https://youtrack.jetbrains.com/issue/IDEA-285839/Classpath-clash-when-using-coroutines-in-an-unbundled-IntelliJ-plugin
+    buildPlugin {
+        exclude { "coroutines" in it.name }
+        archiveFileName = "${rootProject.name}-$version.zip"
     }
-    withType<JavaCompile> {
-        sourceCompatibility = "17"
-        targetCompatibility = "17"
-    }
-
-    withType<KotlinCompile> {
-        compilerOptions {
-            jvmTarget = JvmTarget.JVM_17
-        }
+    prepareSandbox {
+        exclude { "coroutines" in it.name }
     }
 }