diff --git a/.gitignore b/.gitignore index 1e8c292..89d1a49 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ build # Ignore logs *.log + +# Ignore IDEA +.idea \ No newline at end of file diff --git a/build.gradle b/build.gradle index b221a0c..d2e7a22 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' } -version = '1.3.1' +version = '1.4.0' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -18,7 +18,7 @@ javadoc.options.encoding = 'UTF-8' ext { darklaf_ver = "2.2.0" - asm_ver = "8.0.1" + asm_ver = "9.7" } repositories { @@ -41,7 +41,7 @@ dependencies { compile "org.ow2.asm:asm-util:${asm_ver}" compile "org.ow2.asm:asm-commons:${asm_ver}" - compile 'org.benf:cfr:0.150' + compile 'org.benf:cfr:0.152' compile name: 'fernflower-15-05-20' compile 'com.fifesoft:rsyntaxtextarea:3.1.1' diff --git a/src/me/nov/cafecompare/Cafecompare.java b/src/me/nov/cafecompare/Cafecompare.java index 2106611..d729e71 100644 --- a/src/me/nov/cafecompare/Cafecompare.java +++ b/src/me/nov/cafecompare/Cafecompare.java @@ -90,7 +90,7 @@ private void initializeMenu() { JMenu decompiler = new JMenu("Decompiler"); ButtonGroup group = new ButtonGroup(); - JRadioButtonMenuItem cfr = new JEventRBMItem("CFR 0.149", group, () -> CodeView.decompilerBridge = new CFRBridge()); + JRadioButtonMenuItem cfr = new JEventRBMItem("CFR 0.152", group, () -> CodeView.decompilerBridge = new CFRBridge()); JRadioButtonMenuItem fernflower = new JEventRBMItem("Fernflower 15-05-20", group, () -> CodeView.decompilerBridge = new FernflowerBridge()); fernflower.setSelected(true); JRadioButtonMenuItem asmifier = new JEventRBMItem("Bytecode", group, () -> CodeView.decompilerBridge = new ASMifierBridge()); diff --git a/src/me/nov/cafecompare/asm/EasyTextifer.java b/src/me/nov/cafecompare/asm/EasyTextifer.java index 957712b..8b467e2 100644 --- a/src/me/nov/cafecompare/asm/EasyTextifer.java +++ b/src/me/nov/cafecompare/asm/EasyTextifer.java @@ -131,11 +131,6 @@ public void visitClassAttribute(final Attribute attribute) { public void visitNestMember(final String nestMember) { } - @Override - @Deprecated - public void visitPermittedSubtypeExperimental(final String permittedSubtype) { - } - @Override public void visitInnerClass(final String name, final String outerName, final String innerName, final int access) { }