diff --git a/gradle.properties b/gradle.properties index 6c056af58a..380874839b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,14 +11,14 @@ jUnitPlatformVersion=1.8.2 jUnitVersion=4.13.2 kotlinJvmTarget=17 kotlinVersion=1.6.20 -lsp4jVersion=0.12.0 +lsp4jVersion=0.14.0 mwe2LaunchVersion=2.12.2 openTest4jVersion=1.2.0 resourcesVersion=3.16.0 -runtimeVersion=3.24.0 +runtimeVersion=3.25.0 shadowJarVersion=7.1.2 xtextGradleVersion=3.0.0 -xtextVersion=2.26.0 +xtextVersion=2.27.0 [manifestPropertyNames] org.eclipse.xtext=xtextVersion diff --git a/oomph/LinguaFranca.setup b/oomph/LinguaFranca.setup index 3e5685482b..74b68e8feb 100644 --- a/oomph/LinguaFranca.setup +++ b/oomph/LinguaFranca.setup @@ -161,7 +161,7 @@ name="org.eclipse.tm.terminal.feature.feature.group"/> + versionRange="2.27.0"/> Install the tools needed in the IDE to work with the source code for ${scope.project.label} @@ -302,10 +302,10 @@ versionRange="27.0.0"/> + versionRange="2.27.0"/> + versionRange="2.27.0"/> + url="http://download.eclipse.org/releases/2022-06"/> + url="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/> + url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/> - + - + - + diff --git a/org.lflang.tests/META-INF/MANIFEST.MF b/org.lflang.tests/META-INF/MANIFEST.MF index 51fe5e1a21..6955f40ff5 100644 --- a/org.lflang.tests/META-INF/MANIFEST.MF +++ b/org.lflang.tests/META-INF/MANIFEST.MF @@ -7,13 +7,13 @@ Bundle-Version: 0.2.2.qualifier Bundle-SymbolicName: org.lflang.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.lflang, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)", + org.junit.jupiter.api;bundle-version="5.8.1", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.27.0", javax.annotation;bundle-version="1.2.0", org.eclipse.core.jobs, org.opentest4j;bundle-version="1.2.0", - org.eclipse.lsp4j;bundle-version="0.10.0" + org.eclipse.lsp4j;bundle-version="0.14.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.lflang.tests;x-internal=true diff --git a/org.lflang.ui.tests/META-INF/MANIFEST.MF b/org.lflang.ui.tests/META-INF/MANIFEST.MF index dfe9bbf854..715a4b88c7 100644 --- a/org.lflang.ui.tests/META-INF/MANIFEST.MF +++ b/org.lflang.ui.tests/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-Version: 0.2.2.qualifier Bundle-SymbolicName: org.lflang.ui.tests; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.lflang.ui, - org.junit.jupiter.api;bundle-version="[5.0.0,6.0.0)", + org.junit.jupiter.api;bundle-version="5.8.1", org.eclipse.xtext.testing, org.eclipse.xtext.xbase.testing, org.eclipse.xtext.junit4, diff --git a/org.lflang.ui/META-INF/MANIFEST.MF b/org.lflang.ui/META-INF/MANIFEST.MF index acf968c32c..cfa1aa2256 100644 --- a/org.lflang.ui/META-INF/MANIFEST.MF +++ b/org.lflang.ui/META-INF/MANIFEST.MF @@ -16,7 +16,7 @@ Require-Bundle: org.lflang, org.eclipse.ui, org.eclipse.compare, org.eclipse.xtext.builder, - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.27.0", org.eclipse.ui.intro, org.eclipse.ui.intro.universal, org.eclipse.ui.console;bundle-version="3.10.100", diff --git a/org.lflang/META-INF/MANIFEST.MF b/org.lflang/META-INF/MANIFEST.MF index 6d52881818..a368d1e992 100644 --- a/org.lflang/META-INF/MANIFEST.MF +++ b/org.lflang/META-INF/MANIFEST.MF @@ -10,18 +10,18 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.xbase, org.eclipse.equinox.common;bundle-version="3.5.0", org.eclipse.emf.ecore, - org.eclipse.xtext.xbase.lib;bundle-version="2.26.0", + org.eclipse.xtext.xbase.lib;bundle-version="2.27.0", org.eclipse.xtext.util, org.eclipse.emf.common, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", com.google.guava, org.apache.commons.cli;bundle-version="1.4", org.jetbrains.kotlin.bundled-compiler;resolution:=optional, - org.eclipse.lsp4j;bundle-version="0.12.0", + org.eclipse.lsp4j;bundle-version="0.14.0", com.fasterxml.jackson.core.jackson-core, com.fasterxml.jackson.core.jackson-annotations, com.fasterxml.jackson.core.jackson-databind, - org.eclipse.core.runtime;bundle-version="3.23.0" + org.eclipse.core.runtime;bundle-version="3.25.0" Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.lflang, org.lflang.generator, diff --git a/pom.xml b/pom.xml index 4ae75400d3..59d927143d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,12 +19,16 @@ 1.4 1.6.20 - 0.12.0 - 2.12.2 - - 2.26.0 + + + + 3.25.0 + 2.27.0 + 0.14.0 + 2.13.0 + + 2.6.0 - 3.24.0 17