Skip to content

Commit e1c71f5

Browse files
committed
Merge branch 'build-logic-improvements' of https://github.com/IntellectualSites/FastAsyncWorldEdit into build-logic-improvements
2 parents 882deac + d7f3d1f commit e1c71f5

File tree

2 files changed

+13
-17
lines changed

2 files changed

+13
-17
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
id("xyz.jpenilla.run-paper") version "2.3.1"
1313
}
1414

15-
var rootVersion by extra("2.13.3")
15+
var rootVersion by extra("2.13.2")
1616
var snapshot by extra("SNAPSHOT")
1717
var revision: String by extra("")
1818
var buildNumber by extra("")

worldedit-sponge/build.gradle.kts

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,24 +60,20 @@ sponge {
6060
}
6161

6262
dependencies {
63-
api(project(":worldedit-core"))
64-
api(project(":worldedit-libs:sponge"))
65-
api("org.spongepowered:spongeapi:7.1.0") {
66-
exclude(group = "org.slf4j", module = "slf4j-api")
67-
}
68-
implementation(enforcedPlatform("org.apache.logging.log4j:log4j-bom:2.8.1") {
69-
because("Sponge 8 provides Log4J at 2.8.1")
70-
})
71-
api("org.apache.logging.log4j:log4j-api")
72-
api("org.bstats:bstats-sponge:1.7")
73-
testImplementation("org.mockito:mockito-core:5.18.0")
63+
"api"(project(":worldedit-core"))
64+
"api"(project(":worldedit-libs:sponge"))
65+
66+
"api"(libs.log4j.api)
67+
"implementation"(libs.bstats.sponge)
68+
"implementation"(libs.fastutil)
69+
"testImplementation"(libs.mockito.core)
70+
71+
// Silence some warnings, since apparently this isn't on the compile classpath like it should be.
72+
"compileOnly"(libs.errorprone.annotations)
7473
}
7574

76-
tasks.named<Jar>("jar") {
77-
manifest {
78-
attributes("Class-Path" to CLASSPATH,
79-
"WorldEdit-Version" to project.version)
80-
}
75+
configure<BasePluginExtension> {
76+
archivesName.set("${project.name}-api${libs.versions.sponge.api.major.get()}")
8177
}
8278

8379
tasks.named<ShadowJar>("shadowJar") {

0 commit comments

Comments
 (0)