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

bump to xtext 2.34 #282

Merged
merged 1 commit into from
Dec 30, 2023
Merged

bump to xtext 2.34 #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 features/org.eclipse.emf.mwe2.language.sdk-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ SPDX-License-Identifier: EPL-2.0
version="0.0.0"/>

<requires>
<import feature="org.eclipse.xtext.ui" version="2.32.0" match="compatible"/>
<import feature="org.eclipse.xtext.ui" version="2.34.0" match="compatible"/>
</requires>

<plugin
Expand Down
6 changes: 3 additions & 3 deletions features/org.eclipse.emf.mwe2.launcher-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ SPDX-License-Identifier: EPL-2.0
<import plugin="org.eclipse.emf.mwe2.runtime" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.mwe2.lib" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.mwe.utils" version="1.11.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.32.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types" version="2.32.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase" version="2.32.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.34.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types" version="2.34.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase" version="2.34.0" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="7.0.0" match="greaterOrEqual"/>
<import plugin="com.google.guava" version="33.0.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime"/>
Expand Down
2 changes: 1 addition & 1 deletion ...rg.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target/org.eclipse.emf.mwe2.target.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<unit id="org.eclipse.xtext.testing" version="0.0.0"/>
<unit id="org.eclipse.xtext.ui.testing" version="0.0.0"/>
<unit id="org.eclipse.xtext.xtext.generator" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/milestones/2.34.0.M0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
Expand Down
6 changes: 3 additions & 3 deletions plugins/org.eclipse.emf.mwe2.language/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ Require-Bundle: org.eclipse.emf.ecore,
org.objectweb.asm;bundle-version="[6.1.1,10.0.0)";resolution:=optional,
org.eclipse.equinox.common;bundle-version="3.16.0",
com.google.inject;bundle-version="7.0.0",
org.eclipse.xtext;bundle-version="2.32.0",
org.eclipse.xtext.common.types;bundle-version="2.32.0";visibility:=reexport,
org.eclipse.xtext;bundle-version="2.34.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like we should restrict all Xtext bundles to 2.34 and above to guide the P2 resolver. I'll do that after landing this MR.

org.eclipse.xtext.common.types;bundle-version="2.34.0";visibility:=reexport,
org.eclipse.xtext.util,
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
org.eclipse.xtext.xbase.lib;bundle-version="2.32.0"
org.eclipse.xtext.xbase.lib;bundle-version="2.34.0"
Import-Package: org.apache.log4j;version="1.2.24"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.emf.mwe2.language,
Expand Down