Skip to content

Commit

Permalink
build: Update paperweight to 1.5.12 and Gradle Wrapper to 8.7 (#10361)
Browse files Browse the repository at this point in the history
  • Loading branch information
jpenilla authored Mar 29, 2024
1 parent 710dced commit 45d1486
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 52 deletions.
29 changes: 0 additions & 29 deletions build-data/spigot-server-patches/re-add-asm-dependency.patch

This file was deleted.

4 changes: 1 addition & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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",
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
10 changes: 2 additions & 8 deletions patches/server/0001-Setup-Gradle-project.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down

0 comments on commit 45d1486

Please sign in to comment.