build: added IJ-2022.3, build on jdk 17 & gradle 7.6, bumped intellij…

…-gradle 1.10.1 (#63)
redhat-developer · Dec 14, 2022 · 776b20f · 776b20f
1 parent 690f872
commit 776b20f
Show file tree

Hide file tree

Showing 8 changed files with 216 additions and 133 deletions.
diff --git a/.github/workflows/IJ.yml b/.github/workflows/IJ.yml
@@ -14,33 +14,51 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        IJ: [IC-2019.3, IC-2020.1, IC-2020.2, IC-2020.3, IC-2021.1, IC-2021.2, IC-2021.3, IC-2022.1, IC-2022.2]
+        include:
+          - IJ: IC-2020.3
+            jvm: 11
+          - IJ: IC-2021.1
+            jvm: 17
+          - IJ: IC-2021.2
+            jvm: 17
+          - IJ: IC-2021.3
+            jvm: 17
+          - IJ: IC-2022.1
+            jvm: 17
+          - IJ: IC-2022.2
+            jvm: 17
+          - IJ: IC-2022.3
+            jvm: 17
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 11
-    - name: Grant execute permission for gradlew
-      run: chmod +x gradlew
-    - name: Build with Gradle
-      run: ./gradlew build -PideaVersion=${{ matrix.IJ }}
+      - uses: actions/checkout@v2
+      - name: Set up JDK ${{ matrix.jvm }}
+        uses: actions/setup-java@v3
+        with:
+          java-version: ${{ matrix.jvm }}
+          distribution: 'temurin'
+          cache: 'gradle'
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Gradle
+        run: ./gradlew build -PideaVersion=${{ matrix.IJ }}
 
   verify:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'temurin'
+          cache: 'gradle'
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
-        run: ./gradlew runPluginVerifier -PideaVersion=IC-2022.1
+        run: ./gradlew runPluginVerifier -PideaVersion=IC-2022.3
       - name: Upload report
         uses: actions/upload-artifact@v2
         if: always()

diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,9 @@ dependencies {
             'com.segment.analytics.java:analytics:2.1.1',
             'com.squareup.okhttp3:okhttp:4.9.3'
     )
-    testImplementation('org.junit.jupiter:junit-jupiter-api:5.8.2',
+    testImplementation(
+            "org.junit.jupiter:junit-jupiter:5.9.1",
+            "org.junit.platform:junit-platform-launcher:1.9.1",
             "org.assertj:assertj-core:3.22.0",
             "org.mockito:mockito-inline:4.5.1"
     )
@@ -60,8 +62,8 @@ configurations {
         exclude group: 'org.slf4j', module: 'slf4j-api'
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility = 11
+        targetCompatibility = 11
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,9 @@
-ideaVersion = IC-2019.3
+ideaVersion = IC-2020.3
 # build number ranges
 # https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
-sinceIdeaBuild=193.5233.102
+sinceIdeaBuild=203
 projectVersion=0.0.4-SNAPSHOT
-intellijPluginVersion=1.6.0
+intellijPluginVersion=1.10.1
 jetBrainsToken=invalid
 jetBrainsChannel=stable
 nexusUser=invalid

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists