diff options
| author | 2020-04-02 10:36:27 -0500 | |
|---|---|---|
| committer | 2020-04-02 16:36:27 +0100 | |
| commit | ccccfa1786d783867daf91fbfa522d4a5c55dfdb (patch) | |
| tree | b09cbde37e4757c993d59dfd70bfee81fbbd5e63 /src/main/java/cuchaz/enigma/analysis/index | |
| parent | Merge pull request #203 from Runemoro/fix-cfr (diff) | |
| download | enigma-fork-ccccfa1786d783867daf91fbfa522d4a5c55dfdb.tar.gz enigma-fork-ccccfa1786d783867daf91fbfa522d4a5c55dfdb.tar.xz enigma-fork-ccccfa1786d783867daf91fbfa522d4a5c55dfdb.zip | |
Support java 9+ and gradle 6+ (#206)
* Support java 9+ and gradle 6+
* Update asm
Signed-off-by: liach <liach@users.noreply.github.com>
* Use asm 8 and move that to a constant
* Bump version
* fix version format
Co-authored-by: liach <liach@users.noreply.github.com>
Diffstat (limited to 'src/main/java/cuchaz/enigma/analysis/index')
| -rw-r--r-- | src/main/java/cuchaz/enigma/analysis/index/JarIndex.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java b/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java index c96e774..e401c2f 100644 --- a/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java +++ b/src/main/java/cuchaz/enigma/analysis/index/JarIndex.java | |||
| @@ -22,6 +22,7 @@ import cuchaz.enigma.translation.representation.Lambda; | |||
| 22 | import cuchaz.enigma.translation.representation.entry.*; | 22 | import cuchaz.enigma.translation.representation.entry.*; |
| 23 | import cuchaz.enigma.utils.I18n; | 23 | import cuchaz.enigma.utils.I18n; |
| 24 | 24 | ||
| 25 | import cuchaz.enigma.utils.Utils; | ||
| 25 | import org.objectweb.asm.ClassReader; | 26 | import org.objectweb.asm.ClassReader; |
| 26 | import org.objectweb.asm.Opcodes; | 27 | import org.objectweb.asm.Opcodes; |
| 27 | 28 | ||
| @@ -63,10 +64,10 @@ public class JarIndex implements JarIndexer { | |||
| 63 | progress.init(4, I18n.translate("progress.jar.indexing")); | 64 | progress.init(4, I18n.translate("progress.jar.indexing")); |
| 64 | 65 | ||
| 65 | progress.step(1, I18n.translate("progress.jar.indexing.entries")); | 66 | progress.step(1, I18n.translate("progress.jar.indexing.entries")); |
| 66 | classCache.visit(() -> new IndexClassVisitor(this, Opcodes.ASM5), ClassReader.SKIP_CODE); | 67 | classCache.visit(() -> new IndexClassVisitor(this, Utils.ASM_VERSION), ClassReader.SKIP_CODE); |
| 67 | 68 | ||
| 68 | progress.step(2, I18n.translate("progress.jar.indexing.references")); | 69 | progress.step(2, I18n.translate("progress.jar.indexing.references")); |
| 69 | classCache.visit(() -> new IndexReferenceVisitor(this, entryIndex, inheritanceIndex, Opcodes.ASM5), 0); | 70 | classCache.visit(() -> new IndexReferenceVisitor(this, entryIndex, inheritanceIndex, Utils.ASM_VERSION), 0); |
| 70 | 71 | ||
| 71 | progress.step(3, I18n.translate("progress.jar.indexing.methods")); | 72 | progress.step(3, I18n.translate("progress.jar.indexing.methods")); |
| 72 | bridgeMethodIndex.findBridgeMethods(); | 73 | bridgeMethodIndex.findBridgeMethods(); |