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

Jump to bottom

Upgrade to Xtext 2.27.0 and Lsp4j 0.14.0 #1234

Merged
merged 14 commits into from
Jun 27, 2022
Merged

Upgrade to Xtext 2.27.0 and Lsp4j 0.14.0 #1234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
55181d9
Bump Xtext, downgrade Eclipse runtime version
lhstrh Jun 15, 2022
ec0012f
Downgrading Xtext again because 2.27.0 cannot be found on Maven Central
lhstrh Jun 15, 2022
d694b00
Apply suggestions from code review
lhstrh Jun 15, 2022
284217a
Revert "Apply suggestions from code review " This reverts commit d69…
lhstrh Jun 17, 2022
0960073
Revert "Downgrading Xtext again because 2.27.0 cannot be found on Mav…
lhstrh Jun 17, 2022
930ccb1
Bump lsp4j to 0.14.0
lhstrh Jun 17, 2022
c3d964f
Bump Eclipse runtime to 3.25.0
lhstrh Jun 18, 2022
b6badd5
Updated update sites for xtext and eclipse in target platform
a-sr Jun 21, 2022
e629cea
Updated dependencies in oomph setup
a-sr Jun 21, 2022
4ad782b
Downgraded junit.jupiter dependency to 5.8.1
a-sr Jun 21, 2022
7b2b5f4
Updated mwe2 launch version in accordance with new target platform
a-sr Jun 21, 2022
6f17c45
Added a few comments to the pom file to prevent future problems with the
a-sr Jun 21, 2022
cc43cf0
Merge branch 'master' into version-updates
lhstrh Jun 24, 2022
4917bfd
Update org.lflang.diagram/META-INF/MANIFEST.MF
lhstrh Jun 24, 2022
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
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions oomph/LinguaFranca.setup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
name="org.eclipse.tm.terminal.feature.feature.group"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="2.26.0"/>
versionRange="2.27.0"/>
<repository
url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
<description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
Expand Down Expand Up @@ -302,10 +302,10 @@
versionRange="27.0.0"/>
<requirement
name="org.eclipse.xtext.runtime.feature.group"
versionRange="2.26.0"/>
versionRange="2.27.0"/>
<requirement
name="org.eclipse.xtext.sdk.feature.group"
versionRange="2.26.0"/>
versionRange="2.27.0"/>
<requirement
name="org.eclipse.platform.source.feature.group"/>
<requirement
Expand Down Expand Up @@ -349,11 +349,11 @@
<repositoryList
name="DefaultRepositories">
<repository
url="http://download.eclipse.org/releases/2022-03"/>
url="http://download.eclipse.org/releases/2022-06"/>
<repository
url="http://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
url="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
<repository
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/"/>
url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
<repository
url="http://download.eclipse.org/elk/updates/releases/0.8.1/"/>
<repository
Expand Down
8 changes: 4 additions & 4 deletions org.lflang.diagram/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ Require-Bundle: de.cau.cs.kieler.klighd;bundle-version="2.0.0",
org.eclipse.xtext.xbase.lib,
org.eclipse.elk.core;bundle-version="0.8.1",
org.eclipse.elk.alg.layered;bundle-version="0.8.1",
org.eclipse.core.resources;bundle-version="3.13.900",
org.eclipse.core.resources;bundle-version="3.16.0",
lhstrh marked this conversation as resolved.
Show resolved Hide resolved
org.lflang;bundle-version="0.1.0",
org.lflang.ide;bundle-version="0.1.0",
org.eclipse.xtext.ide;bundle-version="2.26.0",
org.eclipse.lsp4j;bundle-version="0.12.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.12.0",
org.eclipse.xtext.ide;bundle-version="2.27.0",
org.eclipse.lsp4j;bundle-version="0.14.0",
org.eclipse.lsp4j.jsonrpc;bundle-version="0.14.0",
org.eclipse.sprotty;bundle-version="0.9.0"
Bundle-Vendor: University of California, Berkeley
6 changes: 3 additions & 3 deletions org.lflang.targetplatform/org.lflang.targetplatform.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@
<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
<repository location="http://download.eclipse.org/releases/2022-03"/>
<repository location="http://download.eclipse.org/releases/2022-06"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.eclipse.xtext.runtime.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.ui.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.26.0/"/>
<repository location="http://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.27.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="com.google.inject" version="0.0.0"/>
<unit id="jakarta.activation" version="0.0.0"/>
<unit id="javax.activation" version="0.0.0"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository/"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
<unit id="org.jetbrains.kotlin.feature.feature.group" version="0.0.0"/>
Expand Down
6 changes: 3 additions & 3 deletions org.lflang.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion org.lflang.ui.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion org.lflang.ui/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions org.lflang/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
14 changes: 9 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,16 @@
<commonsCliVersion>1.4</commonsCliVersion>
<!-- Note that this version is tied to our version of Gradle -->
<kotlinVersion>1.6.20</kotlinVersion>
<lsp4jVersion>0.12.0</lsp4jVersion>
<mwe2LaunchVersion>2.12.2</mwe2LaunchVersion>
<!-- When the Eclipse p2 site is updated to a new version of Eclipse, then update the xtextVersion. -->
<xtextVersion>2.26.0</xtextVersion>

<!-- Eclipse specific components -->
<!-- Important: Any version specified for these plugins must be available via the update sites listed in the target platform definition. If not, the Epoch build will fail! You can find the target platform definition in org.lflang.targetplatform/org.lflang.targetplatform.target. Changes to the target platform should also be transferred to the oomph setup (oomph/LinguaFranca.setup). -->
<runtimeVersion>3.25.0</runtimeVersion> <!-- This version reflects the actual Eclipse release (e.g. 3.25 -> 2022-06) -->
<xtextVersion>2.27.0</xtextVersion>
<lsp4jVersion>0.14.0</lsp4jVersion> <!-- This plugin is provided by Xtext -->
<mwe2LaunchVersion>2.13.0</mwe2LaunchVersion> <!-- This plugin is provided by Eclipse, not Xtext -->

<!-- Tycho version used by Maven (Eclipse specific build support)-->
<tychoVersion>2.6.0</tychoVersion>
<runtimeVersion>3.24.0</runtimeVersion>

<!-- Maven only properties -->
<maven.compiler.source>17</maven.compiler.source>
Expand Down