Merge pull request #2263 from soerendomroes/sdo/klighdUpdate

Klighd upgraded to v3.0.1
lf-lang · Apr 26, 2024 · 0f9fa03 · 0f9fa03
2 parents f840daa + ac5311d
commit 0f9fa03
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 17 deletions.
diff --git a/cli/lfd/build.gradle b/cli/lfd/build.gradle
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation project(':cli:base')
-    implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
+    implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.setup:$klighdVersion") {
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
     implementation("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.piccolo:${klighdVersion}") {

diff --git a/cli/lfd/src/main/java/org/lflang/cli/Lfd.java b/cli/lfd/src/main/java/org/lflang/cli/Lfd.java
@@ -2,7 +2,7 @@
 
 import de.cau.cs.kieler.klighd.Klighd;
 import de.cau.cs.kieler.klighd.LightDiagramServices;
-import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup;
+import de.cau.cs.kieler.klighd.setup.KlighdStandaloneSetup;
 import java.nio.file.Path;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.ecore.resource.Resource;

diff --git a/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java b/cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
@@ -4,7 +4,7 @@
 import com.google.inject.Provider;
 import de.cau.cs.kieler.klighd.Klighd;
 import de.cau.cs.kieler.klighd.LightDiagramServices;
-import de.cau.cs.kieler.klighd.standalone.KlighdStandaloneSetup;
+import de.cau.cs.kieler.klighd.setup.KlighdStandaloneSetup;
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;

diff --git a/core/build.gradle b/core/build.gradle
@@ -29,7 +29,7 @@ dependencies {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
         exclude group: 'de.cau.cs.kieler.swt.mock'
     }
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.standalone:$klighdVersion") {
+    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.setup:$klighdVersion") {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
         exclude group: 'de.cau.cs.kieler.swt.mock'

diff --git a/core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java b/core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
@@ -180,7 +180,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
@@ -213,7 +213,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
 
@@ -246,7 +246,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
         // During crossing minimization 10 node order violations are regarded as important as 1 edge
@@ -274,7 +274,7 @@ public void configureReactor(KNode node) {
         DiagramSyntheses.setLayoutOption(
             node,
             LayeredOptions.CONSIDER_MODEL_ORDER_COMPONENTS,
-            ComponentOrderingStrategy.FORCE_MODEL_ORDER);
+            ComponentOrderingStrategy.MODEL_ORDER);
         DiagramSyntheses.setLayoutOption(
             node, LayeredOptions.COMPACTION_CONNECTED_COMPONENTS, true);
         // Disable all kinds of crossing minimization entirely. Just take what is in the model and

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ openTest4jVersion=1.2.0
 picocliVersion=4.7.0
 resourcesVersion=3.19.0
 xtextVersion=2.34.0
-klighdVersion=2.3.0.v20230606
+klighdVersion=3.0.1.v20240410
 freehepVersion=2.4
 swtVersion=3.124.0
 spotbugsToolVersion=4.7.3

diff --git a/lsp/build.gradle b/lsp/build.gradle
@@ -10,13 +10,6 @@ dependencies {
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
         exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
     }
-
-    // This dependency ensures correct animations and bookkeeping during updates
-    // See https://github.com/lf-lang/vscode-lingua-franca/issues/103#issuecomment-1731023470
-    implementation ("de.cau.cs.kieler.klighd:de.cau.cs.kieler.klighd.incremental:$klighdVersion") {
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt.*'
-        exclude group: 'org.eclipse.platform', module: 'org.eclipse.swt'
-    }
 }
 
 application {