Fix poms, remove bukkit lib project since it's currently unused.
This commit is contained in:
parent
61494fd76e
commit
21e65be110
|
@ -45,8 +45,7 @@ fun Project.applyPlatformAndCoreConfiguration() {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
"testImplementation"("junit:junit:${Versions.JUNIT}")
|
"testCompile"("junit:junit:${Versions.JUNIT}")
|
||||||
"testRuntime"("junit:junit:${Versions.JUNIT}")
|
|
||||||
// TODO switch to jupiter - doesn't support abstract test classes so tests need rewriting
|
// TODO switch to jupiter - doesn't support abstract test classes so tests need rewriting
|
||||||
//"testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT}")
|
//"testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT}")
|
||||||
//"testRuntime"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
|
//"testRuntime"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
|
||||||
|
@ -105,7 +104,7 @@ fun Project.applyShadowConfiguration() {
|
||||||
archiveClassifier.set("dist")
|
archiveClassifier.set("dist")
|
||||||
dependencies {
|
dependencies {
|
||||||
include(project(":worldguard-libs:core"))
|
include(project(":worldguard-libs:core"))
|
||||||
include(project(":worldguard-libs:${project.name.replace("worldguard-", "")}"))
|
//include(project(":worldguard-libs:${project.name.replace("worldguard-", "")}"))
|
||||||
include(project(":worldguard-core"))
|
include(project(":worldguard-core"))
|
||||||
}
|
}
|
||||||
exclude("GradleStart**")
|
exclude("GradleStart**")
|
||||||
|
|
|
@ -3,5 +3,5 @@ rootProject.name = "worldguard"
|
||||||
include("worldguard-libs")
|
include("worldguard-libs")
|
||||||
include("worldguard-libs:core")
|
include("worldguard-libs:core")
|
||||||
include("worldguard-core")
|
include("worldguard-core")
|
||||||
include("worldguard-libs:bukkit")
|
//include("worldguard-libs:bukkit")
|
||||||
include("worldguard-bukkit")
|
include("worldguard-bukkit")
|
||||||
|
|
|
@ -22,7 +22,7 @@ repositories {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
"compile"(project(":worldguard-core"))
|
"compile"(project(":worldguard-core"))
|
||||||
"compile"(project(":worldguard-libs:bukkit"))
|
//"compile"(project(":worldguard-libs:bukkit"))
|
||||||
"api"("org.bukkit:bukkit:1.14.2-R0.1-SNAPSHOT")
|
"api"("org.bukkit:bukkit:1.14.2-R0.1-SNAPSHOT")
|
||||||
"api"("com.sk89q.worldedit:worldedit-bukkit:7.0.1-SNAPSHOT") { isTransitive = false }
|
"api"("com.sk89q.worldedit:worldedit-bukkit:7.0.1-SNAPSHOT") { isTransitive = false }
|
||||||
"implementation"("com.sk89q:commandbook:2.3") { isTransitive = false }
|
"implementation"("com.sk89q:commandbook:2.3") { isTransitive = false }
|
||||||
|
@ -43,9 +43,6 @@ tasks.named<Jar>("jar") {
|
||||||
|
|
||||||
tasks.named<ShadowJar>("shadowJar") {
|
tasks.named<ShadowJar>("shadowJar") {
|
||||||
dependencies {
|
dependencies {
|
||||||
include(dependency(":worldguard-core"))
|
|
||||||
include(dependency(":worldguard-libs:core"))
|
|
||||||
include(dependency(":worldguard-libs:bukkit"))
|
|
||||||
relocate("org.bstats", "com.sk89q.worldguard.bukkit.bstats") {
|
relocate("org.bstats", "com.sk89q.worldguard.bukkit.bstats") {
|
||||||
include(dependency("org.bstats:bstats-bukkit:1.5"))
|
include(dependency("org.bstats:bstats-bukkit:1.5"))
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue