Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[all] Upgrade to Xtext 2.17.1.
close #904

Signed-off-by: Stéphane Galland <galland@arakhne.org>
  • Loading branch information
gallandarakhneorg committed Apr 9, 2019
1 parent c1420aa commit fa1771a
Show file tree
Hide file tree
Showing 22 changed files with 115 additions and 111 deletions.
Expand Up @@ -225,13 +225,13 @@
<import plugin="io.sarl.lang.core" version="0.9.0" match="greaterOrEqual"/>
<import plugin="io.sarl.eclipse" version="0.9.0" match="greaterOrEqual"/>
<import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.commands" version="3.9.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.jface" version="3.15.100" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.17.1" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
Expand Up @@ -12,7 +12,7 @@ Export-Package: io.sarl.experienceindex,
Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0",
io.sarl.eclipse;bundle-version="0.9.0",
io.sarl.lang.ui;bundle-version="0.9.0",
org.eclipse.xtext.ui;bundle-version="2.17.0",
org.eclipse.xtext.ui;bundle-version="2.17.1",
org.eclipse.osgi;bundle-version="3.13.300",
org.eclipse.core.commands;bundle-version="3.9.300",
org.eclipse.core.runtime;bundle-version="3.15.200",
Expand Down
Expand Up @@ -223,16 +223,16 @@

<requires>
<import plugin="io.sarl.lang" version="0.9.0" match="greaterOrEqual"/>
<import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
<import plugin="io.sarl.pythongenerator.generator" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.core" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.13.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.17.0" match="greaterOrEqual"/>
<import plugin="io.sarl.lang.ui" version="0.9.0" match="greaterOrEqual"/>
<import plugin="io.sarl.pythongenerator.generator" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.core" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.17.1" match="greaterOrEqual"/>
</requires>

<plugin
Expand Down
Expand Up @@ -13,10 +13,10 @@ Export-Package: io.sarl.pythongenerator.generator,
io.sarl.pythongenerator.generator.validator
Bundle-Activator: io.sarl.pythongenerator.generator.PyGeneratorPlugin
Require-Bundle: io.sarl.lang;bundle-version="0.9.0",
org.eclipse.xtext.common.types;bundle-version="2.17.0",
org.eclipse.xtext.xbase;bundle-version="2.17.0",
org.eclipse.xtext;bundle-version="2.17.0",
org.eclipse.xtend.core;bundle-version="2.17.0",
org.eclipse.xtext.common.types;bundle-version="2.17.1",
org.eclipse.xtext.xbase;bundle-version="2.17.1",
org.eclipse.xtext;bundle-version="2.17.1",
org.eclipse.xtend.core;bundle-version="2.17.1",
org.eclipse.core.runtime;bundle-version="3.15.200",
org.eclipse.core.resources;bundle-version="3.13.300"

Expand Up @@ -16,7 +16,7 @@ Bundle-Activator: io.sarl.pythongenerator.ui.PyGeneratorUiPlugin
Require-Bundle: io.sarl.lang;bundle-version="0.9.0",
io.sarl.lang.ui;bundle-version="0.9.0",
io.sarl.pythongenerator.generator;bundle-version="0.9.0",
org.eclipse.xtext.ui;bundle-version="2.17.0",
org.eclipse.xtext.ui;bundle-version="2.17.1",
org.eclipse.ui;bundle-version="3.112.0",
org.eclipse.core.runtime;bundle-version="3.15.200"

2 changes: 1 addition & 1 deletion formatting-styles/latex/sarl-beamer-listing.sty
Expand Up @@ -22,7 +22,7 @@
% limitations under the License.
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sarl-beamer-listing}[2019/04/05]
\ProvidesPackage{sarl-beamer-listing}[2019/04/09]
\newif\ifusesarlcolors\usesarlcolorstrue
\DeclareOption{sarlcolors}{\global\usesarlcolorstrue}
\DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse}
Expand Down
2 changes: 1 addition & 1 deletion formatting-styles/latex/sarl-colorized-listing.sty
Expand Up @@ -22,7 +22,7 @@
% limitations under the License.
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sarl-colorized-listing}[2019/04/05]
\ProvidesPackage{sarl-colorized-listing}[2019/04/09]
\newif\ifusesarlcolors\usesarlcolorstrue
\DeclareOption{sarlcolors}{\global\usesarlcolorstrue}
\DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse}
Expand Down
2 changes: 1 addition & 1 deletion formatting-styles/latex/sarl-listing.sty
Expand Up @@ -22,7 +22,7 @@
% limitations under the License.
%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{sarl-listing}[2019/04/05]
\ProvidesPackage{sarl-listing}[2019/04/09]
\newif\ifusesarlcolors\usesarlcolorstrue
\DeclareOption{sarlcolors}{\global\usesarlcolorstrue}
\DeclareOption{nosarlcolors}{\global\usesarlcolorsfalse}
Expand Down
8 changes: 4 additions & 4 deletions main/coreplugins/io.sarl.eclipse/META-INF/MANIFEST.MF
Expand Up @@ -8,10 +8,10 @@ Automatic-Module-Name: io.sarl.eclipse
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: io.sarl.lang.ui;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.xtend.core;bundle-version="2.17.0",
org.eclipse.xtext.ui;bundle-version="2.17.0",
org.eclipse.xtext.xbase.ui;bundle-version="2.17.0",
org.eclipse.xtext.common.types.ui;bundle-version="2.17.0",
org.eclipse.xtend.core;bundle-version="2.17.1",
org.eclipse.xtext.ui;bundle-version="2.17.1",
org.eclipse.xtext.xbase.ui;bundle-version="2.17.1",
org.eclipse.xtext.common.types.ui;bundle-version="2.17.1",
org.eclipse.ui.ide;bundle-version="3.15.0",
org.eclipse.core.filesystem;bundle-version="1.7.300",
org.eclipse.equinox.bidi;bundle-version="1.1.300",
Expand Down
3 changes: 1 addition & 2 deletions main/coreplugins/io.sarl.lang.core/META-INF/MANIFEST.MF
Expand Up @@ -6,12 +6,11 @@ Automatic-Module-Name: io.sarl.lang.core
Bundle-Version: 0.9.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.17.0";visibility:=reexport,
Require-Bundle: org.eclipse.xtext.xbase.lib;bundle-version="2.17.1";visibility:=reexport,
javax.inject;bundle-version="1.0.0"
Export-Package: io.sarl.bootstrap,
io.sarl.lang,
io.sarl.lang.annotation,
io.sarl.lang.bugfixes.pending.pr106,
io.sarl.lang.core,
io.sarl.lang.scoping.extensions.numbers.arithmetic,
io.sarl.lang.scoping.extensions.numbers.cast,
Expand Down
Expand Up @@ -94,7 +94,7 @@ public final class SARLVersion {

/** The minimal Xtext version to use SARL features.
*/
public static final String MINIMAL_XTEXT_VERSION = "2.17.0"; //$NON-NLS-1$
public static final String MINIMAL_XTEXT_VERSION = "2.17.1"; //$NON-NLS-1$

private SARLVersion() {
//
Expand Down
16 changes: 8 additions & 8 deletions main/coreplugins/io.sarl.lang.mwe2/META-INF/MANIFEST.MF
Expand Up @@ -8,14 +8,14 @@ Automatic-Module-Name: io.sarl.lang.mwe2
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0",
org.eclipse.xtext.generator;bundle-version="2.17.0",
org.eclipse.xtext.xbase.ui;bundle-version="2.17.0",
org.eclipse.xtext.ui;bundle-version="2.17.0",
org.eclipse.xtend.ide;bundle-version="2.17.0",
org.eclipse.xtext.common.types.ui;bundle-version="2.17.0",
org.eclipse.xtend.core;bundle-version="2.17.0",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.0",
org.eclipse.xtext.builder;bundle-version="2.17.0",
org.eclipse.xtext.generator;bundle-version="2.17.1",
org.eclipse.xtext.xbase.ui;bundle-version="2.17.1",
org.eclipse.xtext.ui;bundle-version="2.17.1",
org.eclipse.xtend.ide;bundle-version="2.17.1",
org.eclipse.xtext.common.types.ui;bundle-version="2.17.1",
org.eclipse.xtend.core;bundle-version="2.17.1",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.1",
org.eclipse.xtext.builder;bundle-version="2.17.1",
org.eclipse.emf.mwe2.launch;bundle-version="2.10.0",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.equinox.common;bundle-version="3.10.300",
Expand Down
16 changes: 8 additions & 8 deletions main/coreplugins/io.sarl.lang.ui/META-INF/MANIFEST.MF
Expand Up @@ -7,14 +7,14 @@ Bundle-SymbolicName: io.sarl.lang.ui; singleton:=true
Automatic-Module-Name: io.sarl.lang.ui
Bundle-ActivationPolicy: lazy
Require-Bundle: io.sarl.lang;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.xtext.ui;bundle-version="2.17.0",
org.eclipse.xtext.ui.shared;bundle-version="2.17.0",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.0",
org.eclipse.xtext.xbase.ui;bundle-version="2.17.0",
org.eclipse.xtext.builder;bundle-version="2.17.0",
org.eclipse.xtend.ide;bundle-version="2.17.0",
org.eclipse.xtend.core;bundle-version="2.17.0",
org.eclipse.xtext.common.types.ui;bundle-version="2.17.0",
org.eclipse.xtext.ui;bundle-version="2.17.1",
org.eclipse.xtext.ui.shared;bundle-version="2.17.1",
org.eclipse.xtext.ui.codetemplates.ui;bundle-version="2.17.1",
org.eclipse.xtext.xbase.ui;bundle-version="2.17.1",
org.eclipse.xtext.builder;bundle-version="2.17.1",
org.eclipse.xtend.ide;bundle-version="2.17.1",
org.eclipse.xtend.core;bundle-version="2.17.1",
org.eclipse.xtext.common.types.ui;bundle-version="2.17.1",
org.apache.log4j;bundle-version="1.2.15",
org.eclipse.jdt.core;bundle-version="3.17.0",
org.eclipse.jdt.ui;bundle-version="3.17.0",
Expand Down
12 changes: 6 additions & 6 deletions main/coreplugins/io.sarl.lang/META-INF/MANIFEST.MF
Expand Up @@ -8,12 +8,12 @@ Automatic-Module-Name: io.sarl.lang
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: io.sarl.lang.core;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.xtend.core;bundle-version="2.17.0",
org.eclipse.xtext;bundle-version="2.17.0",
org.eclipse.xtext.xbase;bundle-version="2.17.0",
org.eclipse.xtext.xbase.lib;bundle-version="2.17.0",
org.eclipse.xtext.common.types;bundle-version="2.17.0",
org.eclipse.xtext.util;bundle-version="2.17.0",
org.eclipse.xtend.core;bundle-version="2.17.1",
org.eclipse.xtext;bundle-version="2.17.1",
org.eclipse.xtext.xbase;bundle-version="2.17.1",
org.eclipse.xtext.xbase.lib;bundle-version="2.17.1",
org.eclipse.xtext.common.types;bundle-version="2.17.1",
org.eclipse.xtext.util;bundle-version="2.17.1",
org.eclipse.emf.codegen;bundle-version="2.15.0",
org.eclipse.osgi;bundle-version="3.13.300",
org.antlr.runtime;bundle-version="3.2.0",
Expand Down
Expand Up @@ -2219,8 +2219,9 @@ private void installJvmTypeProvider(ResourceSet resourceSet, File temporaryClass
progress.subTask(Messages.SarlBatchCompiler_58);
final Iterable<File> classpath;
if (temporaryClassDirectory != null) {
classpath = Iterables.concat(getClassPath(), getSourcePaths(),
Collections.singletonList(temporaryClassDirectory));
classpath = Iterables.concat(
Collections.singletonList(temporaryClassDirectory),
getClassPath(), getSourcePaths());
} else {
classpath = Iterables.concat(getClassPath(), getSourcePaths());
}
Expand Down
4 changes: 2 additions & 2 deletions main/coreplugins/io.sarl.m2e/META-INF/MANIFEST.MF
Expand Up @@ -9,8 +9,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-Activator: io.sarl.m2e.SARLMavenEclipsePlugin
Require-Bundle: io.sarl.eclipse;bundle-version="0.9.0",
org.eclipse.xtext.util;bundle-version="2.17.0",
org.eclipse.xtext.ui;bundle-version="2.17.0",
org.eclipse.xtext.util;bundle-version="2.17.1",
org.eclipse.xtext.ui;bundle-version="2.17.1",
org.eclipse.emf.common;bundle-version="2.15.0",
org.eclipse.emf.ecore;bundle-version="2.17.0",
org.eclipse.core.runtime;bundle-version="3.15.200",
Expand Down
55 changes: 28 additions & 27 deletions main/features/io.sarl.compiler/feature.xml
Expand Up @@ -223,25 +223,24 @@

<requires>
<import plugin="io.sarl.lang.core" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.core" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.lib" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.util" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.codegen" version="2.15.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
<import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common" version="2.15.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
<import plugin="org.slf4j.api" version="1.7.2" match="greaterOrEqual"/>
<import plugin="org.apache.commons.io" version="2.6.0" match="greaterOrEqual"/>
<import plugin="org.apache.log4j"/>
<import plugin="io.sarl.lang" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui.shared" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.ui" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.builder" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.ide" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types.ui" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.apache.log4j" version="1.2.15" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="3.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.compare" version="3.7.500" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug.ui" version="3.10.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.editors" version="3.11.400" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.forms" version="3.7.500" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui.codemining"/>
<import plugin="org.eclipse.core.runtime" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.emf.common" version="2.15.0" match="compatible"/>
Expand All @@ -250,6 +249,8 @@
<import plugin="org.eclipse.jdt.launching" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.6.0" match="compatible"/>
<import plugin="org.eclipse.text" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore" version="2.17.0" match="compatible"/>
<import plugin="org.eclipse.emf.codegen" version="2.15.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.15.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore" version="2.10.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common" version="2.10.1" match="greaterOrEqual"/>
Expand All @@ -266,20 +267,20 @@
<import plugin="org.eclipse.core.expressions" version="3.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.ide"/>
<import plugin="org.eclipse.xtend.lib" version="2.14.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.codegen" version="2.15.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.osgi" version="3.13.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.core" version="3.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.15.200" match="greaterOrEqual"/>
<import plugin="org.apache.commons.io" version="2.6.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.ui" version="3.17.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.compare" version="3.7.500" match="greaterOrEqual"/>
<import plugin="org.eclipse.jdt.debug.ui" version="3.10.200" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui" version="3.112.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.editors" version="3.11.400" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.forms" version="3.7.500" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore" version="2.17.0" match="compatible"/>
<import plugin="org.eclipse.emf.codegen" version="2.15.0" match="compatible"/>
<import plugin="org.eclipse.xtend.core" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.lib" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.util" version="2.17.1" match="greaterOrEqual"/>
<import plugin="com.google.inject" version="4.1.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui.shared" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui.codetemplates.ui" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.xbase.ui" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.builder" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtend.ide" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.common.types.ui" version="2.17.1" match="greaterOrEqual"/>
<import plugin="org.antlr.runtime" version="3.2.0" match="greaterOrEqual"/>
</requires>

Expand Down

0 comments on commit fa1771a

Please sign in to comment.