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

better workaround for inlineJsrBytecode jdt removal #3198

Merged
merged 1 commit into from
Sep 17, 2024
+4 −21
Merged

better workaround for inlineJsrBytecode jdt removal #3198

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
4 changes: 1 addition & 3 deletions org.eclipse.xtext.java/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0",
org.eclipse.xtend.lib;bundle-version="2.37.0",
org.eclipse.jdt.core;bundle-version="3.29.0",
org.eclipse.emf.common;bundle-version="2.24.0",
org.eclipse.emf.ecore;bundle-version="2.26.0",
org.eclipse.core.runtime;visibility:=reexport,
org.eclipse.core.resources;visibility:=reexport
org.eclipse.emf.ecore;bundle-version="2.26.0"
Export-Package: org.eclipse.xtext.java;version="2.37.0",
org.eclipse.xtext.java.resource;version="2.37.0"
Import-Package: org.apache.log4j;version="1.2.24"
Expand Down
8 changes: 1 addition & 7 deletions org.eclipse.xtext.java/src/org/eclipse/xtext/java/resource/JavaDerivedStateComputer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.ClassFile;
import org.eclipse.jdt.internal.compiler.CompilationResult;
Expand Down Expand Up @@ -56,7 +55,6 @@
import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.xbase.lib.Exceptions;
import org.eclipse.xtext.xbase.lib.Procedures.Procedure2;
import org.osgi.framework.Version;

import com.google.inject.Inject;

Expand Down Expand Up @@ -304,11 +302,7 @@ protected CompilerOptions getCompilerOptions(JavaConfig javaConfig) {
private final static MethodHandle INLINE_JSR_BYTECODE = findInlineJsrBytecode();
private static MethodHandle findInlineJsrBytecode() {
try {
if (JavaCore.getPlugin().getBundle().getVersion().compareTo(new Version(3, 39, 100)) >= 0) {
return null;
} else {
return MethodHandles.lookup().findSetter(CompilerOptions.class, "inlineJsrBytecode", boolean.class);
}
return MethodHandles.lookup().findSetter(CompilerOptions.class, "inlineJsrBytecode", boolean.class);
} catch (Exception e) {
return null;
}
Expand Down
3 changes: 1 addition & 2 deletions org.eclipse.xtext.xbase.testing/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ Require-Bundle: org.eclipse.xtext;bundle-version="2.37.0",
org.eclipse.jdt.core;bundle-version="3.29.0";visibility:=reexport,
org.junit;bundle-version="4.13.2",
org.eclipse.xtext.testing;bundle-version="2.37.0",
org.eclipse.core.runtime;bundle-version="3.24.100";visibility:=reexport,
org.eclipse.core.resources;visibility:=reexport
org.eclipse.core.runtime;bundle-version="3.24.100"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.xtext.xbase.testing;version="2.37.0",
org.eclipse.xtext.xbase.testing.evaluation;version="2.37.0";x-friends:="org.eclipse.xtext.xbase.tests,org.eclipse.xtext.purexbase.tests,org.eclipse.xtend.core.tests",
Expand Down
10 changes: 1 addition & 9 deletions ...eclipse.xtext.xbase.testing/src/org/eclipse/xtext/xbase/testing/InMemoryJavaCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
import java.net.URLConnection;
import java.net.URLStreamHandler;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.apache.log4j.Logger;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.compiler.CategorizedProblem;
import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.ClassFile;
Expand All @@ -41,10 +39,8 @@
import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
import org.eclipse.jdt.internal.core.JavaModelManager.PerProjectInfo;
import org.eclipse.xtext.util.JavaVersion;
import org.eclipse.xtext.xbase.lib.Exceptions;
import org.osgi.framework.Version;

import com.google.common.collect.Lists;

Expand Down Expand Up @@ -223,11 +219,7 @@ public InMemoryJavaCompiler(ClassLoader parent, JavaVersion javaVersion) {
private final static MethodHandle INLINE_JSR_BYTECODE = findInlineJsrBytecode();
private static MethodHandle findInlineJsrBytecode() {
try {
if (JavaCore.getPlugin().getBundle().getVersion().compareTo(new Version(3, 39, 100)) >= 0) {
return null;
} else {
return MethodHandles.lookup().findSetter(CompilerOptions.class, "inlineJsrBytecode", boolean.class);
}
return MethodHandles.lookup().findSetter(CompilerOptions.class, "inlineJsrBytecode", boolean.class);
} catch (Exception e) {
return null;
}
Expand Down
Loading