diff options
| author |  modmuss50 | 2021-05-22 10:23:30 +0100 |
|---|---|---|
| committer |  GitHub | 2021-05-22 10:23:30 +0100 |
| commit | 63e2616c4017633d231fb9ae369fdfd57d2adaca (patch) | |
| tree | 6e96d68441762b6654b303280661949f3672bc6c /enigma-swing | |
| parent | Bump version (diff) | |
| download | enigma-63e2616c4017633d231fb9ae369fdfd57d2adaca.tar.gz enigma-63e2616c4017633d231fb9ae369fdfd57d2adaca.tar.xz enigma-63e2616c4017633d231fb9ae369fdfd57d2adaca.zip | |
Update to Java 16 (#390)
* Java 16
* Cleanup
* Set CFR as the default decompiler, it seems to handle j16 stuff better
* Update build.gradle
Co-authored-by: YanisBft <doublecraft.official@gmail.com>
* Update proguard, disable broken tests
Co-authored-by: YanisBft <doublecraft.official@gmail.com>
Diffstat (limited to 'enigma-swing')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java | 2 | ||||
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java index 8ec8720d..8a10acec 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/UiConfig.java | |||
| @@ -102,7 +102,7 @@ public final class UiConfig { | |||
| 102 | } | 102 | } |
| 103 | 103 | ||
| 104 | public static Decompiler getDecompiler() { | 104 | public static Decompiler getDecompiler() { |
| 105 | return ui.data().section("Decompiler").setIfAbsentEnum(Decompiler::valueOf, "Current", Decompiler.PROCYON); | 105 | return ui.data().section("Decompiler").setIfAbsentEnum(Decompiler::valueOf, "Current", Decompiler.CFR); |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | public static void setDecompiler(Decompiler d) { | 108 | public static void setDecompiler(Decompiler d) { |
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java index fdd17d25..1265750f 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/legacy/Config.java | |||
| @@ -70,7 +70,7 @@ public class Config { | |||
| 70 | 70 | ||
| 71 | public float scaleFactor = 1.0f; | 71 | public float scaleFactor = 1.0f; |
| 72 | 72 | ||
| 73 | public Decompiler decompiler = Decompiler.PROCYON; | 73 | public Decompiler decompiler = Decompiler.CFR; |
| 74 | 74 | ||
| 75 | public Config() { | 75 | public Config() { |
| 76 | gson = new GsonBuilder() | 76 | gson = new GsonBuilder() |