Skip to content

Commit

Permalink
Gradle 8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
xGab0 committed Oct 7, 2023
1 parent 2bbdd05 commit 5038399
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
11 changes: 6 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

tasks.withType<ProcessResources> {
filteringCharset = "UTF-8"
}

tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
}
Expand All @@ -27,10 +31,6 @@ java {

exclude("**/resources/server.json")
}

tasks.withType<ProcessResources> {
filteringCharset = "UTF-8"
}
}

shadow {
Expand Down Expand Up @@ -73,12 +73,13 @@ dependencies {
val minestom_version = project.property("minestom_version")!! as String
val jnoise_version = project.property("jnoise_version")!! as String
val minimessage_version = project.property("minimessage_version")!! as String
val jackson_version = project.property("jackson_version")!! as String

implementation("com.github.Minestom:Minestom:$minestom_version")
implementation("de.articdive:jnoise-pipeline:$jnoise_version")
implementation("com.github.CatDevz:SlimeLoader:master-SNAPSHOT")
implementation("net.kyori:adventure-text-minimessage:$minimessage_version")
implementation("com.fasterxml.jackson.core:jackson-databind:2.14.2")
implementation("com.fasterxml.jackson.core:jackson-databind:$jackson_version")
}

tasks {
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ description = A launcher made for Minestom
# libraries versions
minestom_version = 2cdb3911b0
jnoise_version = 4.1.0-SNAPSHOT
minimessage_version = 4.14.0
minimessage_version = 4.14.0
jackson_version = 2.15.2
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
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.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
14 changes: 7 additions & 7 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -202,11 +202,11 @@ 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
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down

0 comments on commit 5038399

Please sign in to comment.