From 0e8a076d39c0fa7101cd724e0e96516b7e01238b Mon Sep 17 00:00:00 2001
From: modmuss50
Date: Wed, 17 Nov 2021 11:38:32 +0000
Subject: Update deps & Java 17 (#435)

* Update deps

* Java 17---
 .github/workflows/build.yml              | 4 ++--
 .github/workflows/release.yml            | 2 +-
 build.gradle                             | 6 +++---
 enigma-swing/build.gradle                | 4 ++--
 enigma/build.gradle                      | 6 +++---
 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:
   build:
     strategy:
       matrix:
-        java: [16-jdk]
+        java: [17-jdk]
     runs-on: ubuntu-20.04
     container:
       image: openjdk:${{ matrix.java }}
@@ -12,4 +12,4 @@ jobs:
     steps:
       - uses: actions/checkout@v1
       - uses: gradle/wrapper-validation-action@v1
-      - run: ./gradlew build --stacktrace
+      - 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:
   build:
     runs-on: ubuntu-20.04
     container:
-      image: openjdk:16-jdk
+      image: openjdk:17-jdk
       options: --user root
     steps:
       - 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 {
     apply plugin: 'java'
     apply plugin: 'maven-publish'
 
-    sourceCompatibility = JavaVersion.VERSION_16
-    targetCompatibility = JavaVersion.VERSION_16
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 
     repositories {
         mavenLocal()
@@ -40,7 +40,7 @@ subprojects {
     tasks.withType(JavaCompile).configureEach {
         it.options.encoding = "UTF-8"
 
-        it.options.release = 16
+        it.options.release = 17
     }
 
     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 {
     implementation project(':enigma-server')
 
     implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3'
-    implementation 'com.formdev:flatlaf:1.2'
-    implementation 'com.formdev:flatlaf-extras:1.2' // for SVG icons
+    implementation 'com.formdev:flatlaf:1.6.1'
+    implementation 'com.formdev:flatlaf-extras:1.6.1' // for SVG icons
     implementation 'de.sciss:syntaxpane:1.2.0'
     implementation 'com.github.lukeu:swing-dpi:0.9'
     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 {
     implementation 'org.ow2.asm:asm-util:9.2'
 
     implementation 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13'
-    implementation 'net.fabricmc:cfr:0.0.8'
+    implementation 'net.fabricmc:cfr:0.0.9'
 
-    proGuard 'com.guardsquare:proguard-base:7.2.0-beta1'
+    proGuard 'com.guardsquare:proguard-base:7.2.0-beta2'
 }
 
 // Generate "version.txt" file
@@ -47,7 +47,7 @@ file('src/test/java/cuchaz/enigma/inputs').listFiles().each { theFile ->
 
         task("${theFile.name}TestObf", type: JavaExec,
                 dependsOn: "${theFile.name}TestJar") {
-            main 'proguard.ProGuard'
+            mainClass = 'proguard.ProGuard'
             classpath configurations.proGuard
 
             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 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-- 
cgit v1.2.3