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.

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

Make Xtext compatible with Guava 31 #2671

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 org.eclipse.xtend.core.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Require-Bundle: org.eclipse.xtend.core,
org.eclipse.core.runtime;bundle-version="3.24.100",
org.eclipse.equinox.common;bundle-version="3.16.0",
org.eclipse.emf.codegen.ecore;bundle-version="2.29.0",
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
com.google.inject;bundle-version="5.0.1",
org.eclipse.core.resources;bundle-version="3.16.100",
org.eclipse.emf.ecore,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples-client
Bundle-Version: 2.31.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.31.0",
xtend-annotation-examples;bundle-version="2.4.3"
Bundle-Vendor: Eclipse Xtext
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-SymbolicName: xtend-annotation-examples
Bundle-Version: 2.31.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtend.lib,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.31.0",
org.junit;bundle-version="4.13.2",
org.eclipse.xtend.core,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.builder/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Export-Package: org.eclipse.xtext.builder,
Require-Bundle: org.eclipse.xtext,
org.eclipse.xtext.util,
org.eclipse.emf.ecore;bundle-version="2.26.0";visibility:=reexport,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
com.google.inject;bundle-version="5.0.1",
org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;x-installation:=greedy,
org.eclipse.jdt.core;bundle-version="3.29.0";resolution:=optional;x-installation:=greedy,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.xtext.common.types;visibility:=reexport,
org.eclipse.jdt.core.manipulation;bundle-version="1.16.0",
org.eclipse.xtext.smap;resolution:=optional;x-installation:=greedy,
org.eclipse.xtext.common.types.edit;resolution:=optional;visibility:=reexport;x-installation:=greedy,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
org.eclipse.ui.ide;bundle-version="3.13.1";resolution:=optional
Import-Package: org.apache.log4j;version="1.2.24"
Bundle-RequiredExecutionEnvironment: JavaSE-11
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.common.types/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Require-Bundle:
org.eclipse.xtext,
org.objectweb.asm;bundle-version="[9.5.0,9.6.0)",
org.eclipse.xtend.lib,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
io.github.classgraph;bundle-version="4.8.149"
Import-Package: org.apache.commons.logging;version="1.0.4";resolution:=optional,
org.apache.log4j;version="1.2.24"
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.testlanguages.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.xtext.testlanguages;visibility:=reexport,
org.eclipse.xtext.ui.codetemplates.ui,
org.eclipse.compare;bundle-version="3.8.300",
org.eclipse.xtend.lib;resolution:=optional,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
org.eclipse.core.runtime;bundle-version="3.24.100",
org.eclipse.ui.workbench;bundle-version="3.125.0";resolution:=optional,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.util/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Export-Package: org.eclipse.xtext.util;
org.eclipse.xtext.xbase,
org.eclipse.xtext.xbase.tests"
Require-Bundle: org.eclipse.emf.ecore;bundle-version="2.26.0",
com.google.guava;bundle-version="[30.1.0,31.0.0)";visibility:=reexport,
com.google.guava;bundle-version="[30.1.0,32.0.0)";visibility:=reexport,
com.google.inject;bundle-version="5.0.1";visibility:=reexport,
javax.inject;bundle-version="1.0.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.xtend.lib
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.junit/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-Version: 2.31.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
com.google.inject;bundle-version="5.0.1";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.emf.ecore;bundle-version="2.26.0";resolution:=optional;visibility:=reexport;x-installation:=greedy,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.lib.gwt/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Bundle-Version: 2.31.0.qualifier
Export-Package: org.eclipse.xtend2.lib,
org.eclipse.xtext.xbase.lib
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)"
Require-Bundle: com.google.guava;bundle-version="[30.1.0,32.0.0)"
Bundle-Vendor: %Vendor-Name
Automatic-Module-Name: org.eclipse.xtext.xbase.lib.gwt
Eclipse-SourceReferences: eclipseSourceReferences
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.lib/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Export-Package: org.eclipse.xtend2.lib;version="2.31.0",
org.eclipse.xtext.xbase.lib;version="2.31.0",
org.eclipse.xtext.xbase.lib.internal;x-internal:="true",
org.eclipse.xtext.xbase.lib.util;version="2.31.0"
Require-Bundle: com.google.guava;bundle-version="[30.1.0,31.0.0)";visibility:=reexport
Require-Bundle: com.google.guava;bundle-version="[30.1.0,32.0.0)";visibility:=reexport
Bundle-Vendor: Eclipse Xtext
Automatic-Module-Name: org.eclipse.xtext.xbase.lib
Eclipse-SourceReferences: eclipseSourceReferences
2 changes: 1 addition & 1 deletion org.eclipse.xtext.xbase.ui.testing/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Bundle-Version: 2.31.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport,
com.google.guava;bundle-version="[30.1.0,31.0.0)",
com.google.guava;bundle-version="[30.1.0,32.0.0)",
com.google.inject;bundle-version="5.0.1";visibility:=reexport,
org.eclipse.core.resources;bundle-version="3.16.100";resolution:=optional;visibility:=reexport;x-installation:=greedy,
org.eclipse.xtext.ui;resolution:=optional;visibility:=reexport;x-installation:=greedy,
Expand Down
4 changes: 2 additions & 2 deletions xtext-latest.target
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
<repository location="https://download.eclipse.org/oomph/simrel-orbit/2023-06"/>
<unit id="org.apache.log4j" version="1.2.24.v20221221-2012"/>
<unit id="org.kohsuke.args4j" version="0.0.0"/>
<unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
<unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
<unit id="com.google.gson" version="2.10.1"/>
<unit id="com.google.guava" version="31.1.0.jre"/>
<unit id="com.google.inject" version="5.0.1.v20221112-0806" />
<unit id="javax.inject" version="1.0.0.v20220405-0441"/>
<unit id="org.antlr.runtime" version="3.2.0.v20220404-1927"/>
Expand Down