diff options
| -rw-r--r-- | build-data/spigot-server-patches/re-add-asm-dependency.patch | 29 | ||||
| -rw-r--r-- | build.gradle.kts | 4 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 43462 -> 43453 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
| -rw-r--r-- | gradlew.bat | 20 | ||||
| -rw-r--r-- | patches/server/0001-Setup-Gradle-project.patch | 10 | ||||
| -rw-r--r-- | settings.gradle.kts | 2 |
7 files changed, 15 insertions, 52 deletions
diff --git a/build-data/spigot-server-patches/re-add-asm-dependency.patch b/build-data/spigot-server-patches/re-add-asm-dependency.patch deleted file mode 100644 index 6e33148caa..0000000000 --- a/build-data/spigot-server-patches/re-add-asm-dependency.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- /dev/null 2024-01-13 10:03:30.400485704 -0800 -+++ CraftBukkit-Patches/9999-re-add-asm-dependency.patch 2024-01-13 21:41:27.650692678 -0800 -@@ -0,0 +1,26 @@ -+From e5eb4fb3bfb61dfd2dc97411cfab5fa94033b90c Mon Sep 17 00:00:00 2001 -+From: Jake Potrebic <[email protected]> -+Date: Sat, 13 Jan 2024 21:41:02 -0800 -+Subject: [PATCH] re add asm dependency -+ -+ -+diff --git a/pom.xml b/pom.xml -+index 266853a682..d18fdadf92 100644 -+--- a/pom.xml -++++ b/pom.xml -+@@ -58,6 +58,12 @@ -+ <version>2.19.0</version> -+ <scope>compile</scope> -+ </dependency> -++ <dependency> -++ <groupId>org.ow2.asm</groupId> -++ <artifactId>asm</artifactId> -++ <version>9.5</version> -++ <scope>compile</scope> -++ </dependency> -+ <dependency> -+ <groupId>org.ow2.asm</groupId> -+ <artifactId>asm-commons</artifactId> -+-- -+2.43.0 -+ diff --git a/build.gradle.kts b/build.gradle.kts index 2e1633818c..77c0f153a2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "8.1.1" apply false - id("io.papermc.paperweight.core") version "1.5.11" + id("io.papermc.paperweight.core") version "1.5.12" } allprojects { @@ -93,8 +93,6 @@ paperweight { mappingsPatch = layout.projectDirectory.file("build-data/mappings-patch.tiny") reobfMappingsPatch = layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny") - spigotServerPatchPatchesDir = layout.projectDirectory.dir("build-data/spigot-server-patches") - reobfPackagesToFix.addAll( "co.aikar.timings", "com.destroystokyo.paper", diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex d64cd49177..e6441136f3 100644 --- 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 index 1af9e0930b..b82aa23a4f 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.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 93e3f59f13..25da30dbde 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index 858c5fc329..8d4ad0ab1c 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -175,10 +175,10 @@ index 0000000000000000000000000000000000000000..74849d7b20e3c3831a6a6c3715a6e875 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 22a2e4d92ba6774aa27c0bd123dac912b3e1ee65..0000000000000000000000000000000000000000 +index 323892c4a4bbbb9e36a6295bb390ad82798e213c..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,614 +0,0 @@ +@@ -1,608 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> @@ -241,12 +241,6 @@ index 22a2e4d92ba6774aa27c0bd123dac912b3e1ee65..00000000000000000000000000000000 - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> -- <artifactId>asm</artifactId> -- <version>9.5</version> -- <scope>compile</scope> -- </dependency> -- <dependency> -- <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> - <version>9.5</version> - <scope>compile</scope> diff --git a/settings.gradle.kts b/settings.gradle.kts index 5dabeac5af..706a83d5dd 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,7 +8,7 @@ pluginManagement { } plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.7.0" + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" } if (!file(".git").exists()) { |