Merge remote-tracking branch 'origin/master' into datev-staging

# Conflicts:
#	code/languages/org.iets3.opensource/tests/test.in.expr.os/models/[email protected]

Author: wsafonov

build.gradle

@@ -63,14 +63,15 @@ def major = "2020"
 def minor = "3"
 
 // Dependency versions
-ext.mpsVersion = '2020.3.1'
+ext.mpsVersion = '2020.3.4'
 
 def mbeddrVersion = "2020.3+"
 
 // if building a against a special branch from mbeddr is required add the name here
 // the name is enough no trailing "." is required, also the plain name from git can
 // be used here. No need to convert "/" the script will take care of that.
 def mbeddrBranch = ""
+def currentBranch = ""
 
 
 if (mbeddrBranch != null && !mbeddrBranch.trim().isEmpty()) {
@@ -85,10 +86,10 @@ if (project.hasProperty('iets3OpenSourceVersion')) {
     version = project.iets3OpenSourceVersion
 } else {
     if (ciBuild) {
-        String branch = GitBasedVersioning.gitBranch
+        currentBranch = GitBasedVersioning.gitBranch
 
         def buildNumber = System.env.BUILD_NUMBER.toInteger()
-        if (branch.startsWith("maintenance") || branch.startsWith("mps")) {
+        if (currentBranch.startsWith("maintenance") || currentBranch.startsWith("mps")) {
             version = "$major.$minor.$buildNumber.${GitBasedVersioning.gitShortCommitHash}"
         } else {
             version = GitBasedVersioning.getVersionWithCount(major, minor, buildNumber)
@@ -134,12 +135,14 @@ configurations {
     mps
     languageLibs
     junitAnt
+    pcollections // Synced to org.iets3.core.expr.base.collections.stubs/lib
 }
 
 dependencies {
     mps "com.jetbrains:mps:$mpsVersion"
     languageLibs "com.mbeddr:platform:$mbeddrVersionSelector"
     junitAnt 'org.apache.ant:ant-junit:1.10.6'
+    pcollections 'org.pcollections:pcollections:3.1.4'
 }
 
 repositories {
@@ -158,21 +161,40 @@ repositories {
     mavenCentral()
 }
 
-task resolveMps(type: Copy) {
+task resolveMps(type: Sync) {
     dependsOn configurations.mps
     from {
         configurations.mps.resolve().collect { zipTree(it) }
     }
     into "$buildDir/mps"
 }
 
-task resolveLanguageLibs(type: Copy) {
+task resolveLanguageLibs(type: Sync) {
     from {
         configurations.languageLibs.resolve().collect { zipTree(it) }
     }
     into "$buildDir/dependencies"
 }
 
+task resolvePcollections(type: Sync) {
+    from configurations.pcollections
+    into file('code/languages/org.iets3.opensource/solutions/org.iets3.core.expr.base.collections.stubs/lib')
+
+    // Strip version numbers from file names
+    rename { filename ->
+        def ra = configurations.pcollections.resolvedConfiguration.resolvedArtifacts.find { ResolvedArtifact ra -> ra.file.name == filename }
+        String finalName
+        if (ra.classifier != null) {
+            finalName = "${ra.name}-${ra.classifier}.${ra.extension}"
+        } else {
+            finalName = "${ra.name}.${ra.extension}"
+        }
+        return finalName
+    }
+}
+
+task resolveDependencies(dependsOn: [resolveLanguageLibs, resolvePcollections])
+
 // Default arguments for ant scripts
 def defaultScriptArgs = [
         'mps.home'                          : resolveMps.destinationDir,
@@ -193,7 +215,7 @@ ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs.collect { "-D
 ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = defaultScriptClasspath
 ext["itemis.mps.gradle.ant.defaultJavaExecutable"] = new File(jdk_home, 'bin/java')
 
-task buildAllScripts(type: BuildLanguages, dependsOn: [resolveMps, resolveLanguageLibs]) {
+task buildAllScripts(type: BuildLanguages, dependsOn: [resolveMps, resolveDependencies]) {
     script "$buildDir/scripts/build-allScripts.xml"
 }
 
@@ -217,12 +239,6 @@ task buildAndRunTests(type: TestLanguages, dependsOn: buildLanguages) {
 
 check.dependsOn buildAndRunTests
 
-task packageAllScripts(type: Zip, dependsOn: buildAllScripts) {
-    archiveBaseName = 'org.iets3.opensource.allScripts'
-    from artifactsDir
-    include 'org.iets3.opensource.allScripts.build/**'
-}
-
 task packageLanguages(type: Zip, dependsOn: buildLanguages) {
     archiveBaseName = 'org.iets3.opensource'
     from artifactsDir
@@ -246,7 +262,28 @@ task packageDistroWithDependencies(type: Zip, dependsOn: buildDistroWithDependen
     include 'org.iets3.opensource.distro/**'
 }
 
-assemble.dependsOn packageAllScripts, packageLanguages, packageTests
+assemble.dependsOn packageLanguages, packageTests
+
+static def addDependency(Object pom, Object groupId, Object artifactId, Object version, Object type = null) {
+    pom.withXml { XmlProvider prov ->
+        Node root = prov.asNode()
+        Node deps = root.dependencies[0] ?: root.appendNode("dependencies")
+        def dep = deps.appendNode("dependency")
+        dep.appendNode("groupId", groupId)
+        dep.appendNode("artifactId", artifactId)
+        dep.appendNode("version", version)
+        if (type != null) {
+            dep.appendNode("type", type)
+        }
+    }
+}
+
+static def addDependency(Object pom, Configuration config) {
+    config.resolvedConfiguration.firstLevelModuleDependencies.each {
+        addDependency(pom, it.moduleGroup, it.moduleName, it.moduleVersion, it.moduleArtifacts[0].type)
+    }
+
+}
 
 publishing {
     repositories {
@@ -260,55 +297,100 @@ publishing {
             }
         }
     }
-    publications {
-        allScripts(MavenPublication) {
-            groupId 'org.iets3.opensource'
-            artifactId 'allScripts'
-            artifact packageAllScripts
+    repositories {
+        if(currentBranch == "master" || currentBranch.startsWith("maintenance") || currentBranch.startsWith("mps")) {
+                maven {
+                    name = "GitHubPackages"
+                    url = uri("https://maven.pkg.github.com/IETS3/iets3.opensource")
+                    if(project.hasProperty("gpr.token")) {
+                        credentials {
+                            username = project.findProperty("gpr.user")
+                            password = project.findProperty("gpr.token")
+                        }
+                    }
+                }
+            }
         }
+        
+    publications {
         openSource(MavenPublication) {
             groupId 'org.iets3'
             artifactId 'opensource'
             artifact packageLanguages
-            pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
-                configurations.languageLibs.resolvedConfiguration.firstLevelModuleDependencies.each{
-                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                    dependencyNode.appendNode('groupId', it.moduleGroup)
-                    dependencyNode.appendNode('artifactId', it.moduleName)
-                    dependencyNode.appendNode('version', it.moduleVersion)
-                    dependencyNode.appendNode('type', it.moduleArtifacts[0].type)
-                }
-                configurations.mps.resolvedConfiguration.firstLevelModuleDependencies.each{
-                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                    dependencyNode.appendNode('groupId', it.moduleGroup)
-                    dependencyNode.appendNode('artifactId', it.moduleName)
-                    dependencyNode.appendNode('version', it.moduleVersion)
-                    dependencyNode.appendNode('type', it.moduleArtifacts[0].type)
-                    dependencyNode.appendNode('scope', 'provided')
-                }
-            }
+
+            addDependency(pom, configurations.languageLibs)
         }
+
         tests(MavenPublication) {
             groupId 'org.iets3.opensource'
             artifactId 'tests'
             artifact packageTests
-            pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
-                configurations.mps.resolvedConfiguration.firstLevelModuleDependencies.each{
-                    def dependencyNode = dependenciesNode.appendNode('dependency')
-                    dependencyNode.appendNode('groupId', it.moduleGroup)
-                    dependencyNode.appendNode('artifactId', it.moduleName)
-                    dependencyNode.appendNode('version', it.moduleVersion)
-                    dependencyNode.appendNode('type', it.moduleArtifacts[0].type)
-                }
+
+            addDependency(pom, 'org.iets3', 'opensource', project.version, 'zip')
+        }
+
+        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'
+            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'
             }
         }
+
+        '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'
+            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'
+            }
+
+            addDependency(pom, 'org.iets3.core.expr.base.shared', 'shared-runtime', project.version)
+        }
+
+        'org.iets3.core.expr.datetime.runtime'(MavenPublication) {
+            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'
+            }
+
+            addDependency(pom, 'org.iets3.core.expr.base.shared', 'shared-runtime', project.version)
+        }
+
+        'org.iets3.core.expr.temporal.runtime'(MavenPublication) {
+            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'
+            }
+
+            addDependency(pom, 'org.iets3.core.expr.datetime', 'datetime-runtime', project.version)
+        }
     }
 }
 
+
 task generateLibrariesXml(type: GenerateLibrariesXml) {
-    dependsOn resolveLanguageLibs
+    dependsOn resolveDependencies
     description "Will read project libraries from projectlibraries.properties and generate libraries.xml in .mps directory. Libraries are loaded in mps during start."
     defaults rootProject.file('projectlibraries.properties')
     overrides rootProject.file('projectlibraries.overrides.properties')
@@ -317,7 +399,7 @@ task generateLibrariesXml(type: GenerateLibrariesXml) {
 
 task setup {
     dependsOn generateLibrariesXml
-    dependsOn resolveLanguageLibs
+    dependsOn resolveDependencies
     description 'Set up MPS project libraries. Libraries are read in from projectlibraries.properties file.'
 }
 

code/languages/org.iets3.opensource/.mps/modules.xml

@@ -78,6 +78,7 @@
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.collections.stubs/org.iets3.core.expr.base.collections.stubs.msd" folder="expr.lang-core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.interpreter/org.iets3.core.expr.base.interpreter.msd" folder="expr.lang-core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.runtime/org.iets3.core.expr.base.runtime.msd" folder="expr.lang-core" />
+      <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.base.shared.runtime/org.iets3.core.expr.base.shared.runtime.msd" folder="expr.lang-core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.collections.interpreter/org.iets3.core.expr.collections.interpreter.msd" folder="expr.lang-core" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.data.interpreter/org.iets3.core.expr.data.interpreter.msd" folder="expr.lang-advanced" />
       <modulePath path="$PROJECT_DIR$/solutions/org.iets3.core.expr.dataflow.interpreter/org.iets3.core.expr.dataflow.interpreter.msd" folder="expr.lang-advanced" />
@@ -132,4 +133,4 @@
       <modulePath path="$PROJECT_DIR$/tests/test.ts.expr.os/test.ts.expr.os.msd" folder="expr.tests" />
     </projectModules>
   </component>
-</project>
+</project>

code/languages/org.iets3.opensource/_spreferences/CodeReviewPreferences/module.msd

@@ -12,7 +12,7 @@
   </facets>
   <sourcePath />
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="5" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:7d323e61-8358-4656-a071-a2bb68438615:com.mbeddr.core.codereview" version="0" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
@@ -23,6 +23,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
   </languageVersions>
   <dependencyVersions>

code/languages/org.iets3.opensource/_spreferences/TestExecutionPreferences/module.msd

@@ -12,7 +12,7 @@
   </facets>
   <sourcePath />
   <languageVersions>
-    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="5" />
+    <language slang="l:d4280a54-f6df-4383-aa41-d1b2bffa7eb1:com.mbeddr.core.base" version="6" />
     <language slang="l:63e0e566-5131-447e-90e3-12ea330e1a00:com.mbeddr.mpsutil.blutil" version="1" />
     <language slang="l:d3a0fd26-445a-466c-900e-10444ddfed52:com.mbeddr.mpsutil.filepicker" version="0" />
     <language slang="l:d09a16fb-1d68-4a92-a5a4-20b4b2f86a62:com.mbeddr.mpsutil.jung" version="0" />
@@ -22,6 +22,7 @@
     <language slang="l:fd392034-7849-419d-9071-12563d152375:jetbrains.mps.baseLanguage.closures" version="0" />
     <language slang="l:83888646-71ce-4f1c-9c53-c54016f6ad4f:jetbrains.mps.baseLanguage.collections" version="1" />
     <language slang="l:ceab5195-25ea-4f22-9b92-103b95ca8c0c:jetbrains.mps.lang.core" version="2" />
+    <language slang="l:446c26eb-2b7b-4bf0-9b35-f83fa582753e:jetbrains.mps.lang.modelapi" version="0" />
     <language slang="l:9ded098b-ad6a-4657-bfd9-48636cfe8bc3:jetbrains.mps.lang.traceable" version="0" />
     <language slang="l:2022a471-10ba-4431-ba5d-622df898f3c6:org.iets3.core.expr.testExecution" version="0" />
   </languageVersions>

code/languages/org.iets3.opensource/devkits/org.iets3.core.expr.genjava.core.devkit/org.iets3.core.expr.genjava.core.devkit.devkit

@@ -16,6 +16,7 @@
     <exported-solution>dbe08fb5-334d-4b64-86a0-622406fa0e87(org.iets3.core.expr.base.runtime)</exported-solution>
     <exported-solution>b76a0f63-5959-456b-993a-c796cc0d0c13(org.iets3.core.expr.base.collections.stubs)</exported-solution>
     <exported-solution>52a8c4c0-f4b0-4243-bf00-9dfac3472876(org.iets3.core.expr.simpleTypes.runtime)</exported-solution>
+    <exported-solution>00ca1323-762b-4f39-ab5a-6a6bd602dc4b(org.iets3.core.expr.base.shared.runtime)</exported-solution>
   </exported-solutions>
   <generation-plan model="r:44582398-dfcf-40ad-bb09-b88bb3cc5de2(org.iets3.core.expr.genjava.core.genplan.genplan)" />
 </dev-kit>