Skip to content

Commit

Permalink
Updated gradle wrapper to 8.5; miglayout to 11.3; junit to 5.10
Browse files Browse the repository at this point in the history
  • Loading branch information
kaikramer committed Jan 4, 2024
1 parent 22cbe75 commit 896cae8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 13 deletions.
15 changes: 8 additions & 7 deletions kse/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ ext {
launcherOutDir = "$buildDir/launcher"
jlinkOutDir = "$buildDir/jlink"
appBundleDir = "$buildDir/appBundle"
distDir = "$buildDir/${base.distsDirName}"
distDir = base.distsDirectory.toString()
dmgDir = "$projectDir/dmg"
dependenciesDir = Paths.get(buildDir.toString(), "dependencies") // for NSIS we need Windows path separators

Expand Down Expand Up @@ -106,19 +106,20 @@ dependencies {
implementation('org.bouncycastle:bcpkix-jdk18on:1.77')
implementation('net.java.dev.jna:jna:5.13.0')
implementation('commons-io:commons-io:2.15.1')
implementation('com.miglayout:miglayout-swing:5.3')
implementation('com.formdev:flatlaf:3.2')
implementation('com.miglayout:miglayout-swing:11.3')
implementation('com.formdev:flatlaf:3.2.5')
implementation('com.nimbusds:nimbus-jose-jwt:9.30.2')
implementation('org.violetlib:vaqua:11')
implementation('io.github.java-diff-utils:java-diff-utils:4.12')
implementation('org.openjdk.nashorn:nashorn-core:15.4')
implementation('com.fasterxml.jackson.jr:jackson-jr-objects:2.14.2')
implementation('com.fasterxml.jackson.jr:jackson-jr-annotation-support:2.14.2')

testImplementation('org.assertj:assertj-core:3.23.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.9.0')
testImplementation('org.junit.jupiter:junit-jupiter-params:5.9.0')
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.9.0')
testImplementation('org.assertj:assertj-core:3.25.1')
testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.1')
testImplementation('org.junit.jupiter:junit-jupiter-params:5.10.1')
testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.1')
testRuntimeOnly('org.junit.platform:junit-platform-launcher')
}

test {
Expand Down
Binary file modified kse/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion kse/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
15 changes: 10 additions & 5 deletions kse/gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,10 +131,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down Expand Up @@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down

0 comments on commit 896cae8

Please sign in to comment.