Skip to content

Merge maintenance/mps20232 into maintenance/mps20241 #1470

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
arimer merged 5 commits into from
Oct 6, 2025
Merged

Merge maintenance/mps20232 into maintenance/mps20241 #1470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
10bc7be
make build gradle 9 compatible
mhuster23 Oct 2, 2025
b29e3be
Merge pull request #1467 from IETS3/fix/gradle-9-preparation
arimer Oct 6, 2025
7c19cfd
Merge branch 'refs/heads/maintenance/mps20241' into merge/mps20232
arimer Oct 6, 2025
c931678
fix url assignment
mhuster23 Oct 6, 2025
c69d621
Update build.gradle
arimer Oct 6, 2025
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
54 changes: 27 additions & 27 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ plugins {

repositories {
maven {
url 'https://artifacts.itemis.cloud/repository/maven-mps/'
url = 'https://artifacts.itemis.cloud/repository/maven-mps/'
}

mavenCentral()
Expand Down Expand Up @@ -108,8 +108,8 @@ ext.artifactsDir = buildDirPath('artifacts')
ext.reportsDir = buildDirPath('reports')

wrapper {
gradleVersion '8.13'
distributionType Wrapper.DistributionType.ALL
gradleVersion = '8.13'
distributionType = Wrapper.DistributionType.ALL
}

configurations {
Expand Down Expand Up @@ -219,26 +219,26 @@ if (gradle.startParameter.logLevel.toString() != "LIFECYCLE") {

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

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

task prebuild(type: BuildLanguages, dependsOn: buildAllScripts) {
script "$buildDir/scripts/prebuild.xml"
script = "$buildDir/scripts/prebuild.xml"
targets "clean", "generate"
}

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

task execTestsByInterpreter(type: TestLanguages, dependsOn: buildLanguages) {
script "$buildDir/scripts/build-testInterpreter.xml"
script = "$buildDir/scripts/build-testInterpreter.xml"
targets "generate","build"
doLast {
ant.taskdef(name: 'junitInterpreterReport',
Expand All @@ -254,7 +254,7 @@ task execTestsByInterpreter(type: TestLanguages, dependsOn: buildLanguages) {


task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
script "$buildDir/scripts/build-tests.xml"
script = "$buildDir/scripts/build-tests.xml"
doLast {
ant.taskdef(name: 'junitreport',
classname: 'org.apache.tools.ant.taskdefs.optional.junit.XMLResultAggregator',
Expand All @@ -268,7 +268,7 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
}

task failOnTestError() {
description 'evaluate junit result and fail on error'
description = 'evaluate junit result and fail on error'
doLast {

def juniXml = file('TESTS-TestSuites.xml')
Expand Down Expand Up @@ -371,7 +371,7 @@ task packageTests(type: Zip, dependsOn: buildAndRunTests) {
}

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

Expand Down Expand Up @@ -452,8 +452,8 @@ publishing {

publications {
opensource(MavenPublication) {
groupId group
artifactId name
groupId = group
artifactId = name
artifact packageLanguages

addDependency(pom, configurations.languageLibs)
Expand All @@ -462,8 +462,8 @@ publishing {
}

tests(MavenPublication) {
groupId 'org.iets3.opensource'
artifactId 'tests'
groupId = 'org.iets3.opensource'
artifactId = 'tests'
artifact packageTests
addDependency(pom, 'org.iets3', 'opensource', project.version, 'zip')

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

'org.iets3.core.expr.base.shared.runtime'(MavenPublication) {
groupId 'org.iets3.core.expr.base.shared'
artifactId 'shared-runtime'
groupId = 'org.iets3.core.expr.base.shared'
artifactId = 'shared-runtime'
artifact(new File(runtimesDir, 'org.iets3.core.expr.base.shared.runtime.jar')) {
builtBy buildLanguages
}
artifact(new File(runtimesDir, 'org.iets3.core.expr.base.shared.runtime-src.jar')) {
builtBy buildLanguages
classifier 'sources'
classifier = 'sources'
}

pom additionalPomInfo
}

'org.iets3.core.expr.simpleTypes.runtime'(MavenPublication) {
// GitHub Packages refuse uppercase artifactId (not sure about groupId) so use lower case here
groupId 'org.iets3.core.expr.simpletypes'
artifactId 'simpletypes-runtime'
groupId = 'org.iets3.core.expr.simpletypes'
artifactId = 'simpletypes-runtime'
artifact(new File(runtimesDir, 'org.iets3.core.expr.simpleTypes.runtime.jar')) {
builtBy buildLanguages
}
artifact(new File(runtimesDir, 'org.iets3.core.expr.simpleTypes.runtime-src.jar')) {
builtBy buildLanguages
classifier 'sources'
classifier = 'sources'
}

addDependency(pom, 'org.iets3.core.expr.base.shared', 'shared-runtime', project.version)
Expand All @@ -504,14 +504,14 @@ publishing {
}

'org.iets3.core.expr.datetime.runtime'(MavenPublication) {
groupId 'org.iets3.core.expr.datetime'
artifactId 'datetime-runtime'
groupId = 'org.iets3.core.expr.datetime'
artifactId = 'datetime-runtime'
artifact(new File(runtimesDir, 'org.iets3.core.expr.datetime.runtime.jar')) {
builtBy buildLanguages
}
artifact(new File(runtimesDir, 'org.iets3.core.expr.datetime.runtime-src.jar')) {
builtBy buildLanguages
classifier 'sources'
classifier = 'sources'
}

addDependency(pom, 'org.iets3.core.expr.base.shared', 'shared-runtime', project.version)
Expand All @@ -520,14 +520,14 @@ publishing {
}

'org.iets3.core.expr.temporal.runtime'(MavenPublication) {
groupId 'org.iets3.core.expr.temporal'
artifactId 'temporal-runtime'
groupId = 'org.iets3.core.expr.temporal'
artifactId = 'temporal-runtime'
artifact(new File(runtimesDir, 'org.iets3.core.expr.temporal.runtime.jar')) {
builtBy buildLanguages
}
artifact(new File(runtimesDir, 'org.iets3.core.expr.temporal.runtime-src.jar')) {
builtBy buildLanguages
classifier 'sources'
classifier = 'sources'
}

addDependency(pom, 'org.iets3.core.expr.datetime', 'datetime-runtime', project.version)
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginManagement {
repositories {
maven { url 'https://artifacts.itemis.cloud/repository/maven-mps' }
maven { url = 'https://artifacts.itemis.cloud/repository/maven-mps' }

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