Merge pull request #61 from melix/upgrade/ic-2022.3

Upgrade to 2022.3
melix · Dec 1, 2022 · aef0bad · aef0bad
2 parents 34a4918 + 50001e9
commit aef0bad
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 24 deletions.
diff --git a/.github/workflows/beta_release.yml b/.github/workflows/beta_release.yml
@@ -14,10 +14,11 @@ jobs:
       - name: Set current date as env variable
         run: echo "SNAPSHOT_SUFFIX=$(date +'%Y%m%d%H%M')" >> $GITHUB_ENV
       - uses: actions/checkout@v1
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: eskatos/gradle-command-action@v1
+          java-version: 17
+          distribution: zulu
+      - uses: gradle/gradle-build-action@v2
         with:
-          arguments: publishPlugin -PpublishPluginChannels=beta -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2022.2.3 -PgroovyVersion=3.0.9 -PspockVersion=2.0-groovy-3.0 -PpluginVersion=6.0.0-${{ env.SNAPSHOT_SUFFIX }}
+          arguments: publishPlugin -PpublishPluginChannels=beta -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2022.3 -PgroovyVersion=3.0.9 -PspockVersion=2.0-groovy-3.0 -PpluginVersion=6.0.0-${{ env.SNAPSHOT_SUFFIX }}
diff --git a/.github/workflows/codenarc_releases_watcher.yml b/.github/workflows/codenarc_releases_watcher.yml
@@ -18,11 +18,12 @@ jobs:
       - name: Upgrade CodenarcVersion Number
         run: |
           sed -i 's/codenarcVersion.*/codenarcVersion=${{ steps.xpath.outputs.result }}/' gradle.properties
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: eskatos/gradle-command-action@v1
+          java-version: 17
+          distribution: zulu
+      - uses: gradle/gradle-build-action@v2
         name: Regenerate Inspection Tool Classes
         with:
           arguments: run --stacktrace

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -12,16 +12,16 @@ jobs:
       fail-fast: false # we need to know which version is failing
       matrix:
         version:
-          - "-PideVersion=IC-2022.1 -PgroovyVersion=3.0.9 -PspockVersion=2.0-groovy-3.0"
-          - "-PideVersion=IC-2022.2 -PgroovyVersion=3.0.9 -PspockVersion=2.0-groovy-3.0"
+          - "-PideVersion=IC-2022.3 -PgroovyVersion=3.0.9 -PspockVersion=2.0-groovy-3.0"
     steps:
       - uses: actions/checkout@v1
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
-      - uses: eskatos/gradle-command-action@v1
+          java-version: 17
+          distribution: zulu
+      - uses: gradle/gradle-build-action@v2
         with:
           arguments: test runPluginVerifier ${{ matrix.version }} --stacktrace
       - name: Show Reports

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,11 +14,11 @@ jobs:
       - name: Semantic Version
         id: version
         uses: ncipollo/semantic-version-action@v1
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: zulu
-      - uses: eskatos/gradle-command-action@v1
+      - uses: gradle/gradle-build-action@v2
         with:
-          arguments: publishPlugin -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2022.2.3 -PgroovyVersion=3.0.13 -PspockVersion=2.1-groovy-3.0 -PpluginVersion=${{ steps.version.outputs.tag }}
+          arguments: publishPlugin -PpublishPluginToken=${{ secrets.JB_PLUGINS_TOKEN }} -PideVersion=IC-2022.3 -PgroovyVersion=3.0.13 -PspockVersion=2.1-groovy-3.0 -PpluginVersion=${{ steps.version.outputs.tag }}
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'org.jetbrains.intellij' version '1.9.0'
+    id 'org.jetbrains.intellij' version '1.10.0'
     id 'java'
     id 'idea'
     id 'groovy'
@@ -8,7 +8,7 @@ plugins {
 
 if (!project.hasProperty('publishPluginChannels')) ext.publishPluginChannels = ''
 if (!project.hasProperty('publishPluginToken')) ext.publishPluginToken = '**UNDEFINED**'
-if (!project.hasProperty('ideVersion')) ext.ideVersion = 'IC-2022.2'
+if (!project.hasProperty('ideVersion')) ext.ideVersion = 'IC-2022.3'
 
 wrapper {
     distributionType = Wrapper.DistributionType.ALL
@@ -23,7 +23,7 @@ repositories {
 
 idea {
     project {
-        jdkName = '11'
+        jdkName = '17'
     }
 }
 
@@ -114,7 +114,7 @@ runPluginVerifier {
 
 patchPluginXml {
     version "${pluginVersion}"
-    sinceBuild = '221.6008.13'
+    sinceBuild = '223.7571.182'
     untilBuild = null
     changeNotes = file('changelog.html').text
     pluginDescription = file('description.html').text

diff --git a/changelog.html b/changelog.html
@@ -1,3 +1,8 @@
+<b>Version 6.0.0</b>
+<ul>
+    <li>Fixed compatibility with 2022.3</li>
+    <li>Requires 2022.3 because the Java 17 version bump in the IDE libraries</li>
+</ul>
 <b>Version 5.0.1</b>
 <ul>
     <li>Fixed compatibility with 2022.2.3</li>

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 codenarcVersion=3.1.0
-pluginVersion=6.0.0-SNAPSHOT
+pluginVersion=7.0.0-SNAPSHOT
 groovyVersion=3.0.9
 spockVersion=2.0-groovy-3.0