Skip to content

Commit 10bc7be

Browse files
committed
make build gradle 9 compatible
1 parent 298b9e1 commit 10bc7be

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

build.gradle

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import java.time.format.FormatStyle
1111
//will pull the groovy classes/types from nexus to the classpath
1212
buildscript {
1313
repositories {
14-
maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
14+
maven { url = 'https://artifacts.itemis.cloud/repository/maven-mps/' }
1515
}
1616
}
1717

@@ -33,7 +33,7 @@ repositories {
3333
// see https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:case-for-maven-local
3434
for (repoUrl in project.dependencyRepositories) {
3535
maven {
36-
url repoUrl
36+
url = repoUrl
3737
}
3838
}
3939
mavenCentral()
@@ -125,8 +125,8 @@ ext.artifactsDir = buildDirPath('artifacts')
125125
ext.reportsDir = buildDirPath('reports')
126126

127127
wrapper {
128-
gradleVersion '8.13'
129-
distributionType Wrapper.DistributionType.ALL
128+
gradleVersion = '8.13'
129+
distributionType = Wrapper.DistributionType.ALL
130130
}
131131

132132
configurations {
@@ -235,26 +235,26 @@ if (gradle.startParameter.logLevel.toString() != "LIFECYCLE") {
235235

236236
// enables https://github.com/mbeddr/mps-gradle-plugin#providing-global-defaults
237237
ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.collect { "-D$it.key=$it.value".toString() }
238-
ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = project.configurations.junitAnt.fileCollection { true }
238+
ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = project.configurations.junitAnt.getIncoming().files
239239
afterEvaluate {
240240
project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable
241241
}
242242

243243
task buildAllScripts(type: BuildLanguages, dependsOn: resolveDependencies) {
244-
script "$buildDir/scripts/build-allScripts.xml"
244+
script = "$buildDir/scripts/build-allScripts.xml"
245245
}
246246

247247
task prebuild(type: BuildLanguages, dependsOn: buildAllScripts) {
248-
script "$buildDir/scripts/prebuild.xml"
248+
script = "$buildDir/scripts/prebuild.xml"
249249
targets "clean", "generate"
250250
}
251251

252252
task buildLanguages(type: BuildLanguages, dependsOn: prebuild) {
253-
script "$buildDir/scripts/build-languages.xml"
253+
script = "$buildDir/scripts/build-languages.xml"
254254
}
255255

256256
task execTestsByInterpreter(type: TestLanguages, dependsOn: buildLanguages) {
257-
script "$buildDir/scripts/build-testInterpreter.xml"
257+
script = "$buildDir/scripts/build-testInterpreter.xml"
258258
targets "generate","build"
259259
doLast {
260260
ant.taskdef(name: 'junitInterpreterReport',
@@ -270,7 +270,7 @@ task execTestsByInterpreter(type: TestLanguages, dependsOn: buildLanguages) {
270270

271271

272272
task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
273-
script "$buildDir/scripts/build-tests.xml"
273+
script = "$buildDir/scripts/build-tests.xml"
274274
doLast {
275275
ant.taskdef(name: 'junitreport',
276276
classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
@@ -284,7 +284,7 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
284284
}
285285

286286
task failOnTestError() {
287-
description 'evaluate junit result and fail on error'
287+
description = 'evaluate junit result and fail on error'
288288
doLast {
289289

290290
def juniXml = file('TESTS-TestSuites.xml')
@@ -385,7 +385,7 @@ task packageTests(type: Zip, dependsOn: buildAndRunTests) {
385385
}
386386

387387
task buildDistroWithDependencies(type: RunAntScript, dependsOn: buildLanguages) {
388-
script "$buildDir/scripts/build-distro.xml"
388+
script = "$buildDir/scripts/build-distro.xml"
389389
targets 'clean', 'assemble'
390390
}
391391

@@ -466,8 +466,8 @@ publishing {
466466

467467
publications {
468468
opensource(MavenPublication) {
469-
groupId group
470-
artifactId name
469+
groupId = group
470+
artifactId = name
471471
artifact packageLanguages
472472

473473
addDependency(pom, configurations.languageLibs)
@@ -476,8 +476,8 @@ publishing {
476476
}
477477

478478
tests(MavenPublication) {
479-
groupId 'org.iets3.opensource'
480-
artifactId 'tests'
479+
groupId = 'org.iets3.opensource'
480+
artifactId = 'tests'
481481
artifact packageTests
482482
addDependency(pom, 'org.iets3', 'opensource', project.version, 'zip')
483483

@@ -487,29 +487,29 @@ publishing {
487487
def runtimesDir = new File(artifactsDir, 'org.iets3.opensource/org.iets3.core.os/languages/iets3.core.os')
488488

489489
'org.iets3.core.expr.base.shared.runtime'(MavenPublication) {
490-
groupId 'org.iets3.core.expr.base.shared'
491-
artifactId 'shared-runtime'
490+
groupId = 'org.iets3.core.expr.base.shared'
491+
artifactId = 'shared-runtime'
492492
artifact(new File(runtimesDir, 'org.iets3.core.expr.base.shared.runtime.jar')) {
493493
builtBy buildLanguages
494494
}
495495
artifact(new File(runtimesDir, 'org.iets3.core.expr.base.shared.runtime-src.jar')) {
496496
builtBy buildLanguages
497-
classifier 'sources'
497+
classifier = 'sources'
498498
}
499499

500500
pom additionalPomInfo
501501
}
502502

503503
'org.iets3.core.expr.simpleTypes.runtime'(MavenPublication) {
504504
// GitHub Packages refuse uppercase artifactId (not sure about groupId) so use lower case here
505-
groupId 'org.iets3.core.expr.simpletypes'
506-
artifactId 'simpletypes-runtime'
505+
groupId = 'org.iets3.core.expr.simpletypes'
506+
artifactId = 'simpletypes-runtime'
507507
artifact(new File(runtimesDir, 'org.iets3.core.expr.simpleTypes.runtime.jar')) {
508508
builtBy buildLanguages
509509
}
510510
artifact(new File(runtimesDir, 'org.iets3.core.expr.simpleTypes.runtime-src.jar')) {
511511
builtBy buildLanguages
512-
classifier 'sources'
512+
classifier = 'sources'
513513
}
514514

515515
addDependency(pom, 'org.iets3.core.expr.base.shared', 'shared-runtime', project.version)
@@ -518,14 +518,14 @@ publishing {
518518
}
519519

520520
'org.iets3.core.expr.datetime.runtime'(MavenPublication) {
521-
groupId 'org.iets3.core.expr.datetime'
522-
artifactId 'datetime-runtime'
521+
groupId = 'org.iets3.core.expr.datetime'
522+
artifactId = 'datetime-runtime'
523523
artifact(new File(runtimesDir, 'org.iets3.core.expr.datetime.runtime.jar')) {
524524
builtBy buildLanguages
525525
}
526526
artifact(new File(runtimesDir, 'org.iets3.core.expr.datetime.runtime-src.jar')) {
527527
builtBy buildLanguages
528-
classifier 'sources'
528+
classifier = 'sources'
529529
}
530530

531531
addDependency(pom, 'org.iets3.core.expr.base.shared', 'shared-runtime', project.version)
@@ -534,14 +534,14 @@ publishing {
534534
}
535535

536536
'org.iets3.core.expr.temporal.runtime'(MavenPublication) {
537-
groupId 'org.iets3.core.expr.temporal'
538-
artifactId 'temporal-runtime'
537+
groupId = 'org.iets3.core.expr.temporal'
538+
artifactId = 'temporal-runtime'
539539
artifact(new File(runtimesDir, 'org.iets3.core.expr.temporal.runtime.jar')) {
540540
builtBy buildLanguages
541541
}
542542
artifact(new File(runtimesDir, 'org.iets3.core.expr.temporal.runtime-src.jar')) {
543543
builtBy buildLanguages
544-
classifier 'sources'
544+
classifier = 'sources'
545545
}
546546

547547
addDependency(pom, 'org.iets3.core.expr.datetime', 'datetime-runtime', project.version)

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pluginManagement {
22
repositories {
3-
maven { url 'https://artifacts.itemis.cloud/repository/maven-mps' }
3+
maven { url = 'https://artifacts.itemis.cloud/repository/maven-mps' }
44

55
// Need to manually include the default Gradle plugin portal repository when overriding the defaults.
66
gradlePluginPortal()

0 commit comments

Comments
 (0)