Update CFR to 1.50

apkreader · Oct 13, 2020 · 5dc8aca · 5dc8aca
1 parent cb6eac6
commit 5dc8aca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/lib/cfr_0_146.jar b/lib/cfr_0_146.jar
diff --git a/pom.xml b/pom.xml
@@ -68,22 +68,6 @@
 							<goal>install-file</goal>
 						</goals>
 					</execution>
-					<execution>
-						<id>install-cfr</id>
-						<phase>clean</phase>
-						<configuration>
-							<file>${basedir}/lib/cfr_0_146.jar</file>
-							<repositoryLayout>default</repositoryLayout>
-							<groupId>org.benf</groupId>
-							<artifactId>cfr</artifactId>
-							<version>1.4.6</version>
-							<packaging>jar</packaging>
-							<generatePom>true</generatePom>
-						</configuration>
-						<goals>
-							<goal>install-file</goal>
-						</goals>
-					</execution>
 					<execution>
 						<id>install-attach</id>
 						<phase>clean</phase>
@@ -230,7 +214,7 @@
 		<dependency>
 			<groupId>org.benf</groupId>
 			<artifactId>cfr</artifactId>
-			<version>0.146</version>
+			<version>0.150</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun</groupId>

diff --git a/src/main/java/me/grax/jbytemod/decompiler/CFRDecompiler.java b/src/main/java/me/grax/jbytemod/decompiler/CFRDecompiler.java
@@ -11,6 +11,7 @@
 import org.benf.cfr.reader.entities.constantpool.ConstantPool;
 import org.benf.cfr.reader.state.ClassFileSourceImpl;
 import org.benf.cfr.reader.state.DCCommonState;
+import org.benf.cfr.reader.util.AnalysisType;
 import org.benf.cfr.reader.util.bytestream.BaseByteData;
 import org.benf.cfr.reader.util.getopt.OptionsImpl;
 import org.benf.cfr.reader.util.output.ToStringDumper;
@@ -106,7 +107,6 @@ public String decompile(byte[] b, MethodNode mn) {
             }
             ClassFileSource2 cfs = new ClassFileSource2() {
 
-                @Override
                 public JarContent addJarContent(String s) {
                     return null;
                 }
@@ -133,6 +133,12 @@ public Pair<byte[], String> getClassFileContent(String path) throws IOException
                 public Collection<String> addJar(String arg0) {
                     throw new RuntimeException();
                 }
+
+				@Override
+				public JarContent addJarContent(String jarPath, AnalysisType analysisType) {
+					// TODO Auto-generated method stub
+					return null;
+				}
             };
             PluginRunner runner = new PluginRunner(ops, cfs);
             if (mn != null) {

diff --git a/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java b/src/main/java/me/grax/jbytemod/decompiler/Decompilers.java
@@ -1,7 +1,7 @@
 package me.grax.jbytemod.decompiler;
 
 public enum Decompilers {
-    CFR("CFR", "1.46"), PROCYON("Procyon", "0.5.36"), FERNFLOWER("Fernflower", ""), KRAKATAU("Krakatau", "502");
+    CFR("CFR", "1.50"), PROCYON("Procyon", "0.5.36"), FERNFLOWER("Fernflower", ""), KRAKATAU("Krakatau", "502");
     private String version;
     private String name;