Markus Koschany pushed to branch upstream at Debian Java Maintainers / lombok-patcher
Commits: dd387cba by Markus Koschany at 2018-11-02T23:52:36Z New upstream version 0.30 - - - - - 10 changed files: - README.markdown - buildScripts/ivy.xml - src/patcher/lombok/patcher/PatchScript.java - src/patcher/lombok/patcher/Version.java - src/patcher/lombok/patcher/scripts/AddFieldScript.java - src/patcher/lombok/patcher/scripts/ExitFromMethodEarlyScript.java - src/patcher/lombok/patcher/scripts/ReplaceMethodCallScript.java - src/patcher/lombok/patcher/scripts/SetSymbolDuringMethodCallScript.java - src/patcher/lombok/patcher/scripts/WrapMethodCallScript.java - src/patcher/lombok/patcher/scripts/WrapReturnValuesScript.java Changes: ===================================== README.markdown ===================================== @@ -7,4 +7,4 @@ replace methods entirely with your own, or add fields. lombok.patcher also includes support for getting around the Eclipse OSGi container's classloader separation. -An example can be found in [Project Lombok's eclipse agent code](http://github.com/rzwitserloot/lombok/tree/master/src/eclipseAgent/lombok/eclipse/agent/) \ No newline at end of file +An example can be found in [Project Lombok's eclipse agent code](https://github.com/rzwitserloot/lombok/tree/master/src/eclipseAgent/lombok/eclipse/agent/) \ No newline at end of file ===================================== 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.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="org.ow2.asm" name="asm" rev="7.0" conf="runtime, build -> default; contrib->sources" /> + <dependency org="org.ow2.asm" name="asm-tree" rev="7.0" conf="runtime, build->default; contrib->sources" /> + <dependency org="org.ow2.asm" name="asm-commons" rev="7.0" 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> ===================================== src/patcher/lombok/patcher/PatchScript.java ===================================== @@ -162,7 +162,7 @@ public abstract class PatchScript { private static abstract class NoopClassVisitor extends ClassVisitor { public NoopClassVisitor() { - super(Opcodes.ASM6); + super(Opcodes.ASM7); } public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {} @@ -208,7 +208,7 @@ public abstract class PatchScript { private static final class InsertBodyOfMethodIntoAnotherVisitor extends MethodVisitor { private InsertBodyOfMethodIntoAnotherVisitor(MethodVisitor mv) { - super(Opcodes.ASM6, mv); + super(Opcodes.ASM7, mv); } @Override public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) { return null; } @@ -245,7 +245,7 @@ public abstract class PatchScript { private int classFileFormatVersion; public MethodPatcher(ClassVisitor cv, TransplantMapper transplantMapper, MethodPatcherFactory factory) { - super(Opcodes.ASM6, cv); + super(Opcodes.ASM7, cv); this.factory = factory; this.transplantMapper = transplantMapper; } ===================================== src/patcher/lombok/patcher/Version.java ===================================== @@ -26,7 +26,7 @@ package lombok.patcher; */ 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.28"; + private static final String VERSION = "0.30"; private Version() { //Prevent instantiation ===================================== 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.ASM6, writer) { + return new ClassVisitor(Opcodes.ASM7, writer) { private boolean alreadyAdded = false; @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { ===================================== src/patcher/lombok/patcher/scripts/ExitFromMethodEarlyScript.java ===================================== @@ -82,7 +82,7 @@ public class ExitFromMethodEarlyScript extends MethodLevelPatchScript { private final String ownClassSpec; public ExitEarly(MethodVisitor mv, MethodLogistics logistics, String ownClassSpec) { - super(Opcodes.ASM6, mv); + super(Opcodes.ASM7, mv); this.logistics = logistics; this.ownClassSpec = ownClassSpec; } ===================================== src/patcher/lombok/patcher/scripts/ReplaceMethodCallScript.java ===================================== @@ -74,7 +74,7 @@ public class ReplaceMethodCallScript extends MethodLevelPatchScript { private final MethodLogistics logistics; public ReplaceMethodCall(MethodVisitor mv, String ownClassSpec, MethodLogistics logistics) { - super(Opcodes.ASM6, mv); + super(Opcodes.ASM7, mv); this.ownClassSpec = ownClassSpec; this.logistics = logistics; } ===================================== src/patcher/lombok/patcher/scripts/SetSymbolDuringMethodCallScript.java ===================================== @@ -107,7 +107,7 @@ public class SetSymbolDuringMethodCallScript extends MethodLevelPatchScript { private final List<WrapperMethodDescriptor> descriptors; public WrapWithSymbol(String selfMethodName, MethodVisitor mv, String selfTypeName, List<WrapperMethodDescriptor> descriptors) { - super(Opcodes.ASM6, mv); + super(Opcodes.ASM7, mv); this.selfMethodName = selfMethodName; this.selfTypeName = selfTypeName; this.descriptors = descriptors; ===================================== src/patcher/lombok/patcher/scripts/WrapMethodCallScript.java ===================================== @@ -80,7 +80,7 @@ public class WrapMethodCallScript extends MethodLevelPatchScript { private final MethodLogistics logistics; public WrapMethodCall(MethodVisitor mv, String ownClassSpec, MethodLogistics logistics) { - super(Opcodes.ASM6, mv); + super(Opcodes.ASM7, mv); this.ownClassSpec = ownClassSpec; this.logistics = logistics; } ===================================== src/patcher/lombok/patcher/scripts/WrapReturnValuesScript.java ===================================== @@ -78,7 +78,7 @@ public final class WrapReturnValuesScript extends MethodLevelPatchScript { private final String ownClassSpec; public WrapReturnValues(MethodVisitor mv, MethodLogistics logistics, String ownClassSpec) { - super(Opcodes.ASM6, mv); + super(Opcodes.ASM7, mv); this.logistics = logistics; this.ownClassSpec = ownClassSpec; } View it on GitLab: https://salsa.debian.org/java-team/lombok-patcher/commit/dd387cba3aac76a26102acf87ed404fcae19b4f8 -- View it on GitLab: https://salsa.debian.org/java-team/lombok-patcher/commit/dd387cba3aac76a26102acf87ed404fcae19b4f8 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
