Merge pull request #738 from JetBrains/feature/upgrade_emf_dependenci…

…es_2022.2

Upgrade ELK dependencies to latest versions

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project are documented in this file.
 Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). 
 The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.
 
+## January 2024
+
+### Changed
+
+- de.itemis.editor.diagram: The ELK dependencies were updated to the latest version.
+
 ## December 2023
 
 ### Fixed

build.gradle

@@ -14,7 +14,7 @@ import java.time.LocalDateTime
 
 
 wrapper {
-    gradleVersion '7.4.1'
+    gradleVersion '8.5'
     distributionType 'all'
 }
 
@@ -174,15 +174,44 @@ task copyModelApi() {
 
 // -----------------------------------------
 
-// Ant support
+
 configurations {
     ant_lib
+    diagram_lib
 }
 
 dependencies {
     ant_lib "org.apache.ant:ant-junit:1.10.9"
+
+    def elkVersion = "0.9.0"
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.common:$elkVersion") {
+        transitive = false
+    }
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.layered:$elkVersion") {
+        transitive = false
+    }
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.alg.mrtree:$elkVersion") {
+        transitive = false
+    }
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.core:$elkVersion") {
+        transitive = false
+    }
+    diagram_lib ("org.eclipse.elk:org.eclipse.elk.graph:$elkVersion") {
+        transitive = false
+    }
+    diagram_lib ("org.eclipse.emf:org.eclipse.emf.common:2.29.0") {
+        transitive = false
+    }
+    diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore:2.35.0") {
+        transitive = false
+    }
+    diagram_lib ("org.eclipse.emf:org.eclipse.emf.ecore.xmi:2.36.0") {
+        transitive = false
+    }
 }
 
+configurations.diagram_lib.attributes.attribute(Attribute.of('org.gradle.jvm.environment', String), 'standard-jvm')
+
 ext.buildScriptClasspath = project.configurations.ant_lib.fileCollection({
     true
 })
@@ -226,10 +255,27 @@ afterEvaluate {
 ext["itemis.mps.gradle.ant.defaultScriptArgs"] = defaultScriptArgs
 ext["itemis.mps.gradle.ant.defaultScriptClasspath"] = buildScriptClasspath
 
+task resolved_diagram_dependencies(type: Copy) {
+    from configurations.diagram_lib
+    into file('code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/lib')
+
+    // Strip version numbers from file names
+    rename { filename ->
+        def ra = configurations.diagram_lib.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 build_allScripts(type: BuildLanguages, dependsOn: [
         'downloadJbr',
 		resolveMps,
+        resolved_diagram_dependencies,
         copyModelApi,
 ]) {
     script "$rootDir/scripts/build.xml"
@@ -284,13 +330,13 @@ dependencies {
 }
 
 task packageAllScripts(type: Zip, dependsOn: run_tests) {
-    baseName 'de.itemis.mps.extensions.allScripts'
+    archiveBaseName = 'de.itemis.mps.extensions.allScripts'
     from artifactsDir
     include 'de.itemis.mps.extensions.allScripts/**'
 }
 
 task packageExtensions(type: Zip, dependsOn: run_tests) {
-    baseName 'de.itemis.mps.extensions'
+    archiveBaseName = 'de.itemis.mps.extensions'
     from artifactsDir
     include 'de.itemis.mps.extensions/**'
 }

code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/de.itemis.mps.editor.diagram.runtime.msd

@@ -6,14 +6,14 @@
     </modelRoot>
     <modelRoot contentPath="${module}" type="java_classes">
       <sourceRoot location="lib/jgraphx.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.common-2.12.0.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.ecore.xmi-2.12.0.jar" />
-      <sourceRoot location="lib/org.eclipse.emf.ecore-2.12.0.jar" />
-      <sourceRoot location="lib/org.eclipse.elk.alg.common_0.9.0.202206130225.jar" />
-      <sourceRoot location="lib/org.eclipse.elk.alg.layered_0.9.0.202206130225.jar" />
-      <sourceRoot location="lib/org.eclipse.elk.alg.mrtree_0.9.0.202206130225.jar" />
-      <sourceRoot location="lib/org.eclipse.elk.core_0.9.0.202206130225.jar" />
-      <sourceRoot location="lib/org.eclipse.elk.graph_0.9.0.202206130225.jar" />
+      <sourceRoot location="lib/org.eclipse.elk.alg.common.jar" />
+      <sourceRoot location="lib/org.eclipse.elk.alg.layered.jar" />
+      <sourceRoot location="lib/org.eclipse.elk.alg.mrtree.jar" />
+      <sourceRoot location="lib/org.eclipse.elk.core.jar" />
+      <sourceRoot location="lib/org.eclipse.elk.graph.jar" />
+      <sourceRoot location="lib/org.eclipse.emf.common.jar" />
+      <sourceRoot location="lib/org.eclipse.emf.ecore.jar" />
+      <sourceRoot location="lib/org.eclipse.emf.ecore.xmi.jar" />
     </modelRoot>
   </models>
   <facets>
@@ -23,14 +23,14 @@
   </facets>
   <stubModelEntries>
     <stubModelEntry path="${module}/lib/jgraphx.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.common-2.12.0.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore-2.12.0.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xmi-2.12.0.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.elk.alg.common_0.9.0.202206130225.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.elk.alg.layered_0.9.0.202206130225.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.elk.alg.mrtree_0.9.0.202206130225.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.elk.core_0.9.0.202206130225.jar" />
-    <stubModelEntry path="${module}/lib/org.eclipse.elk.graph_0.9.0.202206130225.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.elk.alg.common.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.elk.alg.layered.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.elk.alg.mrtree.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.elk.core.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.elk.graph.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.emf.common.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.jar" />
+    <stubModelEntry path="${module}/lib/org.eclipse.emf.ecore.xmi.jar" />
   </stubModelEntries>
   <sourcePath />
   <dependencies>

code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps

@@ -20050,7 +20050,7 @@
           </node>
           <node concept="2ZW3vV" id="6AOK6Kqo1m_" role="3clFbw">
             <node concept="3uibUv" id="6AOK6Kqo8Pu" role="2ZW6by">
-              <ref role="3uigEE" to="zn9m:~IconLoader$CachedImageIcon" resolve="CachedImageIcon" />
+              <ref role="3uigEE" to="zn9m:~IconLoader$CachedImageIcon" resolve="IconLoader.CachedImageIcon" />
             </node>
             <node concept="37vLTw" id="6AOK6KqnNL_" role="2ZW6bz">
               <ref role="3cqZAo" node="7G3a7fDffCg" resolve="icon" />