sigmasternchen/xtext-core
1
0
Fork 0
mirror of https://github.com/sigmasternchen/xtext-core synced 2025-03-15 08:18:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[eclipse/xtext#1649] update to ASM 8.0

Browse source 
Signed-off-by: Christian Dietrich <christian.dietrich@itemis.de>
This commit is contained in:
Christian Dietrich 2020-03-30 15:20:15 +02:00
parent c0a8631f7b
commit 4ac89676f9
12 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.full/org.xtext.example.full.parent/org.xtext.example.full.target/org.xtext.example.full.target.target vendored
View file

@ -22,8 +22,8 @@
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/> <unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
</location> </location>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoApp/org.xtext.example.lsMavenTychoApp.parent/org.xtext.example.lsMavenTychoApp.target/org.xtext.example.lsMavenTychoApp.target.target vendored
View file

@ -22,8 +22,8 @@
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/> <unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
</location> </location>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.lsMavenTychoFatjar/org.xtext.example.lsMavenTychoFatjar.parent/org.xtext.example.lsMavenTychoFatjar.target/org.xtext.example.lsMavenTychoFatjar.target.target vendored
View file

@ -22,8 +22,8 @@
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/> <unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
</location> </location>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTycho/org.xtext.example.mavenTycho.parent/org.xtext.example.mavenTycho.target/org.xtext.example.mavenTycho.target.target vendored
View file

@ -22,8 +22,8 @@
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/> <unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
</location> </location>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoJ9/org.xtext.example.mavenTychoJ9.parent/org.xtext.example.mavenTychoJ9.target/org.xtext.example.mavenTychoJ9.target.target vendored
View file

@ -22,8 +22,8 @@
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/> <unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
</location> </location>

4
org.eclipse.xtext.tests/testdata/wizard-expectations/org.xtext.example.mavenTychoP2/org.xtext.example.mavenTychoP2.parent/org.xtext.example.mavenTychoP2.target/org.xtext.example.mavenTychoP2.target.target vendored
View file

@ -22,8 +22,8 @@
<unit id="com.google.gson" version="2.8.2.v20180104-1110"/> <unit id="com.google.gson" version="2.8.2.v20180104-1110"/>
<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/> <unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
<unit id="org.junit" version="4.12.0.v201504281640"/> <unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
</location> </location>

4
org.eclipse.xtext.xtext.generator/src/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.xtend
View file

@ -49,13 +49,13 @@ class TypesGeneratorFragment2 extends AbstractXtextGeneratorFragment {
if (projectConfig.runtime.manifest !== null) { if (projectConfig.runtime.manifest !== null) {
projectConfig.runtime.manifest.requiredBundles.addAll( projectConfig.runtime.manifest.requiredBundles.addAll(
'org.eclipse.xtext.common.types', 'org.eclipse.xtext.common.types',
'org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional' 'org.objectweb.asm;bundle-version="[8.0.1,8.1.0)";resolution:=optional'
) )
} }
if (projectConfig.runtimeTest.manifest !== null) { if (projectConfig.runtimeTest.manifest !== null) {
projectConfig.runtimeTest.manifest.requiredBundles.add( projectConfig.runtimeTest.manifest.requiredBundles.add(
'org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional' 'org.objectweb.asm;bundle-version="[8.0.1,8.1.0)";resolution:=optional'
) )
} }

4
org.eclipse.xtext.xtext.generator/xtend-gen/org/eclipse/xtext/xtext/generator/types/TypesGeneratorFragment2.java
View file

@ -51,13 +51,13 @@ public class TypesGeneratorFragment2 extends AbstractXtextGeneratorFragment {
if (_tripleNotEquals) { if (_tripleNotEquals) {
CollectionExtensions.<String>addAll(this.getProjectConfig().getRuntime().getManifest().getRequiredBundles(), CollectionExtensions.<String>addAll(this.getProjectConfig().getRuntime().getManifest().getRequiredBundles(),
"org.eclipse.xtext.common.types", "org.eclipse.xtext.common.types",
"org.objectweb.asm;bundle-version=\"[7.2.0,7.3.0)\";resolution:=optional"); "org.objectweb.asm;bundle-version=\"[8.0.1,8.1.0)\";resolution:=optional");
} }
ManifestAccess _manifest_1 = this.getProjectConfig().getRuntimeTest().getManifest(); ManifestAccess _manifest_1 = this.getProjectConfig().getRuntimeTest().getManifest();
boolean _tripleNotEquals_1 = (_manifest_1 != null); boolean _tripleNotEquals_1 = (_manifest_1 != null);
if (_tripleNotEquals_1) { if (_tripleNotEquals_1) {
this.getProjectConfig().getRuntimeTest().getManifest().getRequiredBundles().add( this.getProjectConfig().getRuntimeTest().getManifest().getRequiredBundles().add(
"org.objectweb.asm;bundle-version=\"[7.2.0,7.3.0)\";resolution:=optional"); "org.objectweb.asm;bundle-version=\"[8.0.1,8.1.0)\";resolution:=optional");
} }
ManifestAccess _manifest_2 = this.getProjectConfig().getEclipsePlugin().getManifest(); ManifestAccess _manifest_2 = this.getProjectConfig().getEclipsePlugin().getManifest();
boolean _tripleNotEquals_2 = (_manifest_2 != null); boolean _tripleNotEquals_2 = (_manifest_2 != null);

4
org.eclipse.xtext.xtext.wizard/src/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.xtend
View file

@ -89,8 +89,8 @@ class TargetPlatformProject extends ProjectDescriptor {
<unit id="org.junit.platform.runner" version="1.6.0.v20200203-2009"/> <unit id="org.junit.platform.runner" version="1.6.0.v20200203-2009"/>
<unit id="org.opentest4j" version="1.2.0.v20190826-0900"/> <unit id="org.opentest4j" version="1.2.0.v20190826-0900"/>
«ENDIF» «ENDIF»
<unit id="org.objectweb.asm" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm" version="8.0.1.v20200420-1007"/>
<unit id="org.objectweb.asm.tree" version="7.2.0.v20191010-1910"/> <unit id="org.objectweb.asm.tree" version="8.0.1.v20200420-1007"/>
<unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/> <unit id="io.github.classgraph" version="4.8.35.v20190528-1517"/>
<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/> <repository location="https://download.eclipse.org/tools/orbit/downloads/2020-06"/>
</location> </location>

4
org.eclipse.xtext.xtext.wizard/xtend-gen/org/eclipse/xtext/xtext/wizard/TargetPlatformProject.java
View file

@ -207,10 +207,10 @@ public class TargetPlatformProject extends ProjectDescriptor {
} }
} }
_builder.append("\t\t\t"); _builder.append("\t\t\t");
_builder.append("<unit id=\"org.objectweb.asm\" version=\"7.2.0.v20191010-1910\"/>"); _builder.append("<unit id=\"org.objectweb.asm\" version=\"8.0.1.v20200420-1007\"/>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t\t"); _builder.append("\t\t\t");
_builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"7.2.0.v20191010-1910\"/>"); _builder.append("<unit id=\"org.objectweb.asm.tree\" version=\"8.0.1.v20200420-1007\"/>");
_builder.newLine(); _builder.newLine();
_builder.append("\t\t\t"); _builder.append("\t\t\t");
_builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.35.v20190528-1517\"/>"); _builder.append("<unit id=\"io.github.classgraph\" version=\"4.8.35.v20190528-1517\"/>");

2
org.eclipse.xtext/META-INF/MANIFEST.MF
View file

@ -236,7 +236,7 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.16.0";visibility:=re
org.eclipse.emf.common;bundle-version="2.17.0", org.eclipse.emf.common;bundle-version="2.17.0",
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)";visibility:=reexport,
com.google.inject;bundle-version="3.0.0";visibility:=reexport, com.google.inject;bundle-version="3.0.0";visibility:=reexport,
org.objectweb.asm;bundle-version="[7.2.0,7.3.0)";resolution:=optional, org.objectweb.asm;bundle-version="[8.0.1,8.1.0)";resolution:=optional,
org.eclipse.emf.mwe.core;bundle-version="1.3.21";resolution:=optional;visibility:=reexport, org.eclipse.emf.mwe.core;bundle-version="1.3.21";resolution:=optional;visibility:=reexport,
org.eclipse.emf.mwe.utils;bundle-version="1.3.21";resolution:=optional;visibility:=reexport, org.eclipse.emf.mwe.utils;bundle-version="1.3.21";resolution:=optional;visibility:=reexport,
org.eclipse.xtend;bundle-version="2.2.0";resolution:=optional, org.eclipse.xtend;bundle-version="2.2.0";resolution:=optional,

4
org.eclipse.xtext/src/org/eclipse/xtext/generator/trace/TraceAsPrimarySourceInstaller.java
View file

@ -36,7 +36,7 @@ public class TraceAsPrimarySourceInstaller implements ITraceToBytecodeInstaller
private final int[] target2source; private final int[] target2source;
public XtextClassAdapter(ClassVisitor cv, String sourceFile, int[] target2source, boolean hideSyntheticVariables) { public XtextClassAdapter(ClassVisitor cv, String sourceFile, int[] target2source, boolean hideSyntheticVariables) {
super(Opcodes.ASM7, cv); super(Opcodes.ASM8, cv);
this.sourceFile = sourceFile; this.sourceFile = sourceFile;
this.target2source = target2source; this.target2source = target2source;
this.hideSyntheticVariables = hideSyntheticVariables; this.hideSyntheticVariables = hideSyntheticVariables;
@ -70,7 +70,7 @@ public class TraceAsPrimarySourceInstaller implements ITraceToBytecodeInstaller
private XtextClassAdapter context; private XtextClassAdapter context;
public XtextMethodAdapter(XtextClassAdapter context, MethodVisitor delegate) { public XtextMethodAdapter(XtextClassAdapter context, MethodVisitor delegate) {
super(Opcodes.ASM7, delegate); super(Opcodes.ASM8, delegate);
this.context = context; this.context = context;
} }