Skip to content

Commit 2d3c27d

Browse files
author
Max Philip Stachon
committed
attempt update to java 21 and gradle 8.5 (wip)
1 parent 2e60102 commit 2d3c27d

4 files changed

Lines changed: 27 additions & 6 deletions

File tree

.github/workflows/deploy_snapshot.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
types: [ trigger_after_upstream_deploy ]
1616

1717
env:
18-
GRADLE_VERSION: 7.6 # Gradle version used
18+
GRADLE_VERSION: 8.5 # Gradle version used
1919
GRADLE_CLI_OPTS: "-Pci --build-cache --refresh-dependencies " # CLI options passed to Gradle
2020
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"
2121

@@ -29,6 +29,11 @@ jobs:
2929
steps:
3030
- name: Checkout project sources
3131
uses: actions/checkout@v4
32+
- name: Setup Java
33+
uses: actions/setup-java@v4
34+
with:
35+
distribution: 'temurin'
36+
java-version: 21
3237
- name: Setup Gradle
3338
uses: gradle/actions/setup-gradle@v4
3439
with:
@@ -45,6 +50,11 @@ jobs:
4550
steps:
4651
- name: Checkout project sources
4752
uses: actions/checkout@v4
53+
- name: Setup Java
54+
uses: actions/setup-java@v4
55+
with:
56+
distribution: 'temurin'
57+
java-version: 21
4858
- name: Setup Gradle
4959
uses: gradle/actions/setup-gradle@v4
5060
with:

.github/workflows/test_branch.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ on:
1212
branches-ignore: [ "dev" ] # Do not run this on the default branch
1313

1414
env:
15-
GRADLE_VERSION: 7.6 # Gradle version used
15+
GRADLE_VERSION: 8.5 # Gradle version used
1616
GRADLE_CLI_OPTS: "-Pci --build-cache --refresh-dependencies " # CLI options passed to Gradle
1717
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"
1818

@@ -26,6 +26,11 @@ jobs:
2626
steps:
2727
- name: Checkout project sources
2828
uses: actions/checkout@v4
29+
- name: Setup Java
30+
uses: actions/setup-java@v4
31+
with:
32+
distribution: 'temurin'
33+
java-version: 21
2934
- name: Setup Gradle
3035
uses: gradle/actions/setup-gradle@v4
3136
with:

WorkflowCLI/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "java-library"
3-
id "com.github.johnrengelman.shadow" version "7.1.2"
3+
id 'com.gradleup.shadow' version "8.3.9"
44
id "jacoco"
55
id "de.se_rwth.codestyle" version "$mc_version"
66
}

build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent
44

55

66
plugins {
7+
id 'java'
78
id "maven-publish"
8-
id "io.github.themrmilchmann.ecj" version "0.2.0" apply false
9+
id "io.github.themrmilchmann.ecj" version "0.2.0"
910
id "de.se_rwth.codestyle" version "$mc_version"
1011
}
1112

13+
ecj {
14+
compilerVersion = "3.43.0"
15+
}
16+
17+
1218
description = "BPMN-DSL"
1319

1420
allprojects {
@@ -67,8 +73,8 @@ subprojects {
6773

6874
tasks.withType(JavaCompile).tap {
6975
configureEach {
70-
sourceCompatibility = JavaVersion.VERSION_11
71-
targetCompatibility = JavaVersion.VERSION_11
76+
sourceCompatibility = JavaVersion.VERSION_21
77+
targetCompatibility = JavaVersion.VERSION_21
7278
options.encoding = "UTF-8"
7379
options.deprecation false
7480
options.warnings = false

0 commit comments

Comments
 (0)