Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 6 additions & 8 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ plugins {
allprojects {
group = "de.monticore"

buildDir = file("$projectDir/target")
layout.buildDirectory = layout.projectDirectory.dir("target")

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

maven {
credentials.username mavenUser
credentials.password mavenPassword
url repo
credentials.username = mavenUser
credentials.password = mavenPassword
url = repo
}

mavenCentral()
Expand All @@ -37,8 +37,6 @@ subprojects {
}

tasks.withType(JavaCompile).configureEach {
dependsOn(tasks.withType(MCGenTask))

options.encoding = "UTF-8"
}

Expand All @@ -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/"
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/corpus.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
monticore-runtime = { module = "de.monticore:monticore-runtime", version = "7.8.0" }
6 changes: 3 additions & 3 deletions ref-code-adaptation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ shadowJar { // all in one jar
archiveFileName = "CodeAdapter.jar"
zip64 = true
// minimize()
duplicatesStrategy DuplicatesStrategy.INCLUDE
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}

test {
Expand All @@ -53,7 +53,7 @@ test {
group = 'refCodeAdaptation'

description = 'CoEvolution'
buildDir = file("$projectDir/target")
layout.buildDirectory = layout.projectDirectory.dir("target")


googleJavaFormat {
Expand All @@ -63,7 +63,7 @@ googleJavaFormat {
}

verifyGoogleJavaFormat{
ignoreFailures true
ignoreFailures = true
exclude "**"
} // do not check format in "build"

Expand Down
6 changes: 3 additions & 3 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ pluginManagement {
}

maven {
credentials.username mavenUser
credentials.password mavenPassword
url repo
credentials.username = mavenUser
credentials.password = mavenPassword
url = repo
}

gradlePluginPortal()
Expand Down
Loading