Skip to content

Commit

Permalink
Bump java version from 11 to 17 (#287)
Browse files Browse the repository at this point in the history
  • Loading branch information
thepieterdc authored Apr 20, 2024
1 parent 5816855 commit bd4bd6a
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 43 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: true
matrix:
java: [11.x.x, 17.x.x, 20.x.x]
java: [17.x.x, 21.x.x]
os: [ubuntu-latest]

steps:
Expand All @@ -30,13 +30,11 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
cache: 'gradle'
cache-dependency-path: |
./.gradle*
./**/gradle-wrapper.properties
java-version: ${{ matrix.java}}
- uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Build the plugin using Gradle
run: ./gradlew buildPlugin
- name: Run the tests
Expand Down
14 changes: 6 additions & 8 deletions .github/workflows/compatibility.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,13 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11.x.x
- uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-
cache: 'gradle'
cache-dependency-path: |
./.gradle*
./**/gradle-wrapper.properties
java-version: 17.x.x
- name: Cache verifier IDEs
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.pluginVerifier/ides
key: ${{ runner.os }}-plugin-verifier
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11.x.x
- name: Cache the dependencies
uses: actions/cache@v3
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-
cache: 'gradle'
cache-dependency-path: |
./.gradle*
./**/gradle-wrapper.properties
java-version: 17.x.x
- name: Append the current time to the snapshot version
run: sed -i "s/^\(version.*-SNAPSHOT\)/\1-$(date +%s)/" build.gradle
- name: Publish the snapshot
Expand Down
23 changes: 10 additions & 13 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,19 @@ jobs:
run: |
git checkout -b release
git push -u origin release
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'zulu'
java-version: 11
- name: Configure git
run: |
git config user.email "[email protected]"
git config user.name "GitHub Actions"
- name: Cache the dependencies
uses: actions/cache@v3
- name: Setup Java
uses: actions/setup-java@v4
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
restore-keys: |
${{ runner.os }}-gradle-
distribution: 'zulu'
cache: 'gradle'
cache-dependency-path: |
./.gradle*
./**/gradle-wrapper.properties
java-version: 17.x.x
- name: Get the release version
id: version
run: |
Expand All @@ -45,7 +42,7 @@ jobs:
- name: Build the package
run: ./gradlew buildPlugin
- name: Make the release commit
uses: EndBug/[email protected].3
uses: EndBug/[email protected].4
with:
add: 'build.gradle'
commit: '--signoff'
Expand Down Expand Up @@ -86,7 +83,7 @@ jobs:
sed -i "/<\/\?ul>/d" build.gradle
sed -i "/<li>/d" build.gradle
- name: Make the next development commit
uses: EndBug/[email protected].3
uses: EndBug/[email protected].4
with:
add: 'build.gradle'
commit: '--signoff'
Expand Down
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ group 'io.github.thepieterdc.dodona'
version '2.1.11-SNAPSHOT'

java {
sourceCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
}

repositories {
Expand Down Expand Up @@ -69,7 +69,7 @@ prepareKotlinBuildScriptModel.dependsOn generateBuildConfig

static def getVerifiableVersions() {
// FIXME: Re-enable PyCharm checks.
def versions = ["IC-211.7628.21", /*"PC-203.6682.168" */]
def versions = ["IC-222.4554.10", /*"PC-203.6682.168" */]

// Get the list of all versions.
def versionUrl = new URL("https://data.services.jetbrains.com/products?code=IIC%2CPCC&fields=code%2Creleases.build%2Creleases.type")
Expand All @@ -87,9 +87,9 @@ static def getVerifiableVersions() {
intellij {
downloadSources.set(false)
pluginName.set('dodona')
plugins.set(['java', 'PythonCore:221.6008.17'])
plugins.set(['java', 'PythonCore:222.4459.24'])
updateSinceUntilBuild.set(false)
version.set('221.6008.13')
version.set('222.4554.10')
}

jacocoTestReport {
Expand All @@ -107,7 +107,7 @@ patchPluginXml {

pluginDescription = 'Companion plugin for the Ghent University Dodona platform, which allows you to submit exercises right from your favourite JetBrains IDE. More information can be found at <a href="https://docs.dodona.be/en/guides/pycharm-plugin/">https://docs.dodona.be/en/guides/pycharm-plugin/</a>'

sinceBuild = '221.6008.13'
sinceBuild = '222.4554.10'
}

publishPlugin {
Expand All @@ -121,5 +121,5 @@ runPluginVerifier {
}

wrapper {
gradleVersion = '8.2.1'
gradleVersion = '8.7.0'
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down

0 comments on commit bd4bd6a

Please sign in to comment.