From 8a6c106079a5e8e1f78761634aa0a564d057d24b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20L=C3=BCpges?= <git@luepg.es>
Date: Wed, 4 Jun 2025 11:51:34 +0200
Subject: [PATCH] CleanUp Gradle

---
 build.gradle                     |  2 +-
 javaDSL-emf/build.gradle         | 23 +----------------------
 javaDSL/build.gradle             | 29 ++++-------------------------
 ref-code-adaptation/build.gradle | 11 -----------
 settings.gradle                  |  4 ++--
 5 files changed, 8 insertions(+), 61 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6eac4cf9..f9062ec9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ allprojects {
     buildDir = file("$projectDir/target")
 
     repositories {
-        if (getProperty("useLocalRepo")) {
+        if (("true").equals(getProperty('useLocalRepo'))) {
             mavenLocal()
         }
 
diff --git a/javaDSL-emf/build.gradle b/javaDSL-emf/build.gradle
index f6d5c7d8..df12a609 100644
--- a/javaDSL-emf/build.gradle
+++ b/javaDSL-emf/build.gradle
@@ -5,21 +5,6 @@ def srcTestDir = "$buildDir/copied-sources/test"
 
 def grammarsDir = "${project(":javaDSL").projectDir}/src/main/grammars"
 
-sourceSets {
-    grammars {
-        resources {
-            srcDir(grammarsDir)
-            include "**/*.mc4"
-        }
-    }
-}
-
-java {
-    registerFeature("grammars") {
-        usingSourceSet(sourceSets.grammars)
-    }
-}
-
 tasks.register('copyMainSources', Copy) {
     destinationDir = file srcMainDir
     from "${project(':javaDSL').projectDir}/src/main"
@@ -42,15 +27,9 @@ dependencies {
     implementation "org.eclipse.emf:org.eclipse.emf.ecore:$emf_version"
     implementation "org.eclipse.emf:org.eclipse.emf.ecore.xmi:$emf_version"
 
-    implementation "de.monticore:monticore-grammar-emf:$mc_version"
+    grammar "de.monticore:monticore-grammar-emf:$mc_version"
     implementation "de.monticore:monticore-runtime-emf:$mc_version"
 
-    grammar("de.monticore:monticore-grammar:$mc_version") {
-        capabilities {
-            requireCapability("de.monticore:monticore-grammar-grammars")
-        }
-    }
-
     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"
diff --git a/javaDSL/build.gradle b/javaDSL/build.gradle
index 670a7294..9db43956 100644
--- a/javaDSL/build.gradle
+++ b/javaDSL/build.gradle
@@ -17,20 +17,6 @@ configurations {
     }
 }
 
-sourceSets {
-    grammars {
-        resources {
-            srcDir(grammarsDir)
-            include "**/*.mc4"
-        }
-    }
-}
-
-java {
-    registerFeature("grammars") {
-        usingSourceSet(sourceSets.grammars)
-    }
-}
 
 tasks.register('extractCorpus') {
     dependsOn(configurations.corpus)
@@ -64,21 +50,14 @@ tasks.withType(Test).configureEach {
 dependencies {
     implementation "de.monticore.lang:cd4analysis:$mc_version"
 
-    implementation "de.monticore:monticore-grammar:$mc_version"
-    implementation "de.monticore:monticore-runtime:$mc_version"
-
-    grammar("de.monticore:monticore-grammar:$mc_version") {
-        capabilities {
-            requireCapability("de.monticore:monticore-grammar-grammars")
-        }
-    }
+    grammar "de.monticore:monticore-grammar:$mc_version"
 
     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"
 
-    corpus(corpus.guava)
-    corpus(corpus.monticore.runtime)
+    corpus(corpusLibs.guava)
+    corpus(corpusLibs.monticore.runtime)
     // TODO: fix parser for Java 17 and enable
-    //corpus(corpus.quitte)
+    //corpus(corpusLibs.quitte)
 }
\ No newline at end of file
diff --git a/ref-code-adaptation/build.gradle b/ref-code-adaptation/build.gradle
index aa14a250..1e3f5488 100644
--- a/ref-code-adaptation/build.gradle
+++ b/ref-code-adaptation/build.gradle
@@ -50,17 +50,6 @@ test {
 }
 
 group = 'refCodeAdaptation'
-repositories {
-    if(("true").equals(getProperty('useLocalRepo'))) {
-        mavenLocal()
-    }
-    maven {
-        credentials.username mavenUser
-        credentials.password mavenPassword
-        url repo
-    }
-    mavenCentral()
-}
 
 description = 'CoEvolution'
 buildDir = file("$projectDir/target")
diff --git a/settings.gradle b/settings.gradle
index dcb42efe..c5e70474 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 pluginManagement {
     repositories {
-        if (getProperty("useLocalRepo")) {
+        if (("true").equals(getProperty('useLocalRepo'))) {
             mavenLocal()
         }
 
@@ -17,7 +17,7 @@ pluginManagement {
 
 dependencyResolutionManagement {
     versionCatalogs {
-        create("corpus") {
+        create("corpusLibs") {
             from(files("./gradle/corpus.versions.toml"))
         }
     }