Merge pull request #935 from rafi67000/gradleUpdate

Gradle, and shadow update
retrooper · Aug 29, 2024 · dc015dc · dc015dc
2 parents fd7bc84 + a2d259a
commit dc015dc
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git 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
@@ -1,13 +1,13 @@
 [versions]
-shadow = "8.1.8"
+shadow = "8.3.0"
 jetbrains-annotations = "23.0.0"
 via-nbt = "4.1.0"
 fast-util = "8.5.6"
 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
@@ -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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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 ##########################################################################