Skip to content

Commit 42e7d28

Browse files
author
Francisco Solis
authored
Merge branch 'master' into patch/simplecoreapi-0.7.0
2 parents 1098755 + 5e81622 commit 42e7d28

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id("cl.franciscosolis.blossom-extended") version "1.3.1"
99

1010
kotlin("jvm") version "1.8.10"
11-
id("org.jetbrains.dokka") version "1.8.10"
11+
id("org.jetbrains.dokka") version "1.9.0"
1212
}
1313

1414
val env = project.rootProject.file(".env").let { file ->
@@ -35,9 +35,9 @@ repositories {
3535
dependencies {
3636
compileOnly("xyz.theprogramsrc:simplecoreapi:0.6.2-SNAPSHOT")
3737

38-
implementation("me.carleslc.Simple-YAML:Simple-Yaml:1.8.3")
38+
implementation("me.carleslc.Simple-YAML:Simple-Yaml:1.8.4")
3939

40-
testImplementation("org.junit.jupiter:junit-jupiter:5.9.2")
40+
testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
4141
}
4242

4343
blossom {

gradle/wrapper/gradle-wrapper.jar

2.06 KB
Binary file not shown.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

gradlew

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
200205
# Collect all arguments for the java command;
201206
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202207
# shell script including quotes and variable substitutions, so put them in

0 commit comments

Comments
 (0)