Skip to content

CleanUp Gradle #5

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
luepges merged 1 commit into from
Jun 4, 2025
Merged

CleanUp Gradle #5

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
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 @@ -8,7 +8,7 @@ allprojects {
buildDir = file("$projectDir/target")

repositories {
if (getProperty("useLocalRepo")) {
if (("true").equals(getProperty('useLocalRepo'))) {
mavenLocal()
}

Expand Down
23 changes: 1 addition & 22 deletions javaDSL-emf/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
29 changes: 4 additions & 25 deletions javaDSL/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,6 @@ configurations {
}
}

sourceSets {
grammars {
resources {
srcDir(grammarsDir)
include "**/*.mc4"
}
}
}

java {
registerFeature("grammars") {
usingSourceSet(sourceSets.grammars)
}
}

tasks.register('extractCorpus') {
dependsOn(configurations.corpus)
Expand Down Expand Up @@ -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)
}
11 changes: 0 additions & 11 deletions ref-code-adaptation/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* (c) https://github.com/MontiCore/monticore */
pluginManagement {
repositories {
if (getProperty("useLocalRepo")) {
if (("true").equals(getProperty('useLocalRepo'))) {
mavenLocal()
}

Expand All @@ -17,7 +17,7 @@ pluginManagement {

dependencyResolutionManagement {
versionCatalogs {
create("corpus") {
create("corpusLibs") {
from(files("./gradle/corpus.versions.toml"))
}
}
Expand Down