From 8b70a8c322e3fb653f7b023ac1828ee94716dff4 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 17 Mar 2021 21:29:48 +0000 Subject: Update all deps, remove usage of jcenter (#359) * Update all deps, remove usage of jcenter * Use jdk 15--- .github/workflows/build.yml | 2 +- .github/workflows/release.yml | 2 +- build.gradle | 8 ++++---- enigma-swing/build.gradle | 2 +- enigma/build.gradle | 14 +++++--------- gradle/wrapper/gradle-wrapper.jar | Bin 58694 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 2 ++ gradlew.bat | 22 ++++------------------ 9 files changed, 19 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5aa1cd48..8557b586 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build: strategy: matrix: - java: [8-jdk, 11-jdk] + java: [8-jdk, 11-jdk, 15-jdk] runs-on: ubuntu-20.04 container: image: openjdk:${{ matrix.java }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8c221f6e..9590c180 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:11-jdk + image: openjdk:15-jdk options: --user root steps: - uses: actions/checkout@v1 diff --git a/build.gradle b/build.gradle index e23fa4ca..e05f8bbb 100644 --- a/build.gradle +++ b/build.gradle @@ -16,11 +16,11 @@ subprojects { } dependencies { - implementation 'com.google.guava:guava:28.0-jre' - implementation 'com.google.code.gson:gson:2.8.5' + implementation 'com.google.guava:guava:30.1-jre' + implementation 'com.google.code.gson:gson:2.8.6' - testImplementation 'junit:junit:4.+' - testImplementation 'org.hamcrest:hamcrest-all:1.+' + testImplementation 'junit:junit:4.13.2' + testImplementation 'org.hamcrest:hamcrest-all:1.3' } group = 'cuchaz' diff --git a/enigma-swing/build.gradle b/enigma-swing/build.gradle index 2966ae72..4f301391 100644 --- a/enigma-swing/build.gradle +++ b/enigma-swing/build.gradle @@ -10,7 +10,7 @@ dependencies { implementation 'net.sf.jopt-simple:jopt-simple:6.0-alpha-3' implementation 'com.bulenkov:darcula:1.0.0-bobbylight' implementation 'de.sciss:syntaxpane:1.2.0' - implementation 'com.github.lukeu:swing-dpi:0.6' + 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 3a136037..87ddf126 100644 --- a/enigma/build.gradle +++ b/enigma/build.gradle @@ -2,20 +2,16 @@ configurations { proGuard } -repositories.jcenter() - dependencies { - implementation 'org.ow2.asm:asm:9.0' - implementation 'org.ow2.asm:asm-commons:9.0' - implementation 'org.ow2.asm:asm-tree:9.0' - implementation 'org.ow2.asm:asm-util:9.0' + 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 'net.fabricmc:procyon-fabric-compilertools:0.5.35.13' implementation 'net.fabricmc:cfr:0.0.2' - testImplementation 'junit:junit:4.+' - testImplementation 'org.hamcrest:hamcrest-all:1.+' - proGuard 'com.guardsquare:proguard-base:7.0.1' + proGuard 'com.guardsquare:proguard-base:7.1.0-beta1' } // Generate "version.txt" file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 490fda85..e708b1c0 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4d9ca164..442d9132 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-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7d..4f906e0c 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath diff --git a/gradlew.bat b/gradlew.bat index 62bd9b9c..107acd32 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -64,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -- cgit v1.2.3