Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Klighd upgraded to v3.0.1 #2263

Merged
merged 5 commits into from
Apr 26, 2024
+10 −17
Merged

Klighd upgraded to v3.0.1 #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1360e50
Updated to Klighd 3.0.1
soerendomroes Apr 21, 2024
7b74832
Merge branch 'master' into sdo/klighdUpdate
lhstrh Apr 23, 2024
8767411
Adapted to move of KlighdStandaloneSetup to klighd.setup.
soerendomroes Apr 24, 2024
45dbbe0
Removed klighd.incremental dependency since it is no longer necessary.
soerendomroes Apr 24, 2024
ac5311d
Bump reactor-c
lhstrh Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/lfd/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}") {
Expand Down
2 changes: 1 addition & 1 deletion cli/lfd/src/main/java/org/lflang/cli/Lfd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cli/lfd/src/test/java/org/lflang/cli/DiagramGenerationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/org/lflang/diagram/synthesis/util/LayoutPostProcessing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/lib/c/reactor-c
Open in desktop
Submodule reactor-c updated 22 files
+1 −1 core/CMakeLists.txt
+10 −12 core/clock.c
+1 −6 core/federated/RTI/main.c
+16 −13 core/federated/clock-sync.c
+4 −0 core/federated/network/net_util.c
+8 −3 include/core/federated/clock-sync.h
+57 −1 low_level_platform/api/low_level_platform.h
+0 −44 low_level_platform/api/platform/lf_C11_threads_support.h
+0 −5 low_level_platform/api/platform/lf_linux_support.h
+0 −5 low_level_platform/api/platform/lf_macos_support.h
+8 −0 low_level_platform/api/platform/lf_platform_util.h
+1 −3 low_level_platform/impl/CMakeLists.txt
+0 −68 low_level_platform/impl/src/lf_C11_threads_support.c
+5 −0 low_level_platform/impl/src/lf_POSIX_threads_support.c
+86 −11 low_level_platform/impl/src/lf_linux_support.c
+10 −8 low_level_platform/impl/src/lf_macos_support.c
+25 −0 low_level_platform/impl/src/lf_platform_util.c
+0 −16 low_level_platform/impl/src/lf_unix_syscall_support.c
+9 −0 low_level_platform/impl/src/lf_windows_support.c
+51 −0 low_level_platform/impl/src/lf_zephyr_support.c
+0 −13 low_level_platform/impl/src/platform_internal.c
+1 −1 test/Tests.cmake
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 0 additions & 7 deletions lsp/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading