diff --git a/.classpath b/.classpath index b33b264..954afa0 100644 --- a/.classpath +++ b/.classpath @@ -4,6 +4,6 @@ - + diff --git a/lib/asm-5.1.jar b/build/asm-5.1.jar similarity index 100% rename from lib/asm-5.1.jar rename to build/asm-5.1.jar diff --git a/build/jarjar-command-1.0.0-all.jar b/build/jarjar-command-1.0.0-all.jar new file mode 100644 index 0000000..91f13b8 Binary files /dev/null and b/build/jarjar-command-1.0.0-all.jar differ diff --git a/build/jarjar.rules b/build/jarjar.rules new file mode 100644 index 0000000..358339e --- /dev/null +++ b/build/jarjar.rules @@ -0,0 +1 @@ +rule org.objectweb.asm.** com.esotericsoftware.asm.@1 diff --git a/lib/asm-5.1-es.jar b/lib/asm-5.1-es.jar new file mode 100644 index 0000000..7ccf090 Binary files /dev/null and b/lib/asm-5.1-es.jar differ diff --git a/pom.xml b/pom.xml index 4e234ae..4749c54 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.0.0 com.esotericsoftware reflectasm - 1.11.5-SNAPSHOT + 1.11.6-SNAPSHOT bundle ReflectASM High performance Java reflection using code generation diff --git a/project.yaml b/project.yaml index 43d1ca4..5bb702e 100644 --- a/project.yaml +++ b/project.yaml @@ -1,4 +1,8 @@ -version: 1.11.4 +version: 1.11.5 --- +classpath build/jarjar-command-1.0.0-all.jar; +com.tonicsystems.jarjar.Main.main(new String[] { + "-rules", "build/jarjar.rules", "build/asm-5.1.jar", "-output", "lib/asm-5.1-es.jar" +}); Build.build(project); -Build.oneJAR(project); \ No newline at end of file +Build.oneJAR(project); diff --git a/src/com/esotericsoftware/reflectasm/ConstructorAccess.java b/src/com/esotericsoftware/reflectasm/ConstructorAccess.java index 6364462..778f80d 100644 --- a/src/com/esotericsoftware/reflectasm/ConstructorAccess.java +++ b/src/com/esotericsoftware/reflectasm/ConstructorAccess.java @@ -14,13 +14,13 @@ package com.esotericsoftware.reflectasm; -import static org.objectweb.asm.Opcodes.*; +import static com.esotericsoftware.asm.Opcodes.*; import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.MethodVisitor; +import com.esotericsoftware.asm.ClassWriter; +import com.esotericsoftware.asm.MethodVisitor; public abstract class ConstructorAccess { boolean isNonStaticMemberClass; diff --git a/src/com/esotericsoftware/reflectasm/FieldAccess.java b/src/com/esotericsoftware/reflectasm/FieldAccess.java index 66d33b4..f119fcd 100644 --- a/src/com/esotericsoftware/reflectasm/FieldAccess.java +++ b/src/com/esotericsoftware/reflectasm/FieldAccess.java @@ -14,16 +14,16 @@ package com.esotericsoftware.reflectasm; -import static org.objectweb.asm.Opcodes.*; +import static com.esotericsoftware.asm.Opcodes.*; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.ArrayList; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Type; +import com.esotericsoftware.asm.ClassWriter; +import com.esotericsoftware.asm.Label; +import com.esotericsoftware.asm.MethodVisitor; +import com.esotericsoftware.asm.Type; public abstract class FieldAccess { private String[] fieldNames; diff --git a/src/com/esotericsoftware/reflectasm/MethodAccess.java b/src/com/esotericsoftware/reflectasm/MethodAccess.java index fb40c20..3a66932 100644 --- a/src/com/esotericsoftware/reflectasm/MethodAccess.java +++ b/src/com/esotericsoftware/reflectasm/MethodAccess.java @@ -14,18 +14,18 @@ package com.esotericsoftware.reflectasm; -import static org.objectweb.asm.Opcodes.*; +import static com.esotericsoftware.asm.Opcodes.*; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Arrays; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; +import com.esotericsoftware.asm.ClassWriter; +import com.esotericsoftware.asm.Label; +import com.esotericsoftware.asm.MethodVisitor; +import com.esotericsoftware.asm.Opcodes; +import com.esotericsoftware.asm.Type; public abstract class MethodAccess { private String[] methodNames;