Skip to content

Commit 2830bbb

Browse files
build: simplify for Renovate
* Switch to explicit dependency versions. * Simplify repository declaration.
1 parent f498bb6 commit 2830bbb

File tree

1 file changed

+7
-38
lines changed

1 file changed

+7
-38
lines changed

build.gradle

Lines changed: 7 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,9 @@ plugins {
2121
id "org.cyclonedx.bom" version "1.8.2"
2222
}
2323

24-
ext.dependencyRepositories = [
25-
'https://artifacts.itemis.cloud/repository/maven-mps/'
26-
]
27-
2824
repositories {
29-
// we don't use mavenLocal() repo, since it can cause various issues with resolving dependencies,
30-
// see https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:case-for-maven-local
31-
for (repoUrl in project.dependencyRepositories) {
32-
maven {
33-
url repoUrl
34-
}
25+
maven {
26+
url 'https://artifacts.itemis.cloud/repository/maven-mps/'
3527
}
3628
mavenCentral()
3729
}
@@ -56,26 +48,8 @@ def forceLocal = project.hasProperty("forceLocalDependencies")
5648
def major = "2024"
5749
def minor = "1"
5850

59-
// Dependency versions
60-
61-
ext.mpsVersion = '2024.1.1'
62-
63-
def mbeddrVersion = "2024.1+"
64-
def mpsQAVersion = "$major.$minor+"
65-
66-
// if building a against a special branch from mbeddr is required add the name here
67-
// the name is enough no trailing "." is required, also the plain name from git can
68-
// be used here. No need to convert "/" the script will take care of that.
69-
def mbeddrBranch = ""
7051
def currentBranch = ""
7152

72-
73-
if (mbeddrBranch != null && !mbeddrBranch.trim().isEmpty()) {
74-
ext.mbeddrVersionSelector = "${mbeddrBranch.replace("/", "-")}.${mbeddrVersion}"
75-
} else {
76-
ext.mbeddrVersionSelector = mbeddrVersion
77-
}
78-
7953
// Project group
8054
group = 'org.iets3'
8155

@@ -95,19 +69,14 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
9569
} else {
9670
def isSnapshot = !(currentBranch.equals("master") || currentBranch.startsWith("datev-loon-staging-") || currentBranch.startsWith("datev-steuer-staging-"))
9771
version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber) + (isSnapshot ? "-SNAPSHOT" : "")
98-
}
72+
}
9973
println "##teamcity[buildNumber '${version}']"
10074
} else {
10175
version = "$major.$minor-SNAPSHOT"
10276
println "Local build detected, version will be $version"
10377
}
10478
}
10579

106-
if (project.hasProperty("mbeddrVersion")) {
107-
logger.log(LogLevel.WARN, "mbeddr version externally overwritten to $ext.mbeddrVersion")
108-
ext.mbeddrVersionSelector = ext.mbeddrVersion
109-
}
110-
11180
ext.releaseRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-releases/'
11281
ext.snapshotRepository = 'https://artifacts.itemis.cloud/repository/maven-mps-snapshots'
11382
ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRepository : releaseRepository
@@ -132,9 +101,9 @@ configurations {
132101
}
133102

134103
dependencies {
135-
mps "com.jetbrains:mps:$mpsVersion"
136-
languageLibs "org.mpsqa:all-in-one:$mpsQAVersion"
137-
languageLibs "com.mbeddr:platform:$mbeddrVersionSelector"
104+
mps "com.jetbrains:mps:2024.1.1"
105+
languageLibs "org.mpsqa:all-in-one:2024.1.962.93576ec"
106+
languageLibs "com.mbeddr:platform:2024.1.25188.dffcb5d"
138107
junitAnt 'org.apache.ant:ant-junit:1.10.6'
139108
pcollections 'org.pcollections:pcollections:4.0.1'
140109
bigMath 'ch.obermuhlner:big-math:2.3.2'
@@ -243,7 +212,7 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
243212
task failOnTestError() {
244213
description 'evaluate junit result and fail on error'
245214
doLast {
246-
215+
247216
def juniXml = file('TESTS-TestSuites.xml')
248217
if(juniXml.exists()){
249218
def junitResult = new XmlSlurper().parse(juniXml)

0 commit comments

Comments
 (0)