diff options
Diffstat (limited to 'patches/server/0001-Setup-Gradle-project.patch')
| -rw-r--r-- | patches/server/0001-Setup-Gradle-project.patch | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/patches/server/0001-Setup-Gradle-project.patch b/patches/server/0001-Setup-Gradle-project.patch index d8dace80ea..baefb46a2d 100644 --- a/patches/server/0001-Setup-Gradle-project.patch +++ b/patches/server/0001-Setup-Gradle-project.patch @@ -28,10 +28,10 @@ index 37dab9e868dbfb019c271a547d975a48ad1cb571..3811c0d849a3eb028ed1a6b7a2d4747f +/.factorypath diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 -index 0000000000000000000000000000000000000000..9ea079d14a92367629dc8fb30d1be043c9290964 +index 0000000000000000000000000000000000000000..82b298d454dee6a6d996aa7822dd745e70a8da74 --- /dev/null +++ b/build.gradle.kts -@@ -0,0 +1,126 @@ +@@ -0,0 +1,131 @@ +import io.papermc.paperweight.util.* + +plugins { @@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..9ea079d14a92367629dc8fb30d1be043 + implementation("org.apache.logging.log4j:log4j-iostreams:2.22.1") { + exclude(group = "org.apache.logging.log4j", module = "log4j-api") + } -+ implementation("org.ow2.asm:asm-commons:9.7") ++ implementation("org.ow2.asm:asm-commons:9.7.1") + implementation("commons-lang:commons-lang:2.6") + runtimeOnly("org.xerial:sqlite-jdbc:3.46.0.0") + runtimeOnly("com.mysql:mysql-connector-j:8.4.0") @@ -55,9 +55,10 @@ index 0000000000000000000000000000000000000000..9ea079d14a92367629dc8fb30d1be043 + runtimeOnly("org.apache.maven.resolver:maven-resolver-transport-http:1.9.18") + + testImplementation("org.junit.jupiter:junit-jupiter:5.10.2") ++ testImplementation("org.junit.platform:junit-platform-suite-engine:1.10.0") + testImplementation("org.hamcrest:hamcrest:2.2") -+ testImplementation("org.mockito:mockito-core:5.11.0") -+ testImplementation("org.ow2.asm:asm-tree:9.7") ++ testImplementation("org.mockito:mockito-core:5.14.1") ++ testImplementation("org.ow2.asm:asm-tree:9.7.1") +} + +paperweight { @@ -93,8 +94,12 @@ index 0000000000000000000000000000000000000000..9ea079d14a92367629dc8fb30d1be043 +} + +tasks.test { -+ exclude("org/bukkit/craftbukkit/inventory/ItemStack*Test.class") -+ useJUnitPlatform() ++ include("**/**TestSuite.class") ++ workingDir = temporaryDir ++ useJUnitPlatform { ++ forkEvery = 1 ++ excludeTags("Slow") ++ } +} + +fun TaskContainer.registerRunTask( @@ -160,10 +165,10 @@ index 0000000000000000000000000000000000000000..9ea079d14a92367629dc8fb30d1be043 +} diff --git a/pom.xml b/pom.xml deleted file mode 100644 -index 5abcca1894a0d7795d394834f56c189c0bbeb82f..0000000000000000000000000000000000000000 +index 71a22e50d5e543d41b0d285fabfa0965a393ab2e..0000000000000000000000000000000000000000 --- a/pom.xml +++ /dev/null -@@ -1,604 +0,0 @@ +@@ -1,612 +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> @@ -183,6 +188,7 @@ index 5abcca1894a0d7795d394834f56c189c0bbeb82f..00000000000000000000000000000000 - - <properties> - <skipTests>true</skipTests> +- <groups>AllFeatures,Bundle,Legacy,Normal,VanillaFeature</groups> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <api.version>unknown</api.version> - <bt.name>git</bt.name> @@ -226,7 +232,7 @@ index 5abcca1894a0d7795d394834f56c189c0bbeb82f..00000000000000000000000000000000 - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-commons</artifactId> -- <version>9.7</version> +- <version>9.7.1</version> - <scope>compile</scope> - </dependency> - <!-- Mojang depends --> @@ -448,6 +454,12 @@ index 5abcca1894a0d7795d394834f56c189c0bbeb82f..00000000000000000000000000000000 - <scope>test</scope> - </dependency> - <dependency> +- <groupId>org.junit.platform</groupId> +- <artifactId>junit-platform-suite-engine</artifactId> +- <version>1.10.0</version> +- <scope>test</scope> +- </dependency> +- <dependency> - <groupId>org.hamcrest</groupId> - <artifactId>hamcrest</artifactId> - <version>2.2</version> @@ -456,13 +468,13 @@ index 5abcca1894a0d7795d394834f56c189c0bbeb82f..00000000000000000000000000000000 - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> -- <version>5.11.0</version> +- <version>5.14.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm-tree</artifactId> -- <version>9.7</version> +- <version>9.7.1</version> - <scope>test</scope> - </dependency> - </dependencies> @@ -675,9 +687,10 @@ index 5abcca1894a0d7795d394834f56c189c0bbeb82f..00000000000000000000000000000000 - <version>3.2.5</version> - <configuration> - <workingDirectory>${basedir}/target/test-server</workingDirectory> -- <excludes> -- <exclude>org/bukkit/craftbukkit/inventory/ItemStack*Test.java</exclude> -- </excludes> +- <reuseForks>false</reuseForks> +- <includes> +- <include>**/*TestSuite.java</include> +- </includes> - </configuration> - </plugin> - </plugins> |