@@ -21,17 +21,9 @@ plugins {
21
21
id " org.cyclonedx.bom" version " 1.8.2"
22
22
}
23
23
24
- ext. dependencyRepositories = [
25
- ' https://artifacts.itemis.cloud/repository/maven-mps/'
26
- ]
27
-
28
24
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/'
35
27
}
36
28
mavenCentral()
37
29
}
@@ -59,21 +51,20 @@ def minor = "1"
59
51
// Dependency versions
60
52
61
53
ext. mpsVersion = ' 2024.1.1'
62
-
63
- def mbeddrVersion = " 2024.1+"
64
- def mpsQAVersion = " $major . $minor +"
54
+ ext. mpsQAVersion = " 2024.1.952.3aa34aa"
65
55
66
56
// if building a against a special branch from mbeddr is required add the name here
67
57
// the name is enough no trailing "." is required, also the plain name from git can
68
58
// be used here. No need to convert "/" the script will take care of that.
69
59
def mbeddrBranch = " "
70
60
def currentBranch = " "
71
61
72
-
73
- if (mbeddrBranch != null && ! mbeddrBranch. trim(). isEmpty()) {
74
- ext. mbeddrVersionSelector = " ${ mbeddrBranch.replace("/", "-")} .${ mbeddrVersion} "
75
- } else {
76
- ext. mbeddrVersionSelector = mbeddrVersion
62
+ if (! project. hasProperty(' mbeddrVersion' )) {
63
+ if (mbeddrBranch != null && ! mbeddrBranch. trim(). isEmpty()) {
64
+ ext. mbeddrVersion = " ${ mbeddrBranch.replace("/", "-")} .${ major} .${ minor} .+"
65
+ } else {
66
+ ext. mbeddrVersion = " 2024.1.25185.dffcb5d"
67
+ }
77
68
}
78
69
79
70
// Project group
@@ -95,19 +86,14 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
95
86
} else {
96
87
def isSnapshot = ! (currentBranch. equals(" master" ) || currentBranch. startsWith(" datev-loon-staging-" ) || currentBranch. startsWith(" datev-steuer-staging-" ))
97
88
version = GitBasedVersioning . getVersionWithCount(major, minor, buildNumber) + (isSnapshot ? " -SNAPSHOT" : " " )
98
- }
89
+ }
99
90
println " ##teamcity[buildNumber '${ version} ']"
100
91
} else {
101
92
version = " $major . $minor -SNAPSHOT"
102
93
println " Local build detected, version will be $version "
103
94
}
104
95
}
105
96
106
- if (project. hasProperty(" mbeddrVersion" )) {
107
- logger. log(LogLevel . WARN , " mbeddr version externally overwritten to $ext . mbeddrVersion " )
108
- ext. mbeddrVersionSelector = ext. mbeddrVersion
109
- }
110
-
111
97
ext. releaseRepository = ' https://artifacts.itemis.cloud/repository/maven-mps-releases/'
112
98
ext. snapshotRepository = ' https://artifacts.itemis.cloud/repository/maven-mps-snapshots'
113
99
ext. publishingRepository = version. toString(). endsWith(" -SNAPSHOT" ) ? snapshotRepository : releaseRepository
@@ -117,12 +103,6 @@ ext.publishingRepository = version.toString().endsWith("-SNAPSHOT") ? snapshotRe
117
103
// 'artifacts' is used in the generated ant scripts as build output directory
118
104
ext. artifactsDir = new File (buildDir, ' artifacts' )
119
105
120
-
121
- wrapper {
122
- gradleVersion ' 8.0.2'
123
- distributionType Wrapper.DistributionType . ALL
124
- }
125
-
126
106
configurations {
127
107
mps
128
108
languageLibs
@@ -134,7 +114,7 @@ configurations {
134
114
dependencies {
135
115
mps " com.jetbrains:mps:$mpsVersion "
136
116
languageLibs " org.mpsqa:all-in-one:$mpsQAVersion "
137
- languageLibs " com.mbeddr:platform:$m beddrVersionSelector "
117
+ languageLibs " com.mbeddr:platform:$m beddrVersion "
138
118
junitAnt ' org.apache.ant:ant-junit:1.10.6'
139
119
pcollections ' org.pcollections:pcollections:4.0.1'
140
120
bigMath ' ch.obermuhlner:big-math:2.3.2'
@@ -258,7 +238,7 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
258
238
task failOnTestError () {
259
239
description ' evaluate junit result and fail on error'
260
240
doLast {
261
-
241
+
262
242
def juniXml = file(' TESTS-TestSuites.xml' )
263
243
if (juniXml. exists()){
264
244
def junitResult = new XmlSlurper (). parse(juniXml)
0 commit comments