Use pcollections from Maven Central

Author: sergej-koscejev

build.gradle

@@ -135,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 {
@@ -174,6 +176,24 @@ task resolveLanguageLibs(type: Sync) {
     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')
+
+    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,
@@ -194,7 +214,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"
 }
 
@@ -314,7 +334,7 @@ publishing {
 
 
 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')
@@ -323,7 +343,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/languages/org.iets3.core.expr.collections/lib/pcollections/LICENSE

@@ -0,0 +1,2 @@
+*
+!.gitignore

code/languages/org.iets3.opensource/languages/org.iets3.core.expr.collections/lib/pcollections/pcollections-28apr2016.jar

@@ -2,7 +2,7 @@
 <solution name="org.iets3.core.expr.base.collections.stubs" uuid="b76a0f63-5959-456b-993a-c796cc0d0c13" moduleVersion="0" compileInMPS="true">
   <models>
     <modelRoot contentPath="${module}/lib" type="java_classes">
-      <sourceRoot location="pcollections/pcollections-28apr2016.jar" />
+      <sourceRoot location="pcollections.jar" />
     </modelRoot>
   </models>
   <facets>
@@ -11,7 +11,7 @@
     </facet>
   </facets>
   <stubModelEntries>
-    <stubModelEntry path="${module}/lib/pcollections/pcollections-28apr2016.jar" />
+    <stubModelEntry path="${module}/lib/pcollections.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>