diff --git a/build.gradle.kts b/build.gradle.kts index 3154c81..b7d07f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,7 +5,7 @@ plugins { } group = "dev.plex" -version = "1.4-SNAPSHOT" +version = "1.5-SNAPSHOT" description = "Module-HTTPD" repositories { @@ -25,24 +25,26 @@ repositories { includeGroup("com.github.MilkBowl") } } + + maven { url = uri("https://maven.enginehub.org/repo/") } } dependencies { - implementation("org.projectlombok:lombok:1.18.30") - annotationProcessor("org.projectlombok:lombok:1.18.30") - implementation("io.papermc.paper:paper-api:1.20.4-R0.1-SNAPSHOT") - implementation("dev.plex:server:1.4-SNAPSHOT") - implementation("org.json:json:20231013") + implementation("org.projectlombok:lombok:1.18.34") + annotationProcessor("org.projectlombok:lombok:1.18.34") + implementation("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT") + implementation("dev.plex:server:1.5-SNAPSHOT") + implementation("org.json:json:20240303") implementation("org.reflections:reflections:0.10.2") - implementation("org.eclipse.jetty:jetty-server:11.0.19") - implementation("org.eclipse.jetty:jetty-servlet:11.0.19") - implementation("org.eclipse.jetty:jetty-proxy:11.0.19") + implementation("org.eclipse.jetty:jetty-server:11.0.24") + implementation("org.eclipse.jetty:jetty-servlet:11.0.24") + implementation("org.eclipse.jetty:jetty-proxy:11.0.24") implementation("com.github.MilkBowl:VaultAPI:1.7.1") { exclude("org.bukkit", "bukkit") } - implementation(platform("com.intellectualsites.bom:bom-newest:1.40")) // Ref: https://github.com/IntellectualSites/bom - compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core") - implementation("commons-io:commons-io:2.15.1") + implementation(platform("com.intellectualsites.bom:bom-newest:1.49")) // Ref: https://github.com/IntellectualSites/bom + compileOnly("com.fastasyncworldedit:FastAsyncWorldEdit-Core:2.11.2") + implementation("commons-io:commons-io:2.17.0") } tasks.getByName("jar") { @@ -55,7 +57,7 @@ tasks.getByName("jar") { } java { - toolchain.languageVersion.set(JavaLanguageVersion.of(17)) + toolchain.languageVersion.set(JavaLanguageVersion.of(21)) } tasks { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 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 1af9e09..df97d72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 0adc8e1..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -145,7 +145,7 @@ 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 @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | 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 @@ -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" \ diff --git a/src/main/resources/module.yml b/src/main/resources/module.yml index 8eedbd8..de54556 100644 --- a/src/main/resources/module.yml +++ b/src/main/resources/module.yml @@ -1,4 +1,4 @@ name: Module-HTTPD -version: 1.4-SNAPSHOT +version: 1.5-SNAPSHOT description: HTTPD server for Plex main: dev.plex.HTTPDModule \ No newline at end of file