diff options
| author | 2021-11-17 11:38:32 +0000 | |
|---|---|---|
| committer | 2021-11-17 11:38:32 +0000 | |
| commit | 0e8a076d39c0fa7101cd724e0e96516b7e01238b (patch) | |
| tree | 5e319d15f43e18ea52e49c585001663b6577a575 | |
| parent | Don't drop none root method mappings that have args/local mappings. (#434) (diff) | |
| download | enigma-fork-0e8a076d39c0fa7101cd724e0e96516b7e01238b.tar.gz enigma-fork-0e8a076d39c0fa7101cd724e0e96516b7e01238b.tar.xz enigma-fork-0e8a076d39c0fa7101cd724e0e96516b7e01238b.zip | |
Update deps & Java 17 (#435)
* Update deps
* Java 17
| -rw-r--r-- | .github/workflows/build.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | enigma-swing/build.gradle | 4 | ||||
| -rw-r--r-- | enigma/build.gradle | 6 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7abda86..93a2e1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -4,7 +4,7 @@ jobs: | |||
| 4 | build: | 4 | build: |
| 5 | strategy: | 5 | strategy: |
| 6 | matrix: | 6 | matrix: |
| 7 | java: [16-jdk] | 7 | java: [17-jdk] |
| 8 | runs-on: ubuntu-20.04 | 8 | runs-on: ubuntu-20.04 |
| 9 | container: | 9 | container: |
| 10 | image: openjdk:${{ matrix.java }} | 10 | image: openjdk:${{ matrix.java }} |
| @@ -12,4 +12,4 @@ jobs: | |||
| 12 | steps: | 12 | steps: |
| 13 | - uses: actions/checkout@v1 | 13 | - uses: actions/checkout@v1 |
| 14 | - uses: gradle/wrapper-validation-action@v1 | 14 | - uses: gradle/wrapper-validation-action@v1 |
| 15 | - run: ./gradlew build --stacktrace | 15 | - run: ./gradlew build --stacktrace --warning-mode fail |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ea389b..48aacde 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml | |||
| @@ -4,7 +4,7 @@ jobs: | |||
| 4 | build: | 4 | build: |
| 5 | runs-on: ubuntu-20.04 | 5 | runs-on: ubuntu-20.04 |
| 6 | container: | 6 | container: |
| 7 | image: openjdk:16-jdk | 7 | image: openjdk:17-jdk |
| 8 | options: --user root | 8 | options: --user root |
| 9 | steps: | 9 | steps: |
| 10 | - uses: actions/checkout@v1 | 10 | - uses: actions/checkout@v1 |
diff --git a/build.gradle b/build.gradle index 39a0e63..2cd61e4 100644 --- a/build.gradle +++ b/build.gradle | |||
| @@ -6,8 +6,8 @@ subprojects { | |||
| 6 | apply plugin: 'java' | 6 | apply plugin: 'java' |
| 7 | apply plugin: 'maven-publish' | 7 | apply plugin: 'maven-publish' |
| 8 | 8 | ||
| 9 | sourceCompatibility = JavaVersion.VERSION_16 | 9 | sourceCompatibility = JavaVersion.VERSION_17 |
| 10 | targetCompatibility = JavaVersion.VERSION_16 | 10 | targetCompatibility = JavaVersion.VERSION_17 |
| 11 | 11 | ||
| 12 | repositories { | 12 | repositories { |
| 13 | mavenLocal() | 13 | mavenLocal() |
| @@ -40,7 +40,7 @@ subprojects { | |||
| 40 | tasks.withType(JavaCompile).configureEach { | 40 | tasks.withType(JavaCompile).configureEach { |
| 41 | it.options.encoding = "UTF-8" | 41 | it.options.encoding = "UTF-8" |
| 42 | 42 | ||
| 43 | it.options.release = 16 | 43 | it.options.release = 17 |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | publishing { | 46 | publishing { |
diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle index 979dc25..ec7b4e2 100644 --- a/enigma-swing/build.gradle +++ b/enigma-swing/build.gradle | |||
| @@ -8,8 +8,8 @@ dependencies { | |||
| 8 | implementation project(':enigma-server') | 8 | implementation project(':enigma-server') |
| 9 | 9 | ||
| 10 | implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' | 10 | implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' |
| 11 | implementation 'com.formdev:flatlaf:1.2' | 11 | implementation 'com.formdev:flatlaf:1.6.1' |
| 12 | implementation 'com.formdev:flatlaf-extras:1.2' // for SVG icons | 12 | implementation 'com.formdev:flatlaf-extras:1.6.1' // for SVG icons |
| 13 | implementation 'de.sciss:syntaxpane:1.2.0' | 13 | implementation 'de.sciss:syntaxpane:1.2.0' |
| 14 | implementation 'com.github.lukeu:swing-dpi:0.9' | 14 | implementation 'com.github.lukeu:swing-dpi:0.9' |
| 15 | implementation 'org.drjekyll:fontchooser:2.4' | 15 | implementation 'org.drjekyll:fontchooser:2.4' |
diff --git a/enigma/build.gradle b/enigma/build.gradle index 7b1a5f5..3ab716d 100644 --- a/enigma/build.gradle +++ b/enigma/build.gradle | |||
| @@ -9,9 +9,9 @@ dependencies { | |||
| 9 | implementation 'org.ow2.asm:asm-util:9.2' | 9 | implementation 'org.ow2.asm:asm-util:9.2' |
| 10 | 10 | ||
| 11 | implementation 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13' | 11 | implementation 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13' |
| 12 | implementation 'net.fabricmc:cfr:0.0.8' | 12 | implementation 'net.fabricmc:cfr:0.0.9' |
| 13 | 13 | ||
| 14 | proGuard 'com.guardsquare:proguard-base:7.2.0-beta1' | 14 | proGuard 'com.guardsquare:proguard-base:7.2.0-beta2' |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | // Generate "version.txt" file | 17 | // Generate "version.txt" file |
| @@ -47,7 +47,7 @@ file('src/test/java/cuchaz/enigma/inputs').listFiles().each { theFile -> | |||
| 47 | 47 | ||
| 48 | task("${theFile.name}TestObf", type: JavaExec, | 48 | task("${theFile.name}TestObf", type: JavaExec, |
| 49 | dependsOn: "${theFile.name}TestJar") { | 49 | dependsOn: "${theFile.name}TestJar") { |
| 50 | main 'proguard.ProGuard' | 50 | mainClass = 'proguard.ProGuard' |
| 51 | classpath configurations.proGuard | 51 | classpath configurations.proGuard |
| 52 | 52 | ||
| 53 | args '@src/test/resources/proguard-test.conf', '-injars', file('build/test-inputs/' + | 53 | args '@src/test/resources/proguard-test.conf', '-injars', file('build/test-inputs/' + |
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a2..e750102 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | distributionBase=GRADLE_USER_HOME | 1 | distributionBase=GRADLE_USER_HOME |
| 2 | distributionPath=wrapper/dists | 2 | distributionPath=wrapper/dists |
| 3 | distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip | 3 | distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip |
| 4 | zipStoreBase=GRADLE_USER_HOME | 4 | zipStoreBase=GRADLE_USER_HOME |
| 5 | zipStorePath=wrapper/dists | 5 | zipStorePath=wrapper/dists |