mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-27 15:00:13 +01:00
build: Update paperweight to 1.5.12 and Gradle Wrapper to 8.7 (#10361)
This commit is contained in:
parent
8fa3b24907
commit
2b24892fa4
7 changed files with 13 additions and 50 deletions
|
@ -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 +0,0 @@
|
|
||||||
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
||||||
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
||||||
+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
|
|
||||||
+@@ -0,0 +0,0 @@
|
|
||||||
+ <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
|
|
||||||
+
|
|
|
@ -11,7 +11,7 @@ plugins {
|
||||||
java
|
java
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
id("com.github.johnrengelman.shadow") version "8.1.1" apply false
|
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 {
|
allprojects {
|
||||||
|
@ -93,8 +93,6 @@ paperweight {
|
||||||
mappingsPatch = layout.projectDirectory.file("build-data/mappings-patch.tiny")
|
mappingsPatch = layout.projectDirectory.file("build-data/mappings-patch.tiny")
|
||||||
reobfMappingsPatch = layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny")
|
reobfMappingsPatch = layout.projectDirectory.file("build-data/reobf-mappings-patch.tiny")
|
||||||
|
|
||||||
spigotServerPatchPatchesDir = layout.projectDirectory.dir("build-data/spigot-server-patches")
|
|
||||||
|
|
||||||
reobfPackagesToFix.addAll(
|
reobfPackagesToFix.addAll(
|
||||||
"co.aikar.timings",
|
"co.aikar.timings",
|
||||||
"com.destroystokyo.paper",
|
"com.destroystokyo.paper",
|
||||||
|
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
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
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|
20
gradlew.bat
vendored
20
gradlew.bat
vendored
|
@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|
|
@ -241,12 +241,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
- </dependency>
|
- </dependency>
|
||||||
- <dependency>
|
- <dependency>
|
||||||
- <groupId>org.ow2.asm</groupId>
|
- <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>
|
- <artifactId>asm-commons</artifactId>
|
||||||
- <version>9.5</version>
|
- <version>9.5</version>
|
||||||
- <scope>compile</scope>
|
- <scope>compile</scope>
|
||||||
|
|
|
@ -8,7 +8,7 @@ pluginManagement {
|
||||||
}
|
}
|
||||||
|
|
||||||
plugins {
|
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()) {
|
if (!file(".git").exists()) {
|
||||||
|
|
Loading…
Reference in a new issue