Merge pull request #54 from bentemple/support_intelli-j_2022.1

Update to support latest version of Intelli-J 2022.1
DeveloperUtils · Jul 20, 2022 · af08f20 · af08f20
2 parents 5c5ce5a + 5f54733
commit af08f20
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,15 +35,15 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
 
       # Validate wrapper
       - name: Gradle Wrapper Validation
         uses: gradle/[email protected]
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 11
@@ -76,7 +76,7 @@ jobs:
       # Collect Tests Result of failed tests
       - name: Collect Tests Result
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: tests-result
           path: ${{ github.workspace }}/build/reports/tests
@@ -102,11 +102,11 @@ jobs:
 
       # Run Qodana inspections
       - name: Qodana - Code Inspection
-        uses: JetBrains/qodana-action@v2.1-eap
+        uses: JetBrains/qodana-action@v5.1.0
 
       # Collect Qodana Result
       - name: Collect Qodana Result
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: qodana-result
           path: ${{ github.workspace }}/qodana
@@ -136,6 +136,8 @@ jobs:
     if: github.event_name != 'pull_request'
     needs: build
     runs-on: ubuntu-latest
+    permissions:
+        contents: write
     steps:
 
       # Check out current repository

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,17 +12,20 @@ jobs:
   release:
     name: Publish Plugin
     runs-on: ubuntu-latest
+    permissions:
+        contents: write
+        pull-requests: write
     steps:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.release.tag_name }}
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 11

diff --git a/.github/workflows/run-ui-tests.yml b/.github/workflows/run-ui-tests.yml
@@ -33,11 +33,11 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@v2.4.0
+        uses: actions/checkout@v3
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: zulu
           java-version: 11

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,18 @@
 # Kotlin Function Arguments Helper Changelog
 
 ## [Unreleased]
+### Changed
+- imported changes from yet unsubmitted PR [IntelliJ Platform Plugin Template#Next](https://github.com/JetBrains/intellij-platform-plugin-template/pull/240/files) 
+- upgraded
+  - Update `platformVersion` to `2021.2.4`
+  - Change since/until build to `212-221.*` (2021.2 - 2022.1)
+  - Dependencies - upgrade `org.jetbrains.intellij` to `1.6.0`
+  - Dependencies - upgrade `org.jetbrains.kotlin.jvm` to `1.6.21`
+  - Dependencies (GitHub Actions) - upgrade `actions/checkout` to `3`
+  - Dependencies (GitHub Actions) - upgrade `actions/cache` to `3`
+  - Dependencies (GitHub Actions) - upgrade `actions/setup-java` to `3`
+  - Dependencies (GitHub Actions) - upgrade `actions/upload-artifact` to `3`
+  - Dependencies (GitHub Actions) - upgrade `JetBrains/qodana-action` to `5.1.0`
 
 ## [2021.3.0]
 ### Added

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.6.0"
+    id("org.jetbrains.kotlin.jvm") version "1.6.10"
     // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.3.0"
+    id("org.jetbrains.intellij") version "1.4.0"
     // Gradle Changelog Plugin
     id("org.jetbrains.changelog") version "1.3.1"
     // Gradle Qodana Plugin

diff --git a/gradle.properties b/gradle.properties
@@ -4,19 +4,19 @@
 pluginGroup = com.github.developerutils.kotlin-function-arguments-helper
 pluginName = Kotlin Function Arguments Helper
 # SemVer format -> https://semver.org
-pluginVersion = 2021.3.0
+pluginVersion = 2022.1.0
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
-pluginSinceBuild = 203
-pluginUntilBuild = 213.*
+pluginSinceBuild = 212
+pluginUntilBuild = 221.*
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions
-pluginVerifierIdeVersions = IC-2020.3.4, IC-2021.3
+pluginVerifierIdeVersions = IC-2021.2.4
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IC
-platformVersion = 2020.3.4
+platformVersion = 2021.2.4
 platformDownloadSources = true
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
@@ -27,7 +27,7 @@ platformPlugins = com.intellij.java, org.jetbrains.kotlin
 javaVersion = 11
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.3
+gradleVersion = 7.4.2
 
 # Opt-out flag for bundling Kotlin standard library.
 # See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.