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/utils/Utils.java | |
| 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/utils/Utils.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/utils/Utils.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/cuchaz/enigma/utils/Utils.java b/src/main/java/cuchaz/enigma/utils/Utils.java index 17f6fb8..b8f2ec2 100644 --- a/src/main/java/cuchaz/enigma/utils/Utils.java +++ b/src/main/java/cuchaz/enigma/utils/Utils.java | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | package cuchaz.enigma.utils; | 12 | package cuchaz.enigma.utils; |
| 13 | 13 | ||
| 14 | import com.google.common.io.CharStreams; | 14 | import com.google.common.io.CharStreams; |
| 15 | import org.objectweb.asm.Opcodes; | ||
| 15 | 16 | ||
| 16 | import javax.swing.*; | 17 | import javax.swing.*; |
| 17 | import java.awt.*; | 18 | import java.awt.*; |
| @@ -30,6 +31,8 @@ import java.util.StringJoiner; | |||
| 30 | import java.util.stream.Collectors; | 31 | import java.util.stream.Collectors; |
| 31 | 32 | ||
| 32 | public class Utils { | 33 | public class Utils { |
| 34 | |||
| 35 | public static final int ASM_VERSION = Opcodes.ASM8; | ||
| 33 | 36 | ||
| 34 | public static int combineHashesOrdered(Object... objs) { | 37 | public static int combineHashesOrdered(Object... objs) { |
| 35 | final int prime = 67; | 38 | final int prime = 67; |