OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 23:57:43 +01:00
Code Issues Projects Releases Packages Wiki Activity
PaperMC/patches/api/0001-Convert-project-to-Gradle.patch

367 lines
13 KiB
Diff
Raw Normal View History

Move patches around
2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
Update email & name (DenWav) Also I think I prefer my few tiny patches to be GPL.
2021-07-20 04:07:53 +02:00
From: Kyle Wood <kyle@denwav.dev>
Move patches around
2021-06-11 14:02:28 +02:00
Date: Thu, 10 Dec 2020 20:50:33 -0800
Subject: [PATCH] Convert project to Gradle
remove remaining POMs
2021-06-17 19:11:00 +02:00
The pom.xml file is deleted in this patch so the patch will fail to
apply if there are changes made to it from upstream - thus notifying us
that changes were made.
Move patches around
2021-06-11 14:02:28 +02:00
diff --git a/.gitignore b/.gitignore
[ci skip] add vs code files to .gitignore (#5663)
2021-08-07 02:27:45 +02:00
index e431e3435737e28394d81b56568a08b3c3148b9b..b23bde3b5e881f146539a307d0a59f2177b6a036 100644
Move patches around
2021-06-11 14:02:28 +02:00
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.gradle/
+
# Eclipse stuff
/.classpath
/.project
[ci skip] add vs code files to .gitignore (#5663)
2021-08-07 02:27:45 +02:00
@@ -30,3 +32,7 @@
*.ipr
*.iws
.idea/
+
+# vs code
+/.vscode
+/.factorypath
Move patches around
2021-06-11 14:02:28 +02:00
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
Upgrade paperweight with bundler jar updates This allows creating paperclip jars pre-patch (only the reobf'd jar for now).
2021-11-26 07:08:46 +01:00
index 0000000000000000000000000000000000000000..3ccff060bcb816520a27ec2f34adc977dd49ce1d
Move patches around
2021-06-11 14:02:28 +02:00
--- /dev/null
+++ b/build.gradle.kts
Upgrade paperweight with bundler jar updates This allows creating paperclip jars pre-patch (only the reobf'd jar for now).
2021-11-26 07:08:46 +01:00
@@ -0,0 +1,65 @@
Move patches around
2021-06-11 14:02:28 +02:00
+plugins {
+ `java-library`
Put pom in correct location for Paperclip install to maven local feature
2021-06-15 03:50:13 +02:00
+ `maven-publish`
Move patches around
2021-06-11 14:02:28 +02:00
+}
+
+java {
+ withSourcesJar()
+ withJavadocJar()
+}
+
+dependencies {
+ // api dependencies are listed transitively to API consumers
+ api("commons-lang:commons-lang:2.6")
Update API patches
2021-11-22 06:21:37 +01:00
+ api("com.google.guava:guava:31.0.1-jre")
+ api("com.google.code.gson:gson:2.8.8")
Move patches around
2021-06-11 14:02:28 +02:00
+ api("net.md-5:bungeecord-chat:1.16-R0.4")
downgrade snakeyaml to fix issues with comments this was done by upstream, but got missed. Thanks @mrfloris for pointing this out.
2021-06-18 16:34:30 +02:00
+ api("org.yaml:snakeyaml:1.28")
Move patches around
2021-06-11 14:02:28 +02:00
+
+ compileOnly("org.apache.maven:maven-resolver-provider:3.8.1")
+ compileOnly("org.apache.maven.resolver:maven-resolver-connector-basic:1.7.0")
+ compileOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.7.0")
+
+ val annotations = "org.jetbrains:annotations-java5:21.0.1"
+ compileOnly(annotations)
+ testCompileOnly(annotations)
+
+ testImplementation("junit:junit:4.13.1")
+ testImplementation("org.hamcrest:hamcrest-library:1.3")
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379) Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-13 19:08:34 +02:00
+ testImplementation("org.ow2.asm:asm-tree:9.2")
Move patches around
2021-06-11 14:02:28 +02:00
+}
+
Put pom in correct location for Paperclip install to maven local feature
2021-06-15 03:50:13 +02:00
+configure<PublishingExtension> {
+ publications.create<MavenPublication>("maven") {
+ from(components["java"])
+ }
+}
+
Write API version to pom.properties for Versioning to read Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
2021-06-13 03:28:41 +02:00
+val generateApiVersioningFile by tasks.registering {
[ci skip] Resolve apiAndDocs sources during Javadoc task execution rather than during configuration time (#6836)
2021-10-27 04:45:45 +02:00
+ inputs.property("version", project.version)
Write API version to pom.properties for Versioning to read Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
2021-06-13 03:28:41 +02:00
+ val pomProps = layout.buildDirectory.file("pom.properties")
+ outputs.file(pomProps)
+ doLast {
+ pomProps.get().asFile.writeText("version=${project.version}")
+ }
+}
+
Move patches around
2021-06-11 14:02:28 +02:00
+tasks.jar {
Write API version to pom.properties for Versioning to read Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
2021-06-13 03:28:41 +02:00
+ from(generateApiVersioningFile.map { it.outputs.files.singleFile }) {
Upgrade paperweight with bundler jar updates This allows creating paperclip jars pre-patch (only the reobf'd jar for now).
2021-11-26 07:08:46 +01:00
+ into("META-INF/maven/${project.group}/${project.name}")
Write API version to pom.properties for Versioning to read Maven writes this metadata normally, but we don't use maven. Maybe should modify Versioning instead in the future, but this works just fine for now.
2021-06-13 03:28:41 +02:00
+ }
Move patches around
2021-06-11 14:02:28 +02:00
+ manifest {
[ci skip] Resolve apiAndDocs sources during Javadoc task execution rather than during configuration time (#6836)
2021-10-27 04:45:45 +02:00
+ attributes(
Move patches around
2021-06-11 14:02:28 +02:00
+ "Automatic-Module-Name" to "org.bukkit"
+ )
+ }
+}
+
[ci skip] Resolve apiAndDocs sources during Javadoc task execution rather than during configuration time (#6836)
2021-10-27 04:45:45 +02:00
+tasks.withType<Javadoc> {
Move patches around
2021-06-11 14:02:28 +02:00
+ (options as StandardJavadocDocletOptions).links(
Update API patches
2021-11-22 06:21:37 +01:00
+ "https://guava.dev/releases/31.0.1-jre/api/docs/",
Update to Minecraft 1.17.1 (#6097)
2021-07-07 08:52:40 +02:00
+ "https://javadoc.io/doc/org.yaml/snakeyaml/1.28/",
+ "https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/",
Add back linking to Adventure Javadoc (#6088)
2021-07-06 05:25:23 +02:00
+ "https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/",
Move patches around
2021-06-11 14:02:28 +02:00
+ )
+}
remove remaining POMs
2021-06-17 19:11:00 +02:00
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 716b4fce Revert SnakeYAML upgrade ca6f8942 Update to Minecraft 1.18-rc3 57e7e952 #683: Add Player#showDemoScreen CraftBukkit Changes: c98abfb0 Update to Minecraft 1.18-rc3 9b258501 #960: Add Player#showDemoScreen d9542247 Produce remapped jars after bootstrap jar 99f3ddde SPIGOT-6808: Fix RegionAccessor#getBiome Spigot Changes: b7a4222e Update to Minecraft 1.18-rc3
2021-11-26 23:58:39 +01:00
index 8a8fa2c76ecbd78b5bc57fe0be9abca5dc20ad86..0000000000000000000000000000000000000000
remove remaining POMs
2021-06-17 19:11:00 +02:00
--- a/pom.xml
+++ /dev/null
@@ -1,262 +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>
-
- <groupId>org.spigotmc</groupId>
- <artifactId>spigot-api</artifactId>
Updated Upstream (Bukkit/CraftBukkit/Spigot) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 716b4fce Revert SnakeYAML upgrade ca6f8942 Update to Minecraft 1.18-rc3 57e7e952 #683: Add Player#showDemoScreen CraftBukkit Changes: c98abfb0 Update to Minecraft 1.18-rc3 9b258501 #960: Add Player#showDemoScreen d9542247 Produce remapped jars after bootstrap jar 99f3ddde SPIGOT-6808: Fix RegionAccessor#getBiome Spigot Changes: b7a4222e Update to Minecraft 1.18-rc3
2021-11-26 23:58:39 +01:00
- <version>1.18-rc3-R0.1-SNAPSHOT</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <packaging>jar</packaging>
-
- <name>Spigot-API</name>
- <url>https://www.spigotmc.org/</url>
- <description>An enhanced plugin API for Minecraft servers.</description>
-
- <properties>
- <skipTests>true</skipTests>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <distributionManagement>
- <repository>
- <id>spigotmc-releases</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/releases/</url>
- </repository>
- <snapshotRepository>
- <id>spigotmc-snapshots</id>
- <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
- <dependencies>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- <scope>compile</scope>
- </dependency>
- <!-- bundled with Minecraft, should be kept in sync -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
Update API patches
2021-11-22 06:21:37 +01:00
- <version>31.0.1-jre</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <scope>compile</scope>
- </dependency>
- <!-- bundled with Minecraft, should be kept in sync -->
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
Update API patches
2021-11-22 06:21:37 +01:00
- <version>2.8.8</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>net.md-5</groupId>
- <artifactId>bungeecord-chat</artifactId>
- <version>1.16-R0.4</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.28</version>
- <scope>compile</scope>
- </dependency>
- <!-- not part of the API proper -->
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-resolver-provider</artifactId>
- <version>3.8.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-connector-basic</artifactId>
- <version>1.7.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.resolver</groupId>
- <artifactId>maven-resolver-transport-http</artifactId>
- <version>1.7.0</version>
- <scope>provided</scope>
- </dependency>
- <!-- annotations -->
- <dependency>
- <groupId>org.jetbrains</groupId>
- <artifactId>annotations-java5</artifactId>
- <version>21.0.1</version>
- <scope>provided</scope>
- </dependency>
- <!-- testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm-tree</artifactId>
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6379) Co-authored-by: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
2021-08-13 19:08:34 +02:00
- <version>9.2</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>net.md-5</groupId>
- <artifactId>scriptus</artifactId>
- <version>0.4.1</version>
- <executions>
- <execution>
- <phase>initialize</phase>
- <goals>
- <goal>describe</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.1</version>
- <configuration>
- <!-- we use the Eclipse compiler as it doesn't need a JDK -->
- <compilerId>eclipse</compilerId>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId>
- <version>2.8.8</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>ecj</artifactId>
Update API patches
2021-11-22 06:21:37 +01:00
- <version>3.27.0</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.2.0</version>
- <configuration>
- <archive>
- <manifest>
- <addDefaultEntries>false</addDefaultEntries>
- </manifest>
- <manifestEntries>
- <Automatic-Module-Name>org.bukkit</Automatic-Module-Name>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
Update to Minecraft 1.17.1 (#6097)
2021-07-07 08:52:40 +02:00
- <version>3.2.4</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/MANIFEST.MF</exclude>
- </excludes>
- </filter>
- </filters>
- <!-- when downloading via Maven we can pull depends individually -->
- <shadedArtifactAttached>true</shadedArtifactAttached>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
Update API patches
2021-11-22 06:21:37 +01:00
- <version>3.3.1</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <configuration>
- <links>
Update API patches
2021-11-22 06:21:37 +01:00
- <link>https://guava.dev/releases/31.0.1-jre/api/docs/</link>
Update to Minecraft 1.17.1 (#6097)
2021-07-07 08:52:40 +02:00
- <link>https://javadoc.io/doc/org.yaml/snakeyaml/1.28/</link>
- <link>https://javadoc.io/doc/org.jetbrains/annotations-java5/21.0.1/</link>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <link>https://javadoc.io/doc/net.md-5/bungeecord-chat/1.16-R0.4/</link>
- </links>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>development</id>
- <properties>
- <skipTests>false</skipTests>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
Update to Minecraft 1.17.1 (#6097)
2021-07-07 08:52:40 +02:00
- <version>3.1.2</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <configLocation>checkstyle.xml</configLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>com.puppycrawl.tools</groupId>
- <artifactId>checkstyle</artifactId>
Update API patches
2021-11-22 06:21:37 +01:00
- <version>8.45.1</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- </dependency>
- </dependencies>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>animal-sniffer-maven-plugin</artifactId>
Update to Minecraft 1.17.1 (#6097)
2021-07-07 08:52:40 +02:00
- <version>1.20</version>
remove remaining POMs
2021-06-17 19:11:00 +02:00
- <executions>
- <execution>
- <phase>process-classes</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java18</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
Reference in a new issue Copy permalink