Skip to content

Commit

Permalink
build: added IJ-2022.3, bumped base to IC-2021.1, jdk 17, gradle 7.6,…
Browse files Browse the repository at this point in the history
… intellij-gradle 1.10.1 (#63)
  • Loading branch information
adietish committed Dec 12, 2022
1 parent 690f872 commit 60ad845
Show file tree
Hide file tree
Showing 8 changed files with 202 additions and 133 deletions.
32 changes: 18 additions & 14 deletions .github/workflows/IJ.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,37 @@ 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]
IJ: [IC-2021.1, IC-2021.2, IC-2021.3, IC-2022.1, IC-2022.2, IC-2022.3]

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 17
uses: actions/setup-java@v3
with:
java-version: 17
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()
Expand Down
8 changes: 5 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand All @@ -60,8 +62,8 @@ configurations {
exclude group: 'org.slf4j', module: 'slf4j-api'
}
compileOptions {
sourceCompatibility = 1.8
targetCompatibility = 1.8
sourceCompatibility = 11
targetCompatibility = 11
}
}

Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
ideaVersion = IC-2019.3
ideaVersion = IC-2021.1
# build number ranges
# https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html
sinceIdeaBuild=193.5233.102
sinceIdeaBuild=211
projectVersion=0.0.4-SNAPSHOT
intellijPluginVersion=1.6.0
intellijPluginVersion=1.10.1
jetBrainsToken=invalid
jetBrainsChannel=stable
nexusUser=invalid
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 60ad845

Please sign in to comment.