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