[java-11] up dependency on lombok.patcher, including asm7

5 files changed, 20 insertions, 6 deletions

diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.30.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.30.xml
new file mode 100644
index 00000000..9a87a8bf
--- /dev/null
+++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.30.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.30" publication="20180910222000">
+		<license name="MIT License" url="https://www.opensource.org/licenses/mit-license.php" />
+		<ivyauthor name="rzwitserloot" url="https://github.com/rzwitserloot" />
+		<ivyauthor name="rspilker" url="https://github.com/rspilker" />
+		<description homepage="https://projectlombok.org/" />
+	</info>
+	<configurations>
+		<conf name="default" />
+	</configurations>
+	<publications>
+		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.30.jar" />
+	</publications>
+</ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index 081be608..221ec6e9 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -18,7 +18,7 @@
 		<conf name="supporters" />
 	</configurations>
 	<dependencies>
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.28" conf="buildBase->default; runtime->default" />
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.30" conf="buildBase->default; runtime->default" />
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="buildBase->runtime; runtime" />
 		
 		<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" />
diff --git a/src/core/lombok/bytecode/AsmUtil.java b/src/core/lombok/bytecode/AsmUtil.java
index e3d33efa..42bf9700 100644
--- a/src/core/lombok/bytecode/AsmUtil.java
+++ b/src/core/lombok/bytecode/AsmUtil.java
@@ -37,7 +37,7 @@ class AsmUtil {
 		ClassReader reader = new ClassReader(byteCode);
 		ClassWriter writer = new FixedClassWriter(reader, 0);
 		
-		ClassVisitor visitor = new ClassVisitor(Opcodes.ASM6, writer) {
+		ClassVisitor visitor = new ClassVisitor(Opcodes.ASM7, writer) {
 			@Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
 				return new JSRInlinerAdapter(super.visitMethod(access, name, desc, signature, exceptions), access, name, desc, signature, exceptions);
 			}
diff --git a/src/core/lombok/bytecode/PreventNullAnalysisRemover.java b/src/core/lombok/bytecode/PreventNullAnalysisRemover.java
index c06f2d7c..20572e22 100644
--- a/src/core/lombok/bytecode/PreventNullAnalysisRemover.java
+++ b/src/core/lombok/bytecode/PreventNullAnalysisRemover.java
@@ -50,7 +50,7 @@ public class PreventNullAnalysisRemover implements PostCompilerTransformation {
 		
 		class PreventNullAnalysisVisitor extends MethodVisitor {
 			PreventNullAnalysisVisitor(MethodVisitor mv) {
-				super(Opcodes.ASM6, mv);
+				super(Opcodes.ASM7, mv);
 			}
 			
 			@Override public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
@@ -68,7 +68,7 @@ public class PreventNullAnalysisRemover implements PostCompilerTransformation {
 			}
 		}
 		
-		reader.accept(new ClassVisitor(Opcodes.ASM6, writer) {
+		reader.accept(new ClassVisitor(Opcodes.ASM7, writer) {
 			@Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
 				return new PreventNullAnalysisVisitor(super.visitMethod(access, name, desc, signature, exceptions));
 			}
diff --git a/src/core/lombok/bytecode/SneakyThrowsRemover.java b/src/core/lombok/bytecode/SneakyThrowsRemover.java
index a2ee59ea..037cb109 100644
--- a/src/core/lombok/bytecode/SneakyThrowsRemover.java
+++ b/src/core/lombok/bytecode/SneakyThrowsRemover.java
@@ -52,7 +52,7 @@ public class SneakyThrowsRemover implements PostCompilerTransformation {
 		
 		class SneakyThrowsRemoverVisitor extends MethodVisitor {
 			SneakyThrowsRemoverVisitor(MethodVisitor mv) {
-				super(Opcodes.ASM6, mv);
+				super(Opcodes.ASM7, mv);
 			}
 			
 			private boolean methodInsnQueued = false;
@@ -177,7 +177,7 @@ public class SneakyThrowsRemover implements PostCompilerTransformation {
 			}
 		}
 		
-		reader.accept(new ClassVisitor(Opcodes.ASM5, writer) {
+		reader.accept(new ClassVisitor(Opcodes.ASM7, writer) {
 			@Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
 				return new SneakyThrowsRemoverVisitor(super.visitMethod(access, name, desc, signature, exceptions));
 			}