From 037a0c37b4e89d806939a4b2894664fcbbee3dc6 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sun, 27 Jun 2021 10:17:46 +0100 Subject: Update dependencies Should fix #403 --- build.gradle | 6 +++--- enigma-swing/build.gradle | 6 +++--- enigma/build.gradle | 12 ++++++------ gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index fffab39d..fd2555c6 100644 --- a/build.gradle +++ b/build.gradle @@ -16,11 +16,11 @@ subprojects { } dependencies { - implementation 'com.google.guava:guava:30.1-jre' - implementation 'com.google.code.gson:gson:2.8.6' + implementation 'com.google.guava:guava:30.1.1-jre' + implementation 'com.google.code.gson:gson:2.8.7' testImplementation 'junit:junit:4.13.2' - testImplementation 'org.hamcrest:hamcrest-all:1.3' + testImplementation 'org.hamcrest:hamcrest:2.2' } group = 'cuchaz' diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle index 319f73a3..d1d03ee0 100644 --- a/enigma-swing/build.gradle +++ b/enigma-swing/build.gradle @@ -1,6 +1,6 @@ plugins { id 'application' - id 'com.github.johnrengelman.shadow' version '5.2.0' + id 'com.github.johnrengelman.shadow' version '7.0.0' } dependencies { @@ -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.0' - implementation 'com.formdev:flatlaf-extras:1.0' // for SVG icons + implementation 'com.formdev:flatlaf:1.2' + implementation 'com.formdev:flatlaf-extras:1.2' // 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 c3d26043..ec1c878c 100644 --- a/enigma/build.gradle +++ b/enigma/build.gradle @@ -3,15 +3,15 @@ configurations { } dependencies { - implementation 'org.ow2.asm:asm:9.1' - implementation 'org.ow2.asm:asm-commons:9.1' - implementation 'org.ow2.asm:asm-tree:9.1' - implementation 'org.ow2.asm:asm-util:9.1' + implementation 'org.ow2.asm:asm:9.2' + implementation 'org.ow2.asm:asm-commons:9.2' + implementation 'org.ow2.asm:asm-tree:9.2' + implementation 'org.ow2.asm:asm-util:9.2' implementation 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13' - implementation 'net.fabricmc:cfr:0.0.3' + implementation 'net.fabricmc:cfr:0.0.4' - proGuard 'com.guardsquare:proguard-base:7.1.0-beta4' + proGuard 'com.guardsquare:proguard-base:7.1.0-beta5' } // Generate "version.txt" file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0f80bbf5..69a97150 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.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -- cgit v1.2.3