[deps] pushing ASM to 9.1, and ASM opcode compat levels to ASM9, as we need the support for records

2026-10-13 10:15:53 +00:00 · 2021-03-22 11:38:56 +01:00
1 parent bcd05a01b1
commit 3400f66fa7
@@ -1,14 +0,0 @@
-<ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.38" publication="20201008193000">
-		<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.38.jar" />
-	</publications>
-</ivy-module>
@@ -1,5 +1,5 @@
 <ivy-module version="2.0">
-	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.36" publication="20191210010000">
+	<info organisation="org.projectlombok" module="lombok.patcher" revision="0.42" publication="20210322113600">
 		<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" />
@@ -9,6 +9,6 @@
 		<conf name="default" />
 	</configurations>
 	<publications>
-		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.36.jar" />
+		<artifact conf="default" url="https://projectlombok.org/downloads/lombok.patcher-0.42.jar" />
 	</publications>
 </ivy-module>
@@ -36,7 +36,7 @@
 	</configurations>
 	<dependencies>
 		
-		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.40" conf="build,stripe->default" />
+		<dependency org="org.projectlombok" name="lombok.patcher" rev="0.42" conf="build,stripe->default" />
 		<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build,stripe->runtime" />
 		<dependency org="org.apache.ant" name="ant" rev="1.10.5" conf="build->default" />
 		<dependency org="org.apache.ant" name="ant-junit" rev="1.10.5" conf="build->default" />
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 The Project Lombok Authors.
+ * Copyright (C) 2010-2021 The Project Lombok Authors.
 * 
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
@@ -37,7 +37,7 @@ class AsmUtil {
 		ClassReader reader = new ClassReader(byteCode);
 		ClassWriter writer = new FixedClassWriter(reader, 0);
 		
-		ClassVisitor visitor = new ClassVisitor(Opcodes.ASM7, writer) {
+		ClassVisitor visitor = new ClassVisitor(Opcodes.ASM9, 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);
 			}
@@ -50,7 +50,7 @@ public class PreventNullAnalysisRemover implements PostCompilerTransformation {
 		
 		class PreventNullAnalysisVisitor extends MethodVisitor {
 			PreventNullAnalysisVisitor(MethodVisitor mv) {
-				super(Opcodes.ASM7, mv);
+				super(Opcodes.ASM9, 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.ASM7, writer) {
+		reader.accept(new ClassVisitor(Opcodes.ASM9, 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));
 			}
@@ -52,7 +52,7 @@ public class SneakyThrowsRemover implements PostCompilerTransformation {
 		
 		class SneakyThrowsRemoverVisitor extends MethodVisitor {
 			SneakyThrowsRemoverVisitor(MethodVisitor mv) {
-				super(Opcodes.ASM7, mv);
+				super(Opcodes.ASM9, mv);
 			}
 			
 			private boolean methodInsnQueued = false;
@@ -177,7 +177,7 @@ public class SneakyThrowsRemover implements PostCompilerTransformation {
 			}
 		}
 		
-		reader.accept(new ClassVisitor(Opcodes.ASM7, writer) {
+		reader.accept(new ClassVisitor(Opcodes.ASM9, 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));
 			}
@@ -1,5 +1,5 @@
+// version 14:
 import java.util.List;
-
 record BuilderSimpleOnRecord<T>(List<T> l, String a) {
 	@java.lang.SuppressWarnings("all")
 	protected static class BuilderSimpleOnRecordBuilder<T> {
@@ -7,35 +7,35 @@ record BuilderSimpleOnRecord<T>(List<T> l, String a) {
 		private List<T> l;
 		@java.lang.SuppressWarnings("all")
 		private String a;
-
 		@java.lang.SuppressWarnings("all")
 		BuilderSimpleOnRecordBuilder() {
 		}
-
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder<T> l(final List<T> l) {
 			this.l = l;
 			return this;
 		}
-
+		/**
+		 * @return {@code this}.
+		 */
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder<T> a(final String a) {
 			this.a = a;
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSimpleOnRecord<T> build() {
 			return new BuilderSimpleOnRecord<T>(this.l, this.a);
 		}
-
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
 			return "BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder(l=" + this.l + ", a=" + this.a + ")";
 		}
 	}
-
 	@java.lang.SuppressWarnings("all")
 	protected static <T> BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder<T> builder() {
 		return new BuilderSimpleOnRecord.BuilderSimpleOnRecordBuilder<T>();
@@ -1,6 +1,6 @@
+// version 14:
 import java.util.Collection;
 import java.util.List;
-
 record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number> scarves, @SuppressWarnings("all") List rawList) {
 	@java.lang.SuppressWarnings("all")
 	public static class BuilderSingularOnRecordBuilder<T> {
@@ -10,18 +10,15 @@ record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number>
 		private java.util.ArrayList<Number> scarves;
 		@java.lang.SuppressWarnings("all")
 		private java.util.ArrayList<java.lang.Object> rawList;
-
 		@java.lang.SuppressWarnings("all")
 		BuilderSingularOnRecordBuilder() {
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> child(final T child) {
 			if (this.children == null) this.children = new java.util.ArrayList<T>();
 			this.children.add(child);
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> children(final java.util.Collection<? extends T> children) {
 			if (children == null) {
@@ -31,20 +28,17 @@ record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number>
 			this.children.addAll(children);
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> clearChildren() {
 			if (this.children != null) this.children.clear();
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> scarf(final Number scarf) {
 			if (this.scarves == null) this.scarves = new java.util.ArrayList<Number>();
 			this.scarves.add(scarf);
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> scarves(final java.util.Collection<? extends Number> scarves) {
 			if (scarves == null) {
@@ -54,20 +48,17 @@ record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number>
 			this.scarves.addAll(scarves);
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> clearScarves() {
 			if (this.scarves != null) this.scarves.clear();
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> rawList(final java.lang.Object rawList) {
 			if (this.rawList == null) this.rawList = new java.util.ArrayList<java.lang.Object>();
 			this.rawList.add(rawList);
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> rawList(final java.util.Collection<?> rawList) {
 			if (rawList == null) {
@@ -77,13 +68,11 @@ record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number>
 			this.rawList.addAll(rawList);
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> clearRawList() {
 			if (this.rawList != null) this.rawList.clear();
 			return this;
 		}
-
 		@java.lang.SuppressWarnings("all")
 		public BuilderSingularOnRecord<T> build() {
 			java.util.List<T> children;
@@ -121,14 +110,12 @@ record BuilderSingularOnRecord<T>(List<T> children, Collection<? extends Number>
 			}
 			return new BuilderSingularOnRecord<T>(children, scarves, rawList);
 		}
-
 		@java.lang.Override
 		@java.lang.SuppressWarnings("all")
 		public java.lang.String toString() {
 			return "BuilderSingularOnRecord.BuilderSingularOnRecordBuilder(children=" + this.children + ", scarves=" + this.scarves + ", rawList=" + this.rawList + ")";
 		}
 	}
-
 	@java.lang.SuppressWarnings("all")
 	public static <T> BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T> builder() {
 		return new BuilderSingularOnRecord.BuilderSingularOnRecordBuilder<T>();
@@ -1,2 +1,3 @@
+// version 14:
 record ConstructorsOnRecord(String a, String b) {
 }
@@ -1,2 +1,3 @@
+// version 14:
 record DataOnRecord(String a, String b) {
 }
@@ -1,2 +1,3 @@
+// version 14:
 record EqualsAndHashCodeOnRecord(String a, String b) {
 }
@@ -1,2 +1,3 @@
+// version 14:
 record FieldDefaultsOnRecord(String a, String b) {
 }
@@ -1,6 +1,6 @@
+// version 14:
 record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) {
 	static double skipMeToo;
-
 	@java.lang.SuppressWarnings("all")
 	static final class Fields {
 		public static final java.lang.String iAmADvdPlayer = "iAmADvdPlayer";
@@ -1,2 +1,3 @@
+// version 14:
 record GetterOnRecord(String a, String b) {
 }
@@ -1,2 +1,3 @@
+// version 14:
 record LoggerConfigOnRecord(String a, String b) {
 }
@@ -1,3 +1,4 @@
+// version 14:
 record LoggerSlf4jOnRecord(String a, String b) {
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class);
 }
@@ -1,3 +1,5 @@
+// version 16: the SuppressWarnings is not emitted in java14/15 to work around a javac bug.
 record LoggerSlf4jOnRecord(String a, String b) {
+	@java.lang.SuppressWarnings("all")
 	private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class);
 }
@@ -1,5 +1,5 @@
+// version 14:
 import lombok.NonNull;
-
 record NonNullOnRecord(@NonNull String a, @NonNull String b) {
 	public NonNullOnRecord(@NonNull String b) {
 		this("default", b);
@@ -7,7 +7,6 @@ record NonNullOnRecord(@NonNull String a, @NonNull String b) {
 			throw new java.lang.NullPointerException("b is marked non-null but is null");
 		}
 	}
-
 	@java.lang.SuppressWarnings("all")
 	public NonNullOnRecord(@NonNull final String a, @NonNull final String b) {
 		if (a == null) {
@@ -1,5 +1,5 @@
+// version 14:
 import lombok.NonNull;
-
 record NonNullOnRecord(@NonNull String a, @NonNull String b) {
 	public void method(@NonNull String param) {
 		if (param == null) {
@@ -7,7 +7,6 @@ record NonNullOnRecord(@NonNull String a, @NonNull String b) {
 		}
 		String asd = "a";
 	}
-
 	@java.lang.SuppressWarnings("all")
 	public NonNullOnRecord(@NonNull final String a, @NonNull final String b) {
 		if (a == null) {
@@ -1,2 +1,3 @@
+// version 14:
 record SetterOnRecord(String a, String b) {
 }
@@ -1,2 +1,3 @@
+// version 14:
 record ToStringOnRecord(String a, String b) {
 }
@@ -1,2 +1,3 @@
+// version 14:
 record UtilityClassOnRecord(String a, String b) {
 }
@@ -1,2 +1,3 @@
+// version 14:
 record ValueOnRecord(String a, String b) {
 }
@@ -1,9 +1,9 @@
+// version 14:
 record WithByOnRecord(String a, String b) {
 	@java.lang.SuppressWarnings("all")
 	public WithByOnRecord withABy(final java.util.function.Function<? super String, ? extends String> transformer) {
 		return new WithByOnRecord(transformer.apply(this.a), this.b);
 	}
-
 	@java.lang.SuppressWarnings("all")
 	public WithByOnRecord withBBy(final java.util.function.Function<? super String, ? extends String> transformer) {
 		return new WithByOnRecord(this.a, transformer.apply(this.b));
@@ -1,3 +1,4 @@
+// version 14:
 record WithByOnRecordComponent(String a, String b) {
 	@java.lang.SuppressWarnings("all")
 	public WithByOnRecordComponent withABy(final java.util.function.Function<? super String, ? extends String> transformer) {
@@ -1,9 +1,15 @@
+// version 14:
 record WithOnRecord(String a, String b) {
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithOnRecord withA(final String a) {
 		return this.a == a ? this : new WithOnRecord(a, this.b);
 	}
-
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithOnRecord withB(final String b) {
 		return this.b == b ? this : new WithOnRecord(this.a, b);
@@ -1,4 +1,8 @@
+// version 14:
 record WithOnRecordComponent(String a, String b) {
+	/**
+	 * @return a clone of this object, except with this updated property (returns {@code this} if an identical value is passed).
+	 */
 	@java.lang.SuppressWarnings("all")
 	public WithOnRecordComponent withA(final String a) {
 		return this.a == a ? this : new WithOnRecordComponent(a, this.b);
@@ -1,3 +1,4 @@
+// version 14:
 import java.util.List;
@lombok.Builder(access = lombok.AccessLevel.PROTECTED) record BuilderSimpleOnRecord(List l, String a)<T> {
  protected static @java.lang.SuppressWarnings("all") class BuilderSimpleOnRecordBuilder<T> {
@@ -1,3 +1,4 @@
+// version 14:
 import java.util.Collection;
 import java.util.List;
 import lombok.Builder;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.Data;
@Data record DataOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.EqualsAndHashCode;
@EqualsAndHashCode record EqualsAndHashCodeOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
@lombok.experimental.FieldDefaults(makeFinal = true) record FieldDefaultsOnRecord(String a, String b) {
 /* Implicit */  private final String a;
 /* Implicit */  private final String b;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.experimental.FieldNameConstants;
 import lombok.AccessLevel;
@FieldNameConstants(level = AccessLevel.PACKAGE) record FieldNameConstantsOnRecord(String iAmADvdPlayer, int $skipMe, int andMe, String butPrintMePlease) {
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.Getter;
@Getter record GetterOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.extern.slf4j.Slf4j;
@Slf4j record LoggerConfigOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.extern.slf4j.Slf4j;
@Slf4j record LoggerSlf4jOnRecord(org log, String a) {
  private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(LoggerSlf4jOnRecord.class);
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.NonNull;
 record NonNullOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.NonNull;
 record NonNullOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.Setter;
@Setter record SetterOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.ToString;
@ToString record ToStringOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.experimental.UtilityClass;
@UtilityClass record UtilityClassOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.Value;
@Value record ValueOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.experimental.WithBy;
@WithBy record WithByOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.experimental.WithBy;
 record WithByOnRecordComponent(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.With;
@With record WithOnRecord(String a, String b) {
 /* Implicit */  private final String a;
@@ -1,3 +1,4 @@
+// version 14:
 import lombok.With;
 record WithOnRecordComponent(String a, String b) {
 /* Implicit */  private final String a;
@@ -4,5 +4,5 @@
 import lombok.experimental.SuperBuilder;

@SuperBuilder
-record SupeBuilderOnRecord(String a, String b) {
+record SuperBuilderOnRecord(String a, String b) {
 }
@@ -1 +1 @@
-6 @SuperBuilder is only supported on types.
+6 @SuperBuilder is only supported on classes.
@@ -1 +1 @@
-5 @UtilityClass is only supported on a class (can't be an interface, enum, annotation, or record).
+5 @UtilityClass is only supported on a class.
@@ -1 +1 @@
-6 @SuperBuilder is only supported on types.
+6 @SuperBuilder is only supported on classes.
@@ -1 +1 @@
-5 @UtilityClass is only supported on a class (can't be an interface, enum, annotation, or record).
+5 @UtilityClass is only supported on a class.