Skip to content

Update to Java 21 and Gradle 8 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jra-se merged 1 commit into from
Mar 13, 2026
Merged

Update to Java 21 and Gradle 8 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion .github/workflows/deploy_snapshot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ on:
types: [ trigger_after_upstream_deploy ]

env:
GRADLE_VERSION: 7.4 # Gradle version used
GRADLE_VERSION: 8.14.4 # Gradle version used
JAVA_VERSION: 21
GRADLE_CLI_OPTS: "-Pci --build-cache" # CLI options passed to Gradle
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"

Expand All @@ -29,6 +30,11 @@ jobs:
steps:
- name: Checkout project sources
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{env.JAVA_VERSION}}
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
with:
Expand All @@ -45,6 +51,11 @@ jobs:
steps:
- name: Checkout project sources
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{env.JAVA_VERSION}}
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
with:
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/test_branch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ on:
branches-ignore: [ "dev" ] # Do not run this on the default branch

env:
GRADLE_VERSION: 7.4 # Gradle version used
GRADLE_VERSION: 8.14.4 # Gradle version used
JAVA_VERSION: 21 # Java version used
GRADLE_CLI_OPTS: "-Pci --build-cache" # CLI options passed to Gradle
GRADLE_BUILD_ACTION_CACHE_KEY_JOB: "test-cache-${{ github.head_ref }}.${{ github.sha }}"

Expand All @@ -26,6 +27,11 @@ jobs:
steps:
- name: Checkout project sources
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{env.JAVA_VERSION}}
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ subprojects {

java {
toolchain {
languageVersion = JavaLanguageVersion.of(11)
languageVersion = JavaLanguageVersion.of(21)
}

withJavadocJar()
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ version=7.9.0-SNAPSHOT
# dependency versions
mc_version=7.9.0-SNAPSHOT
emf_version=2.15.0
shadow_plugin_version=7.1.2
shadow_plugin_version=8.3.9
guava_version=31.1-jre
junit_version=5.10.3
junit_version=6.0.3
google_java_format_version=0.9
spoon_core_version=10.2.0
spoon_core_version=11.3.0
commons_lang3_version=3.9
3 changes: 2 additions & 1 deletion javaDSL-emf/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ dependencies {

testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_version"
}
3 changes: 2 additions & 1 deletion javaDSL/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ dependencies {

testImplementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_version"

corpus(corpusLibs.guava)
corpus(corpusLibs.monticore.runtime)
Expand Down
5 changes: 3 additions & 2 deletions ref-code-adaptation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id 'maven-publish'

id "de.monticore.generator" version "$mc_version"
id "com.github.johnrengelman.shadow" version "$shadow_plugin_version"
id "com.gradleup.shadow" version "$shadow_plugin_version"
id "com.github.sherter.google-java-format" version "$google_java_format_version" // Task "verifyGoogleJavaFormat" and "googleJavaFormat"
}

Expand All @@ -27,8 +27,9 @@ dependencies {
implementation "de.monticore.lang:cd4analysis:$mc_version:tool"

implementation "org.junit.jupiter:junit-jupiter-api:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junit_version"
testImplementation "org.junit.jupiter:junit-jupiter-engine:$junit_version"
testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junit_version"

grammar("de.monticore.lang:cd4analysis:$mc_version")
grammar("de.monticore:monticore-grammar:$mc_version")
Expand Down
Loading