From d49a11348427b928221501d6c7f5b43d99db79ec Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Tue, 9 Jun 2026 11:02:57 +0200 Subject: [PATCH 1/2] revert corpus test to de.monticore runtime version 7.8.0 --- gradle/corpus.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/corpus.versions.toml b/gradle/corpus.versions.toml index 85a3dd01..7de71194 100644 --- a/gradle/corpus.versions.toml +++ b/gradle/corpus.versions.toml @@ -17,4 +17,4 @@ guava = { module = "com.google.guava:guava", version = "31.1-jre" } # de.monticore - MontiCore # https://github.com/MontiCore/monticore - Java 11 -monticore-runtime = { module = "de.monticore:monticore-runtime", version = "7.9.0-SNAPSHOT" } \ No newline at end of file +monticore-runtime = { module = "de.monticore:monticore-runtime", version = "7.8.0" } \ No newline at end of file From fa860ec1a09368b47b03627a95c1983016eee3b6 Mon Sep 17 00:00:00 2001 From: Janik Rapp Date: Tue, 9 Jun 2026 11:08:50 +0200 Subject: [PATCH 2/2] fix deprectated gradle configurations --- build.gradle | 14 ++++++-------- gradle.properties | 2 +- ref-code-adaptation/build.gradle | 6 +++--- settings.gradle | 6 +++--- 4 files changed, 13 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 3294b6d3..4952898c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { allprojects { group = "de.monticore" - buildDir = file("$projectDir/target") + layout.buildDirectory = layout.projectDirectory.dir("target") repositories { if (("true").equals(getProperty('useLocalRepo'))) { @@ -13,9 +13,9 @@ allprojects { } maven { - credentials.username mavenUser - credentials.password mavenPassword - url repo + credentials.username = mavenUser + credentials.password = mavenPassword + url = repo } mavenCentral() @@ -37,8 +37,6 @@ subprojects { } tasks.withType(JavaCompile).configureEach { - dependsOn(tasks.withType(MCGenTask)) - options.encoding = "UTF-8" } @@ -55,8 +53,8 @@ subprojects { publishing { repositories { maven { - credentials.username mavenUser - credentials.password mavenPassword + credentials.username = mavenUser + credentials.password = mavenPassword def releasesRepoUrl = "https://nexus.se.rwth-aachen.de/content/repositories/monticore-releases/" def snapshotsRepoUrl = "https://nexus.se.rwth-aachen.de/content/repositories/monticore-snapshots/" diff --git a/gradle.properties b/gradle.properties index 3d31502b..348f2de5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ mc_version=7.9.0-SNAPSHOT emf_version=2.15.0 shadow_plugin_version=8.3.9 guava_version=31.1-jre -junit_version=6.0.3 +junit_version=6.1.0 google_java_format_version=0.9 spoon_core_version=11.3.0 commons_lang3_version=3.9 \ No newline at end of file diff --git a/ref-code-adaptation/build.gradle b/ref-code-adaptation/build.gradle index 41ca3251..1c25dc8b 100644 --- a/ref-code-adaptation/build.gradle +++ b/ref-code-adaptation/build.gradle @@ -43,7 +43,7 @@ shadowJar { // all in one jar archiveFileName = "CodeAdapter.jar" zip64 = true // minimize() - duplicatesStrategy DuplicatesStrategy.INCLUDE + duplicatesStrategy = DuplicatesStrategy.INCLUDE } test { @@ -53,7 +53,7 @@ test { group = 'refCodeAdaptation' description = 'CoEvolution' -buildDir = file("$projectDir/target") +layout.buildDirectory = layout.projectDirectory.dir("target") googleJavaFormat { @@ -63,7 +63,7 @@ googleJavaFormat { } verifyGoogleJavaFormat{ - ignoreFailures true + ignoreFailures = true exclude "**" } // do not check format in "build" diff --git a/settings.gradle b/settings.gradle index c5e70474..6a86540a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,9 +6,9 @@ pluginManagement { } maven { - credentials.username mavenUser - credentials.password mavenPassword - url repo + credentials.username = mavenUser + credentials.password = mavenPassword + url = repo } gradlePluginPortal()