From 21e65be1102f7c78e795904227ffebd89328cdc1 Mon Sep 17 00:00:00 2001 From: wizjany Date: Mon, 29 Jul 2019 23:41:38 -0400 Subject: [PATCH] Fix poms, remove bukkit lib project since it's currently unused. --- buildSrc/src/main/kotlin/PlatformConfig.kt | 5 ++--- settings.gradle.kts | 2 +- worldguard-bukkit/build.gradle.kts | 5 +---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index 88494956..e3745362 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -45,8 +45,7 @@ fun Project.applyPlatformAndCoreConfiguration() { } dependencies { - "testImplementation"("junit:junit:${Versions.JUNIT}") - "testRuntime"("junit:junit:${Versions.JUNIT}") + "testCompile"("junit:junit:${Versions.JUNIT}") // TODO switch to jupiter - doesn't support abstract test classes so tests need rewriting //"testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT}") //"testRuntime"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}") @@ -105,7 +104,7 @@ fun Project.applyShadowConfiguration() { archiveClassifier.set("dist") dependencies { 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")) } exclude("GradleStart**") diff --git a/settings.gradle.kts b/settings.gradle.kts index 43f7c966..ead83aea 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -3,5 +3,5 @@ rootProject.name = "worldguard" include("worldguard-libs") include("worldguard-libs:core") include("worldguard-core") -include("worldguard-libs:bukkit") +//include("worldguard-libs:bukkit") include("worldguard-bukkit") diff --git a/worldguard-bukkit/build.gradle.kts b/worldguard-bukkit/build.gradle.kts index 2920ae15..1b7c6efd 100644 --- a/worldguard-bukkit/build.gradle.kts +++ b/worldguard-bukkit/build.gradle.kts @@ -22,7 +22,7 @@ repositories { dependencies { "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"("com.sk89q.worldedit:worldedit-bukkit:7.0.1-SNAPSHOT") { isTransitive = false } "implementation"("com.sk89q:commandbook:2.3") { isTransitive = false } @@ -43,9 +43,6 @@ tasks.named("jar") { tasks.named("shadowJar") { dependencies { - include(dependency(":worldguard-core")) - include(dependency(":worldguard-libs:core")) - include(dependency(":worldguard-libs:bukkit")) relocate("org.bstats", "com.sk89q.worldguard.bukkit.bstats") { include(dependency("org.bstats:bstats-bukkit:1.5")) }