Skip to content

Commit a25a916

Browse files
nnjunnnjun
committed
changed ams to ams2
Resolve Android studio conflicts
1 parent b82d08a commit a25a916

File tree

45 files changed

+136
-136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+136
-136
lines changed

‎d2j-jasmin/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies {
44
compile(group: 'org.antlr', name: 'antlr-runtime', version:'3.5.2') {
55
exclude(module: 'stringtemplate')
66
}
7-
compile "org.ow2.asm:asm-debug-all:5.0.3"
7+
// compile "org.ow2.asm:asm-debug-all:5.0.3"
88
compile project(':d2j-base-cmd')
99
antlr "org.antlr:antlr:3.5.2"
1010
}

‎d2j-jasmin/libs/asm.jar

1.17 MB
Binary file not shown.

‎d2j-jasmin/src/main/antlr3/com/googlecode/d2j/jasmin/Jasmin.g

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ package com.googlecode.d2j.jasmin;
55
import java.util.List;
66
import java.util.ArrayList;
77
import java.math.BigInteger;
8-
import org.objectweb.asm.*;
9-
import org.objectweb.asm.tree.*;
10-
import static org.objectweb.asm.Opcodes.*;
8+
import org.objectweb.asm2.*;
9+
import org.objectweb.asm2.tree.*;
10+
import static org.objectweb.asm2.Opcodes.*;
1111
}
1212
@lexer::header {
1313
package com.googlecode.d2j.jasmin;

‎d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jar2JasminCmd.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.googlecode.dex2jar.tools.BaseCmd;
2020
import com.googlecode.dex2jar.tools.BaseCmd.Syntax;
21-
import org.objectweb.asm.ClassReader;
22-
import org.objectweb.asm.tree.ClassNode;
21+
import org.objectweb.asm2.ClassReader;
22+
import org.objectweb.asm2.tree.ClassNode;
2323

2424
import java.io.*;
2525
import java.net.URISyntaxException;

‎d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jasmin2JarCmd.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
import org.antlr.runtime.ANTLRStringStream;
2222
import org.antlr.runtime.CommonTokenStream;
2323
import org.antlr.runtime.RecognitionException;
24-
import org.objectweb.asm.ClassWriter;
25-
import org.objectweb.asm.Opcodes;
26-
import org.objectweb.asm.tree.ClassNode;
24+
import org.objectweb.asm2.ClassWriter;
25+
import org.objectweb.asm2.Opcodes;
26+
import org.objectweb.asm2.tree.ClassNode;
2727

2828
import java.io.*;
2929
import java.net.URISyntaxException;

‎d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/JasminDumper.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
*/
3030
package com.googlecode.d2j.jasmin;
3131

32-
import org.objectweb.asm.Label;
33-
import org.objectweb.asm.MethodVisitor;
34-
import org.objectweb.asm.Opcodes;
35-
import org.objectweb.asm.Type;
36-
import org.objectweb.asm.tree.*;
37-
import org.objectweb.asm.util.Printer;
32+
import org.objectweb.asm2.Label;
33+
import org.objectweb.asm2.MethodVisitor;
34+
import org.objectweb.asm2.Opcodes;
35+
import org.objectweb.asm2.Type;
36+
import org.objectweb.asm2.tree.*;
37+
import org.objectweb.asm2.util.Printer;
3838

3939
import java.io.PrintWriter;
4040
import java.util.*;

‎d2j-jasmin/src/main/java/com/googlecode/d2j/jasmin/Jasmins.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.antlr.runtime.ANTLRStringStream;
2121
import org.antlr.runtime.CommonTokenStream;
2222
import org.antlr.runtime.RecognitionException;
23-
import org.objectweb.asm.tree.ClassNode;
23+
import org.objectweb.asm2.tree.ClassNode;
2424

2525
import java.io.*;
2626
import java.nio.charset.StandardCharsets;

‎d2j-jasmin/src/test/java/com/googlecode/d2j/tools/jar/test/Jasmin2jTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.junit.runners.ParentRunner;
2626
import org.junit.runners.model.InitializationError;
2727
import org.junit.runners.model.Statement;
28-
import org.objectweb.asm.tree.ClassNode;
28+
import org.objectweb.asm2.tree.ClassNode;
2929

3030
import java.io.File;
3131
import java.io.IOException;

‎dex-obfuscator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ repositories {
1111

1212
dependencies {
1313
compile project(':dex-ir')
14-
compile 'org.ow2.asm:asm-debug-all:5.0.3'
14+
// compile 'org.ow2.asm:asm-debug-all:5.0.3'
1515
}

‎dex-obfuscator/libs/asm.jar

1.17 MB
Binary file not shown.

‎dex-obfuscator/src/main/java/top/niunaijun/obfuscator/LBlock.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.googlecode.dex2jar.ir.stmt.LabelStmt;
44
import com.googlecode.dex2jar.ir.stmt.Stmt;
55
import com.googlecode.dex2jar.ir.stmt.Stmts;
6-
import org.objectweb.asm.Label;
6+
import org.objectweb.asm2.Label;
77

88
import java.util.ArrayList;
99
import java.util.List;

‎dex-reader-api/src/main/java/com/googlecode/d2j/DexLabel.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.googlecode.d2j;
1717

1818
/**
19-
* a light weight version of org.objectweb.asm.Label
19+
* a light weight version of org.objectweb.asm2.Label
2020
*
2121
* @author Panxiaobo
2222
* @version $Rev$

‎dex-reader-api/src/main/java/com/googlecode/d2j/DexType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package com.googlecode.d2j;
1717

1818
/**
19-
* a light weight version of org.objectweb.asm.Type
19+
* a light weight version of org.objectweb.asm2.Type
2020
*
2121
* @author Panxiaobo
2222
* @version $Rev$

‎dex-reader/src/main/java/com/googlecode/d2j/util/ASMifierFileV.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import com.googlecode.d2j.visitors.DexFileVisitor;
3030

3131
/**
32-
* similar with org.objectweb.asm.util.ASMifierClassVisitor
32+
* similar with org.objectweb.asm2.util.ASMifierClassVisitor
3333
*
3434
* @author <a href="mailto:[email protected]">Panxiaobo</a>
3535
*/

‎dex-tools/src/main/java/com/googlecode/d2j/tools/jar/BaseWeaver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package com.googlecode.d2j.tools.jar;
1818

19-
import org.objectweb.asm.Type;
19+
import org.objectweb.asm2.Type;
2020

2121
import java.io.BufferedReader;
2222
import java.io.IOException;

‎dex-tools/src/main/java/com/googlecode/d2j/tools/jar/DexWeaver.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.googlecode.d2j.visitors.DexCodeVisitor;
2828
import com.googlecode.d2j.visitors.DexFileVisitor;
2929
import com.googlecode.d2j.visitors.DexMethodVisitor;
30-
import org.objectweb.asm.Type;
30+
import org.objectweb.asm2.Type;
3131

3232
import java.lang.reflect.Modifier;
3333
import java.util.HashMap;

‎dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InitOut.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package com.googlecode.d2j.tools.jar;
22

33
import com.googlecode.dex2jar.tools.BaseCmd;
4-
import org.objectweb.asm.ClassReader;
5-
import org.objectweb.asm.ClassVisitor;
6-
import org.objectweb.asm.FieldVisitor;
7-
import org.objectweb.asm.MethodVisitor;
8-
import org.objectweb.asm.tree.*;
4+
import org.objectweb.asm2.ClassReader;
5+
import org.objectweb.asm2.ClassVisitor;
6+
import org.objectweb.asm2.FieldVisitor;
7+
import org.objectweb.asm2.MethodVisitor;
8+
import org.objectweb.asm2.tree.*;
99

1010
import java.io.File;
1111
import java.io.IOException;
@@ -17,7 +17,7 @@
1717
import java.util.*;
1818

1919
import static com.googlecode.d2j.util.AccUtils.*;
20-
import static org.objectweb.asm.Opcodes.*;
20+
import static org.objectweb.asm2.Opcodes.*;
2121

2222
public class InitOut {
2323
private static Set<String> keywords = new HashSet<String>(Arrays.asList("abstract", "continue", "for", "new",

‎dex-tools/src/main/java/com/googlecode/d2j/tools/jar/InvocationWeaver.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
package com.googlecode.d2j.tools.jar;
1818

1919
import com.googlecode.dex2jar.tools.BaseCmd;
20-
import org.objectweb.asm.*;
21-
import org.objectweb.asm.commons.Remapper;
22-
import org.objectweb.asm.commons.RemappingClassAdapter;
23-
import org.objectweb.asm.tree.InsnList;
24-
import org.objectweb.asm.tree.LocalVariableNode;
25-
import org.objectweb.asm.tree.MethodNode;
26-
import org.objectweb.asm.tree.TryCatchBlockNode;
20+
import org.objectweb.asm2.*;
21+
import org.objectweb.asm2.commons.Remapper;
22+
import org.objectweb.asm2.commons.RemappingClassAdapter;
23+
import org.objectweb.asm2.tree.InsnList;
24+
import org.objectweb.asm2.tree.LocalVariableNode;
25+
import org.objectweb.asm2.tree.MethodNode;
26+
import org.objectweb.asm2.tree.TryCatchBlockNode;
2727

2828
import java.io.ByteArrayOutputStream;
2929
import java.io.IOException;

‎dex-tools/src/main/java/com/googlecode/d2j/tools/jar/ScanBridgeAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.googlecode.d2j.tools.jar;
22

33
import com.googlecode.d2j.tools.jar.ClassInfo.MemberInfo;
4-
import org.objectweb.asm.ClassVisitor;
5-
import org.objectweb.asm.MethodVisitor;
6-
import org.objectweb.asm.Opcodes;
4+
import org.objectweb.asm2.ClassVisitor;
5+
import org.objectweb.asm2.MethodVisitor;
6+
import org.objectweb.asm2.Opcodes;
77

88
import java.util.Collections;
99
import java.util.HashMap;

‎dex-tools/src/main/java/com/googlecode/d2j/util/AccUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.googlecode.d2j.util;
22

3-
import org.objectweb.asm.Opcodes;
3+
import org.objectweb.asm2.Opcodes;
44

55
public class AccUtils {
66
public static boolean isBridge(int acc) {

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/AsmVerify.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@
2727
import java.util.ArrayList;
2828
import java.util.List;
2929

30-
import org.objectweb.asm.ClassReader;
31-
import org.objectweb.asm.tree.ClassNode;
32-
import org.objectweb.asm.tree.MethodNode;
33-
import org.objectweb.asm.tree.TryCatchBlockNode;
34-
import org.objectweb.asm.tree.analysis.Analyzer;
35-
import org.objectweb.asm.tree.analysis.BasicValue;
36-
import org.objectweb.asm.tree.analysis.BasicVerifier;
37-
import org.objectweb.asm.tree.analysis.Frame;
38-
import org.objectweb.asm.util.CheckClassAdapter;
39-
import org.objectweb.asm.util.Printer;
40-
import org.objectweb.asm.util.Textifier;
41-
import org.objectweb.asm.util.TraceMethodVisitor;
30+
import org.objectweb.asm2.ClassReader;
31+
import org.objectweb.asm2.tree.ClassNode;
32+
import org.objectweb.asm2.tree.MethodNode;
33+
import org.objectweb.asm2.tree.TryCatchBlockNode;
34+
import org.objectweb.asm2.tree.analysis.Analyzer;
35+
import org.objectweb.asm2.tree.analysis.BasicValue;
36+
import org.objectweb.asm2.tree.analysis.BasicVerifier;
37+
import org.objectweb.asm2.tree.analysis.Frame;
38+
import org.objectweb.asm2.util.CheckClassAdapter;
39+
import org.objectweb.asm2.util.Printer;
40+
import org.objectweb.asm2.util.Textifier;
41+
import org.objectweb.asm2.util.TraceMethodVisitor;
4242

4343
import com.googlecode.dex2jar.tools.BaseCmd.Syntax;
4444

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/BaksmaliBaseDexExceptionHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import com.googlecode.d2j.smali.BaksmaliDumper;
2525
import com.googlecode.d2j.smali.Smali;
2626
import com.googlecode.dex2jar.ir.ET;
27-
import org.objectweb.asm.MethodVisitor;
27+
import org.objectweb.asm2.MethodVisitor;
2828

2929
import java.io.BufferedWriter;
3030
import java.io.IOException;

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/ClassVersionSwitch.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.googlecode.dex2jar.tools;
22

33

4-
import org.objectweb.asm.ClassReader;
5-
import org.objectweb.asm.ClassVisitor;
6-
import org.objectweb.asm.ClassWriter;
7-
import org.objectweb.asm.Opcodes;
4+
import org.objectweb.asm2.ClassReader;
5+
import org.objectweb.asm2.ClassVisitor;
6+
import org.objectweb.asm2.ClassWriter;
7+
import org.objectweb.asm2.Opcodes;
88

99
import java.io.File;
1010
import java.io.FileOutputStream;

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/DecryptStringCmd.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
import com.googlecode.dex2jar.ir.ts.*;
2626
import com.googlecode.dex2jar.ir.ts.array.FillArrayTransformer;
2727
import com.googlecode.dex2jar.tools.BaseCmd.Syntax;
28-
import org.objectweb.asm.ClassReader;
29-
import org.objectweb.asm.ClassWriter;
30-
import org.objectweb.asm.Opcodes;
31-
import org.objectweb.asm.Type;
32-
import org.objectweb.asm.tree.*;
28+
import org.objectweb.asm2.ClassReader;
29+
import org.objectweb.asm2.ClassWriter;
30+
import org.objectweb.asm2.Opcodes;
31+
import org.objectweb.asm2.Type;
32+
import org.objectweb.asm2.tree.*;
3333

3434
import java.io.File;
3535
import java.io.IOException;

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/Dex2jarMultiThreadCmd.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@
2828
import com.googlecode.d2j.dex.LambadaNameSafeClassAdapter;
2929
import com.googlecode.d2j.reader.BaseDexFileReader;
3030
import com.googlecode.d2j.reader.MultiDexFileReader;
31-
import org.objectweb.asm.ClassVisitor;
32-
import org.objectweb.asm.ClassWriter;
33-
import org.objectweb.asm.Opcodes;
31+
import org.objectweb.asm2.ClassVisitor;
32+
import org.objectweb.asm2.ClassWriter;
33+
import org.objectweb.asm2.Opcodes;
3434

3535
import com.googlecode.d2j.dex.ClassVisitorFactory;
3636
import com.googlecode.d2j.dex.ExDex2Asm;
3737
import com.googlecode.d2j.node.DexClassNode;
3838
import com.googlecode.d2j.node.DexFileNode;
3939
import com.googlecode.d2j.reader.DexFileReader;
40-
import org.objectweb.asm.commons.Remapper;
41-
import org.objectweb.asm.commons.RemappingClassAdapter;
40+
import org.objectweb.asm2.commons.Remapper;
41+
import org.objectweb.asm2.commons.RemappingClassAdapter;
4242

4343
@BaseCmd.Syntax(cmd = "d2j-mt-dex2jar", syntax = "[options] <file0> [file1 ... fileN]", desc = "convert dex to jar")
4444
public class Dex2jarMultiThreadCmd extends BaseCmd {

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/GenerateCompileStubFromOdex.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.googlecode.d2j.dex.Dex2Asm;
55
import com.googlecode.d2j.node.DexFileNode;
66
import com.googlecode.d2j.reader.DexFileReader;
7-
import org.objectweb.asm.*;
7+
import org.objectweb.asm2.*;
88

99
import java.io.File;
1010
import java.io.IOException;

‎dex-tools/src/main/java/com/googlecode/dex2jar/tools/JarAccessCmd.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import java.nio.file.Files;
2323
import java.nio.file.Path;
2424

25-
import org.objectweb.asm.*;
25+
import org.objectweb.asm2.*;
2626

2727
@BaseCmd.Syntax(cmd = "d2j-jar-access", syntax = "[options] <jar>", desc = "add or remove class/method/field access in jar file")
2828
public class JarAccessCmd extends BaseCmd implements Opcodes {

‎dex-tools/src/test/java/com/googlecode/d2j/tools/jar/test/WaveTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
import org.antlr.runtime.RecognitionException;
88
import org.junit.Assert;
99
import org.junit.Test;
10-
import org.objectweb.asm.ClassReader;
11-
import org.objectweb.asm.ClassWriter;
12-
import org.objectweb.asm.Opcodes;
13-
import org.objectweb.asm.tree.ClassNode;
10+
import org.objectweb.asm2.ClassReader;
11+
import org.objectweb.asm2.ClassWriter;
12+
import org.objectweb.asm2.Opcodes;
13+
import org.objectweb.asm2.tree.ClassNode;
1414

1515
import java.io.IOException;
1616
import java.io.PrintWriter;

‎dex-translator/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencies {
55
compile project(':dex-ir')
66
compile project(':dex-obfuscator')
77
compile project(':d2j-base-cmd')
8-
compile 'org.ow2.asm:asm-debug-all:5.0.3'
8+
// compile 'org.ow2.asm:asm-debug-all:5.0.3'
99
testCompile project(':d2j-smali')
1010
testCompile project(':d2j-jasmin')
1111
}

‎dex-translator/libs/asm.jar

1.17 MB
Binary file not shown.

‎dex-translator/src/main/java/com/googlecode/d2j/asm/LdcOptimizeAdapter.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package com.googlecode.d2j.asm;
1717

18-
import org.objectweb.asm.ClassVisitor;
19-
import org.objectweb.asm.MethodVisitor;
20-
import org.objectweb.asm.Opcodes;
21-
import org.objectweb.asm.Type;
18+
import org.objectweb.asm2.ClassVisitor;
19+
import org.objectweb.asm2.MethodVisitor;
20+
import org.objectweb.asm2.Opcodes;
21+
import org.objectweb.asm2.Type;
2222

2323
/**
2424
* @author <a href="mailto:[email protected]">Panxiaobo</a>
@@ -36,7 +36,7 @@ public LdcOptimizeAdapter(MethodVisitor mv) {
3636
/*
3737
* (non-Javadoc)
3838
*
39-
* @see org.objectweb.asm.MethodAdapter#visitLdcInsn(java.lang.Object)
39+
* @see org.objectweb.asm2.MethodAdapter#visitLdcInsn(java.lang.Object)
4040
*/
4141
@Override
4242
public void visitLdcInsn(Object cst) {

‎dex-translator/src/main/java/com/googlecode/d2j/converter/IR2JConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import com.googlecode.dex2jar.ir.stmt.*;
3232
import com.googlecode.dex2jar.ir.stmt.Stmt.E2Stmt;
3333
import com.googlecode.dex2jar.ir.stmt.Stmt.ST;
34-
import org.objectweb.asm.*;
34+
import org.objectweb.asm2.*;
3535
import top.niunaijun.obfuscator.IRObfuscator;
3636
import top.niunaijun.obfuscator.ObfuscatorConfiguration;
3737

0 commit comments

Comments
 (0)