diff --git a/build.gradle.kts b/build.gradle.kts index cd6c641773..a0fc5291c5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,7 @@ ext["versionNoHash"] = "$fullVersion${getVersionMeta(false)}" tasks { wrapper { - gradleVersion = "8.8" + gradleVersion = "8.10" distributionType = Wrapper.DistributionType.ALL } diff --git a/buildSrc/libs.versions.toml b/buildSrc/libs.versions.toml index 87a1e477a9..ba8080913d 100644 --- a/buildSrc/libs.versions.toml +++ b/buildSrc/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -shadow = "8.1.8" +shadow = "8.3.0" jetbrains-annotations = "23.0.0" via-nbt = "4.1.0" fast-util = "8.5.6" @@ -7,7 +7,7 @@ gson = "2.8.9" java-diff-utils = "4.12" [libraries] -shadow = { group = "io.github.goooler.shadow", name = "shadow-gradle-plugin", version.ref = "shadow" } +shadow = { group = "com.gradleup.shadow", name = "shadow-gradle-plugin", version.ref = "shadow" } jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version.ref = "jetbrains-annotations" } via-nbt = { group = "com.viaversion", name = "nbt", version.ref = "via-nbt" } fast-util = { group = "it.unimi.dsi", name = "fastutil", version.ref = "fast-util" } diff --git a/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts index 6b5f6cfd2f..684a4aef34 100644 --- a/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/packetevents.library-conventions.gradle.kts @@ -16,7 +16,7 @@ repositories { maven("https://oss.sonatype.org/content/groups/public/") } -val isShadow = project.pluginManager.hasPlugin("io.github.goooler.shadow") +val isShadow = project.pluginManager.hasPlugin("com.gradleup.shadow") dependencies { compileOnly("org.jetbrains:annotations:23.0.0") diff --git a/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts index d5c03e0574..413e1ff413 100644 --- a/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/packetevents.patching-conventions.gradle.kts @@ -1,6 +1,6 @@ plugins { `java-library` - io.github.goooler.shadow + com.gradleup.shadow } group = rootProject.group diff --git a/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts b/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts index 0fe5e6713c..890a250722 100644 --- a/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/packetevents.shadow-conventions.gradle.kts @@ -3,7 +3,7 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { java - io.github.goooler.shadow + com.gradleup.shadow } tasks { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f3..a4b76b9530 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 6f7a6eb33e..66cd5a0e49 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.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf1339..f5feea6d6b 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # 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 +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 7101f8e467..9b42019c79 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ##########################################################################