Update IDEA plugin to java 17 (#297)

spotify · Feb 27, 2024 · c562aac · c562aac
1 parent 92f5842
commit c562aac
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         scala: [2.13]
-        java: [corretto@11]
+        java: [corretto@17]
     runs-on: ${{ matrix.os }}
     timeout-minutes: 60
     steps:
@@ -38,17 +38,17 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup Java (corretto@11)
-        id: setup-java-corretto-11
-        if: matrix.java == 'corretto@11'
+      - name: Setup Java (corretto@17)
+        id: setup-java-corretto-17
+        if: matrix.java == 'corretto@17'
         uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 11
+          java-version: 17
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
+        if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Check that workflows are up to date
@@ -79,25 +79,25 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [corretto@11]
+        java: [corretto@17]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout current branch (full)
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Setup Java (corretto@11)
-        id: setup-java-corretto-11
-        if: matrix.java == 'corretto@11'
+      - name: Setup Java (corretto@17)
+        id: setup-java-corretto-17
+        if: matrix.java == 'corretto@17'
         uses: actions/setup-java@v4
         with:
           distribution: corretto
-          java-version: 11
+          java-version: 17
           cache: sbt
 
       - name: sbt update
-        if: matrix.java == 'corretto@11' && steps.setup-java-corretto-11.outputs.cache-hit == 'false'
+        if: matrix.java == 'corretto@17' && steps.setup-java-corretto-17.outputs.cache-hit == 'false'
         run: sbt +update
 
       - name: Download target directories (2.13)

diff --git a/build.sbt b/build.sbt
@@ -25,8 +25,8 @@ lazy val Scalatest = "org.scalatest" %% "scalatest" % "3.2.18"
 ThisBuild / tlBaseVersion := "0.1"
 ThisBuild / scalaVersion := "2.13.12"
 ThisBuild / githubWorkflowTargetBranches := Seq("main")
-ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.corretto("11"))
-ThisBuild / tlJdkRelease := Some(8)
+ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.corretto("17"))
+ThisBuild / tlJdkRelease := Some(17)
 ThisBuild / tlFatalWarnings := true
 ThisBuild / tlCiHeaderCheck := true
 ThisBuild / tlCiScalafmtCheck := true
@@ -50,7 +50,7 @@ ThisBuild / githubWorkflowPublish := Seq(
 // idea settings
 ThisBuild / intellijPluginName := "scio-idea"
 ThisBuild / intellijPlatform := IntelliJPlatform.IdeaCommunity
-ThisBuild / intellijBuild := "232.10072.27"
+ThisBuild / intellijBuild := "2022.3.1" // 1st java 17 version
 
 lazy val scioIdeaPlugin: Project = project
   .in(file("."))
@@ -63,5 +63,14 @@ lazy val scioIdeaPlugin: Project = project
     intellijPlugins += "org.intellij.scala".toPlugin,
     patchPluginXml := pluginXmlOptions { xml =>
       xml.version = version.value
-    }
+      // https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html#platformVersions
+      xml.sinceBuild = "223" // for 2022.3
+    },
+    // verify against latest IntelliJ IDEA Community
+    pluginVerifierOptions := pluginVerifierOptions.value.copy(
+      overrideIDEs = Seq(
+        intellijBaseDirectory.value.toString,
+        "[latest-IC]"
+      )
+    )
   )
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -6,7 +6,7 @@
 
     <description>IntelliJ IDEA plugin for Scio - https://github.com/spotify/scio</description>
 
-    <idea-version since-build="203.0" until-build="232.*" />
+    <idea-version />
 
     <depends>com.intellij.modules.java</depends>
     <depends>org.intellij.scala</depends>