Merge pull request #749 from JetBrains/merge/mps20213

Merge maintenance/mps20213 into maintenance/mps20222
JetBrains · Jan 28, 2024 · 01398b7 · 01398b7
2 parents 2a2a841 + 7d00d00
commit 01398b7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,23 +1,14 @@
 plugins {
     id 'de.itemis.mps.gradle.common' version '1.13.+'
     id "com.github.breadmoirai.github-release" version "2.4.1"
+    id 'maven-publish'
+    id 'base'
 }
 
-apply plugin: 'maven-publish'
-apply plugin: 'base'
-
-
-
 import de.itemis.mps.gradle.*
 
 import java.time.LocalDateTime
 
-
-wrapper {
-    gradleVersion '8.5'
-    distributionType 'all'
-}
-
 apply plugin: 'download-jbr'
 
 downloadJbr {
@@ -43,9 +34,6 @@ if (!project.hasProperty('nexusUsername')) {
 }
 logger.info 'Repository username: {}', project.nexusUsername
 
-ext.dependencyRepositories = [
-        'https://artifacts.itemis.cloud/repository/maven-mps/'
-]
 // Dependency versions
 
 // major version, e.g. '2021.1', '2021.2'
@@ -104,12 +92,7 @@ dependencies {
 }
 
 repositories {
-    mavenLocal()
-    for (repoUrl in project.dependencyRepositories) {
-        maven {
-            url repoUrl
-        }
-    }
+    maven { url 'https://artifacts.itemis.cloud/repository/maven-mps/' }
 }
 
 ext.skipResolveMps = project.hasProperty('mpsHomeDir')
@@ -225,14 +208,13 @@ ext.artifacts_dir = '-Dartifacts.root=' + artifactsDir
 ext.pluginVersion = "-DversionNumber=" + version
 ext.buildDate = "-DbuildDate=" + new Date().toString()
 ext.extensions_home = '-Dextensions.home=' + rootDir
-ext.skipUnmodifiedModels = "-Dmps.generator.skipUnmodifiedModels=true" //incremental build support
 
 // ___________________ utilities ___________________
 File scriptFile(String relativePath) {
     new File("$rootDir/build/generated/$relativePath")
 }
 
-def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion, ext.skipUnmodifiedModels]
+def defaultScriptArgs = [mps_home, build_dir, artifacts_dir, ext.buildDate, ext.pluginVersion]
 
 afterEvaluate {
     project.ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = tasks.getByName('downloadJbr').javaExecutable

diff --git a/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps b/.../build/solutions/de.itemis.mps.extensions.build/models/de.itemis.mps.extensions.build.mps
@@ -32,6 +32,7 @@
         <reference id="4560297596904469363" name="module" index="22LTRN" />
       </concept>
       <concept id="6593674873639474400" name="jetbrains.mps.build.mps.tests.structure.BuildMps_TestModules_Options" flags="ng" index="24cAiW">
+        <child id="6593674873639478221" name="haltonfailure" index="24c_eh" />
         <child id="1688667350638517006" name="compressArgs" index="XX84c" />
       </concept>
       <concept id="4005526075820600484" name="jetbrains.mps.build.mps.tests.structure.BuildModuleTestsPlugin" flags="ng" index="1gjT0q" />
@@ -20132,6 +20133,11 @@
             <property role="3MwjfP" value="true" />
           </node>
         </node>
+        <node concept="NbPM2" id="4rjYge50oSR" role="24c_eh">
+          <node concept="3Mxwew" id="4rjYge50oSU" role="3MwsjC">
+            <property role="3MwjfP" value="true" />
+          </node>
+        </node>
       </node>
       <node concept="22LTRM" id="5QP6xyk3oDX" role="22LTRK">
         <ref role="22LTRN" node="5QP6xyk3oCB" resolve="test.de.q60.mps.shadowmodels.runtime" />