From 2ce493ae687f8afed6af103b1428e36ef8d2cd8f Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Mon, 18 Jan 2021 15:58:50 -0500 Subject: [PATCH] Miscellaneous improvements to build scripts. --- buildSrc/src/main/kotlin/CommonConfig.kt | 4 +- buildSrc/src/main/kotlin/LibsConfig.kt | 2 +- buildSrc/src/main/kotlin/PlatformConfig.kt | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle.kts | 13 +++++ worldedit-bukkit/build.gradle.kts | 58 +++++++++++----------- worldedit-core/build.gradle.kts | 54 ++++++++++---------- 7 files changed, 73 insertions(+), 62 deletions(-) diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index ca995e5e7..bec46c4cc 100644 --- a/buildSrc/src/main/kotlin/CommonConfig.kt +++ b/buildSrc/src/main/kotlin/CommonConfig.kt @@ -6,11 +6,11 @@ fun Project.applyCommonConfiguration() { version = rootProject.version repositories { - mavenCentral() mavenLocal() maven { url = uri("https://mvn.intellectualsites.com/content/groups/public/") } maven { url = uri("https://plotsquared.com/mvn/") } - maven { url = uri("https://maven.enginehub.org/repo/") + maven { + url = uri("https://maven.enginehub.org/repo/") content { excludeGroup("net.milkbowl.vault") } diff --git a/buildSrc/src/main/kotlin/LibsConfig.kt b/buildSrc/src/main/kotlin/LibsConfig.kt index a84f4f5d9..6ab5396d8 100644 --- a/buildSrc/src/main/kotlin/LibsConfig.kt +++ b/buildSrc/src/main/kotlin/LibsConfig.kt @@ -15,7 +15,7 @@ import org.gradle.kotlin.dsl.register fun Project.applyLibrariesConfiguration() { applyCommonConfiguration() apply(plugin = "java-base") - apply(plugin = "maven") + apply(plugin = "maven-publish") apply(plugin = "com.github.johnrengelman.shadow") configurations { diff --git a/buildSrc/src/main/kotlin/PlatformConfig.kt b/buildSrc/src/main/kotlin/PlatformConfig.kt index 662e1c150..a1ac6de77 100644 --- a/buildSrc/src/main/kotlin/PlatformConfig.kt +++ b/buildSrc/src/main/kotlin/PlatformConfig.kt @@ -21,7 +21,7 @@ fun Project.applyPlatformAndCoreConfiguration() { apply(plugin = "java") apply(plugin = "eclipse") apply(plugin = "idea") - apply(plugin = "maven") + apply(plugin = "maven-publish") // apply(plugin = "checkstyle") apply(plugin = "com.github.johnrengelman.shadow") diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da9702f9e..80cf08e74 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/settings.gradle.kts b/settings.gradle.kts index 56f98fe6a..c3d7f43ec 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -7,3 +7,16 @@ listOf("bukkit", "core").forEach { include("worldedit-$it") } include("worldedit-libs:core:ap") + +dependencyResolutionManagement { + repositories { + mavenCentral() + maven { + name = "EngineHub Repository" + url = uri("https://maven.enginehub.org/repo/") + content { + excludeGroup("net.milkbowl.vault") + } + } + } +} diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 9ff5705fe..6f842d105 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -44,48 +44,48 @@ dependencies { compileOnly("com.github.MilkBowl:VaultAPI:1.7") { isTransitive = false } - "api"(project(":worldedit-core")) - "api"(project(":worldedit-libs:bukkit")) - "compile"(":worldedit-adapters:") + api(project(":worldedit-core")) + api(project(":worldedit-libs:bukkit")) + compile(":worldedit-adapters:") // Paper-patched NMS jars - "compile"("com.destroystokyo.paperv1_15_r1:paperv1_15_r1:1_15_r1") - "compile"("com.destroystokyo.paperv1_16_r1:paperv1_16_r1:1_16_r1") - "compile"("com.destroystokyo.paperv1_16_r2:paperv1_16_r2:1_16_r2") - "compile"("com.destroystokyo.paperv1_16_r3:paperv1_16_r3:1_16_r3") - "compile"("org.spigotmcv1_15_r1:spigotmcv1_15_r1:1_15_r1") - "compile"("org.spigotmcv1_16_r1:spigotmcv1_16_r1:1_16_r1") - "compile"("org.spigotmcv1_16_r2:spigotmcv1_16_r2:1_16_r2") - "compile"("org.spigotmcv1_16_r3:spigotmcv1_16_r3:1_16_r3") - "implementation"("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}") - "api"("com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT") { + compile("com.destroystokyo.paperv1_15_r1:paperv1_15_r1:1_15_r1") + compile("com.destroystokyo.paperv1_16_r1:paperv1_16_r1:1_16_r1") + compile("com.destroystokyo.paperv1_16_r2:paperv1_16_r2:1_16_r2") + compile("com.destroystokyo.paperv1_16_r3:paperv1_16_r3:1_16_r3") + compile("org.spigotmcv1_15_r1:spigotmcv1_15_r1:1_15_r1") + compile("org.spigotmcv1_16_r1:spigotmcv1_16_r1:1_16_r1") + compile("org.spigotmcv1_16_r2:spigotmcv1_16_r2:1_16_r2") + compile("org.spigotmcv1_16_r3:spigotmcv1_16_r3:1_16_r3") + implementation("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}") + api("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") { exclude("junit", "junit") isTransitive = false } - "compileOnly"("org.jetbrains:annotations:20.1.0") - "testCompileOnly"("org.jetbrains:annotations:20.1.0") - "compileOnly"("org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT") - "implementation"("io.papermc:paperlib:1.0.6") - "compileOnly"("com.sk89q:dummypermscompat:1.10") { + compileOnly("org.jetbrains:annotations:20.1.0") + testCompileOnly("org.jetbrains:annotations:20.1.0") + compileOnly("org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT") + implementation("io.papermc:paperlib:1.0.6") + compileOnly("com.sk89q:dummypermscompat:1.10") { exclude("com.github.MilkBowl", "VaultAPI") } - "implementation"("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") - "testImplementation"("org.mockito:mockito-core:1.9.0-rc1") - "compileOnly"("com.sk89q.worldguard:worldguard-bukkit:7.+") { + implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") + testImplementation("org.mockito:mockito-core:1.9.0-rc1") + compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.+") { exclude("com.sk89q.worldedit", "worldedit-bukkit") exclude("com.sk89q.worldedit", "worldedit-core") exclude("com.sk89q.worldedit.worldedit-libs", "bukkit") exclude("com.sk89q.worldedit.worldedit-libs", "core") } - "compile"("org.bstats:bstats-bukkit:1.8") - "compile"("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT") + implementation("org.bstats:bstats-bukkit:1.8") + api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT") // Third party compileOnlyApi("org.inventivetalent:mapmanager:1.7.+") { isTransitive = false } - "implementation"("com.github.TechFortress:GriefPrevention:16.+") { isTransitive = false } - "implementation"("com.massivecraft:mcore:7.0.1") { isTransitive = false } - "implementation"("com.bekvon.bukkit.residence:Residence:4.5._13.1") { isTransitive = false } - "implementation"("com.palmergames.bukkit:towny:0.84.0.9") { isTransitive = false } - "implementation"("com.thevoxelbox.voxelsniper:voxelsniper:5.171.0") { isTransitive = false } - "implementation"("com.comphenix.protocol:ProtocolLib:4.5.1") { isTransitive = false } + implementation("com.github.TechFortress:GriefPrevention:16.+") { isTransitive = false } + implementation("com.massivecraft:mcore:7.0.1") { isTransitive = false } + implementation("com.bekvon.bukkit.residence:Residence:4.5._13.1") { isTransitive = false } + implementation("com.palmergames.bukkit:towny:0.84.0.9") { isTransitive = false } + implementation("com.thevoxelbox.voxelsniper:voxelsniper:5.171.0") { isTransitive = false } + implementation("com.comphenix.protocol:ProtocolLib:4.5.1") { isTransitive = false } } tasks.named("processResources") { diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index 8dd88b06e..a078c2f3d 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -12,10 +12,8 @@ plugins { } repositories { - maven { url = uri("https://plotsquared.com/mvn") } + maven { url = uri("https://plotsquared.com/mvn/") } maven { url = uri("https://mvn.intellectualsites.com/content/groups/public/") } - mavenCentral() - } applyPlatformAndCoreConfiguration() @@ -27,39 +25,39 @@ configurations.all { } dependencies { - "api"(project(":worldedit-libs:core")) - "implementation"("de.schlichtherle:truezip:6.8.4") - "implementation"("net.java.truevfs:truevfs-profile-default_2.13:0.12.2") - "implementation"("org.mozilla:rhino-runtime:1.7.12") - "implementation"("org.yaml:snakeyaml:1.27") - "implementation"("com.google.guava:guava:${Versions.GUAVA}") - "implementation"("com.google.code.findbugs:jsr305:3.0.2") - "implementation"("com.google.code.gson:gson:${Versions.GSON}") - "implementation"("org.slf4j:slf4j-api:1.7.26") - "implementation"("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}") + api(project(":worldedit-libs:core")) + implementation("de.schlichtherle:truezip:6.8.4") + implementation("net.java.truevfs:truevfs-profile-default_2.13:0.12.2") + implementation("org.mozilla:rhino-runtime:1.7.12") + implementation("org.yaml:snakeyaml:1.27") + implementation("com.google.guava:guava:${Versions.GUAVA}") + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.google.code.gson:gson:${Versions.GSON}") + implementation("org.slf4j:slf4j-api:1.7.26") + implementation("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}") val antlrVersion = "4.7.2" - "antlr"("org.antlr:antlr4:$antlrVersion") - "implementation"("org.antlr:antlr4-runtime:$antlrVersion") + antlr("org.antlr:antlr4:$antlrVersion") + implementation("org.antlr:antlr4-runtime:$antlrVersion") - "implementation"("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false } - "compileOnly"(project(":worldedit-libs:core:ap")) - "annotationProcessor"(project(":worldedit-libs:core:ap")) + implementation("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false } + compileOnly(project(":worldedit-libs:core:ap")) + annotationProcessor(project(":worldedit-libs:core:ap")) // ensure this is on the classpath for the AP - "annotationProcessor"("com.google.guava:guava:21.0") - "compileOnly"("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}") - "annotationProcessor"("com.google.auto.value:auto-value:${Versions.AUTO_VALUE}") - "testImplementation"("ch.qos.logback:logback-core:${Versions.LOGBACK}") - "testImplementation"("ch.qos.logback:logback-classic:${Versions.LOGBACK}") - "compile"("com.github.luben:zstd-jni:1.4.8-1") - "compileOnly"("net.fabiozumbi12:redprotect:1.9.6") - "compile"("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") { + annotationProcessor("com.google.guava:guava:21.0") + compileOnly("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}") + annotationProcessor("com.google.auto.value:auto-value:${Versions.AUTO_VALUE}") + testImplementation("ch.qos.logback:logback-core:${Versions.LOGBACK}") + testImplementation("ch.qos.logback:logback-classic:${Versions.LOGBACK}") + implementation("com.github.luben:zstd-jni:1.4.8-1") + compileOnly("net.fabiozumbi12:redprotect:1.9.6") + api("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") { isTransitive = false } - "compile"("com.plotsquared:PlotSquared-Core:5.13.3") { + api("com.plotsquared:PlotSquared-Core:5.13.3") { isTransitive = false } - "api"("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT") + api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT") } tasks.named("test") {