Updated to ASM6, including API calls, and bumped version.

projectlombok · Sep 10, 2018 · baac302 · baac302
1 parent 9381edf
commit baac302
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
@@ -11,9 +11,9 @@
 		<dependency org="junit" name="junit" rev="4.12" conf="test -> default"/>
 		<dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="build->default" />
 		<dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.45" conf="build" />
-		<dependency org="org.ow2.asm" name="asm" rev="6.2" conf="runtime, build -> default; contrib->sources" />
-		<dependency org="org.ow2.asm" name="asm-tree" rev="6.2" conf="runtime, build->default; contrib->sources" />
-		<dependency org="org.ow2.asm" name="asm-commons" rev="6.2" conf="runtime, build->default; contrib->sources" />
+		<dependency org="org.ow2.asm" name="asm" rev="6.2.1" conf="runtime, build -> default; contrib->sources" />
+		<dependency org="org.ow2.asm" name="asm-tree" rev="6.2.1" conf="runtime, build->default; contrib->sources" />
+		<dependency org="org.ow2.asm" name="asm-commons" rev="6.2.1" conf="runtime, build->default; contrib->sources" />
 		<dependency org="net.java.dev.jna" name="jna" rev="3.2.2" conf="runtimeInjector, build->master" />
 	</dependencies>
 </ivy-module>
diff --git a/src/patcher/lombok/patcher/PatchScript.java b/src/patcher/lombok/patcher/PatchScript.java
@@ -162,7 +162,7 @@ private static byte[] readStream(String resourceName) {
 
 	private static abstract class NoopClassVisitor extends ClassVisitor {
 		public NoopClassVisitor() {
-			super(Opcodes.ASM4);
+			super(Opcodes.ASM6);
 		}
 
 		public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {}
@@ -208,7 +208,7 @@ protected static void transplantMethod(final String resourceName, final Hook met
 
 	private static final class InsertBodyOfMethodIntoAnotherVisitor extends MethodVisitor {
 		private InsertBodyOfMethodIntoAnotherVisitor(MethodVisitor mv) {
-			super(Opcodes.ASM4, mv);
+			super(Opcodes.ASM6, mv);
 		}
 
 		@Override public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) { return null; }
@@ -245,7 +245,7 @@ protected static class MethodPatcher extends ClassVisitor {
 		private int classFileFormatVersion;
 
 		public MethodPatcher(ClassVisitor cv, TransplantMapper transplantMapper, MethodPatcherFactory factory) {
-			super(Opcodes.ASM4, cv);
+			super(Opcodes.ASM6, cv);
 			this.factory = factory;
 			this.transplantMapper = transplantMapper;
 		}

diff --git a/src/patcher/lombok/patcher/Version.java b/src/patcher/lombok/patcher/Version.java
@@ -26,7 +26,7 @@
  */
 public class Version {
 	// ** CAREFUL ** - this class must always compile with 0 dependencies (it must not refer to any other sources or libraries).
-	private static final String VERSION = "0.26";
+	private static final String VERSION = "0.28";
 
 	private Version() {
 		//Prevent instantiation

diff --git a/src/patcher/lombok/patcher/scripts/AddFieldScript.java b/src/patcher/lombok/patcher/scripts/AddFieldScript.java
@@ -65,7 +65,7 @@ public class AddFieldScript extends PatchScript {
 	}
 
 	@Override protected ClassVisitor createClassVisitor(ClassWriter writer, String classSpec, TransplantMapper transplantMapper) {
-		return new ClassVisitor(Opcodes.ASM4, writer) {
+		return new ClassVisitor(Opcodes.ASM6, writer) {
 			private boolean alreadyAdded = false;
 
 			@Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {

diff --git a/src/patcher/lombok/patcher/scripts/ExitFromMethodEarlyScript.java b/src/patcher/lombok/patcher/scripts/ExitFromMethodEarlyScript.java
@@ -82,7 +82,7 @@ private class ExitEarly extends MethodVisitor {
 		private final String ownClassSpec;
 
 		public ExitEarly(MethodVisitor mv, MethodLogistics logistics, String ownClassSpec) {
-			super(Opcodes.ASM4, mv);
+			super(Opcodes.ASM6, mv);
 			this.logistics = logistics;
 			this.ownClassSpec = ownClassSpec;
 		}

diff --git a/src/patcher/lombok/patcher/scripts/ReplaceMethodCallScript.java b/src/patcher/lombok/patcher/scripts/ReplaceMethodCallScript.java
@@ -74,7 +74,7 @@ private class ReplaceMethodCall extends MethodVisitor {
 		private final MethodLogistics logistics;
 
 		public ReplaceMethodCall(MethodVisitor mv, String ownClassSpec, MethodLogistics logistics) {
-			super(Opcodes.ASM4, mv);
+			super(Opcodes.ASM6, mv);
 			this.ownClassSpec = ownClassSpec;
 			this.logistics = logistics;
 		}

diff --git a/src/patcher/lombok/patcher/scripts/SetSymbolDuringMethodCallScript.java b/src/patcher/lombok/patcher/scripts/SetSymbolDuringMethodCallScript.java
@@ -107,7 +107,7 @@ private class WrapWithSymbol extends MethodVisitor {
 		private final List<WrapperMethodDescriptor> descriptors;
 
 		public WrapWithSymbol(String selfMethodName, MethodVisitor mv, String selfTypeName, List<WrapperMethodDescriptor> descriptors) {
-			super(Opcodes.ASM4, mv);
+			super(Opcodes.ASM6, mv);
 			this.selfMethodName = selfMethodName;
 			this.selfTypeName = selfTypeName;
 			this.descriptors = descriptors;

diff --git a/src/patcher/lombok/patcher/scripts/WrapMethodCallScript.java b/src/patcher/lombok/patcher/scripts/WrapMethodCallScript.java
@@ -80,7 +80,7 @@ private class WrapMethodCall extends MethodVisitor {
 		private final MethodLogistics logistics;
 
 		public WrapMethodCall(MethodVisitor mv, String ownClassSpec, MethodLogistics logistics) {
-			super(Opcodes.ASM4, mv);
+			super(Opcodes.ASM6, mv);
 			this.ownClassSpec = ownClassSpec;
 			this.logistics = logistics;
 		}

diff --git a/src/patcher/lombok/patcher/scripts/WrapReturnValuesScript.java b/src/patcher/lombok/patcher/scripts/WrapReturnValuesScript.java
@@ -78,7 +78,7 @@ private class WrapReturnValues extends MethodVisitor {
 		private final String ownClassSpec;
 
 		public WrapReturnValues(MethodVisitor mv, MethodLogistics logistics, String ownClassSpec) {
-			super(Opcodes.ASM4, mv);
+			super(Opcodes.ASM6, mv);
 			this.logistics = logistics;
 			this.ownClassSpec = ownClassSpec;
 		}