Revert "Repack ASM classes in esotericsoftware namespace."

This reverts commit ade0542b62.

shaded jar shall be used instead.
This commit is contained in:
Martin Grotzke 2017-07-17 00:50:24 +02:00
parent ade0542b62
commit e0234826c8
10 changed files with 18 additions and 23 deletions

View File

@ -4,6 +4,6 @@
<classpathentry excluding="**/.svn/*" kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="build/junit-4.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-5.1-es.jar"/>
<classpathentry kind="lib" path="lib/asm-5.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

Binary file not shown.

View File

@ -1 +0,0 @@
rule org.objectweb.asm.** com.esotericsoftware.asm.@1

Binary file not shown.

View File

@ -7,7 +7,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.esotericsoftware</groupId>
<artifactId>reflectasm</artifactId>
<version>1.11.6-SNAPSHOT</version>
<version>1.11.5-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>ReflectASM</name>
<description>High performance Java reflection using code generation</description>

View File

@ -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);

View File

@ -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<T> {
boolean isNonStaticMemberClass;

View File

@ -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;

View File

@ -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;