SteamWar/FastAsyncWorldEdit
13
0
Fork 0
geforkt von Mirrors/FastAsyncWorldEdit
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Miscellaneous improvements to build scripts.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
MattBDev 2021-01-18 15:58:50 -05:00
Ursprung b4d7562b87
Commit 2ce493ae68
7 geänderte Dateien mit 73 neuen und 62 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
buildSrc/src/main/kotlin/CommonConfig.kt
Datei anzeigen

@ -6,11 +6,11 @@ fun Project.applyCommonConfiguration() {
version = rootProject.version version = rootProject.version
repositories { repositories {
mavenCentral()
mavenLocal() mavenLocal()
maven { url = uri("https://mvn.intellectualsites.com/content/groups/public/") } maven { url = uri("https://mvn.intellectualsites.com/content/groups/public/") }
maven { url = uri("https://plotsquared.com/mvn/") } maven { url = uri("https://plotsquared.com/mvn/") }
maven { url = uri("https://maven.enginehub.org/repo/") maven {
url = uri("https://maven.enginehub.org/repo/")
content { content {
excludeGroup("net.milkbowl.vault") excludeGroup("net.milkbowl.vault")
} }

2
buildSrc/src/main/kotlin/LibsConfig.kt
Datei anzeigen

@ -15,7 +15,7 @@ import org.gradle.kotlin.dsl.register
fun Project.applyLibrariesConfiguration() { fun Project.applyLibrariesConfiguration() {
applyCommonConfiguration() applyCommonConfiguration()
apply(plugin = "java-base") apply(plugin = "java-base")
apply(plugin = "maven") apply(plugin = "maven-publish")
apply(plugin = "com.github.johnrengelman.shadow") apply(plugin = "com.github.johnrengelman.shadow")
configurations { configurations {

2
buildSrc/src/main/kotlin/PlatformConfig.kt
Datei anzeigen

@ -21,7 +21,7 @@ fun Project.applyPlatformAndCoreConfiguration() {
apply(plugin = "java") apply(plugin = "java")
apply(plugin = "eclipse") apply(plugin = "eclipse")
apply(plugin = "idea") apply(plugin = "idea")
apply(plugin = "maven") apply(plugin = "maven-publish")
// apply(plugin = "checkstyle") // apply(plugin = "checkstyle")
apply(plugin = "com.github.johnrengelman.shadow") apply(plugin = "com.github.johnrengelman.shadow")

2
gradle/wrapper/gradle-wrapper.properties vendored
Datei anzeigen

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

13
settings.gradle.kts
Datei anzeigen

@ -7,3 +7,16 @@ listOf("bukkit", "core").forEach {
include("worldedit-$it") include("worldedit-$it")
} }
include("worldedit-libs:core:ap") include("worldedit-libs:core:ap")
dependencyResolutionManagement {
repositories {
mavenCentral()
maven {
name = "EngineHub Repository"
url = uri("https://maven.enginehub.org/repo/")
content {
excludeGroup("net.milkbowl.vault")
}
}
}
}

58
worldedit-bukkit/build.gradle.kts
Datei anzeigen

@ -44,48 +44,48 @@ dependencies {
compileOnly("com.github.MilkBowl:VaultAPI:1.7") { compileOnly("com.github.MilkBowl:VaultAPI:1.7") {
isTransitive = false isTransitive = false
} }
"api"(project(":worldedit-core")) api(project(":worldedit-core"))
"api"(project(":worldedit-libs:bukkit")) api(project(":worldedit-libs:bukkit"))
"compile"(":worldedit-adapters:") compile(":worldedit-adapters:")
// Paper-patched NMS jars // Paper-patched NMS jars
"compile"("com.destroystokyo.paperv1_15_r1:paperv1_15_r1:1_15_r1") 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_r1:paperv1_16_r1:1_16_r1")
"compile"("com.destroystokyo.paperv1_16_r2:paperv1_16_r2:1_16_r2") 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("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_15_r1:spigotmcv1_15_r1:1_15_r1")
"compile"("org.spigotmcv1_16_r1:spigotmcv1_16_r1:1_16_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_r2:spigotmcv1_16_r2:1_16_r2")
"compile"("org.spigotmcv1_16_r3:spigotmcv1_16_r3:1_16_r3") compile("org.spigotmcv1_16_r3:spigotmcv1_16_r3:1_16_r3")
"implementation"("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}") implementation("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}")
"api"("com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT") { api("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT") {
exclude("junit", "junit") exclude("junit", "junit")
isTransitive = false isTransitive = false
} }
"compileOnly"("org.jetbrains:annotations:20.1.0") compileOnly("org.jetbrains:annotations:20.1.0")
"testCompileOnly"("org.jetbrains:annotations:20.1.0") testCompileOnly("org.jetbrains:annotations:20.1.0")
"compileOnly"("org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT") compileOnly("org.spigotmc:spigot:1.16.5-R0.1-SNAPSHOT")
"implementation"("io.papermc:paperlib:1.0.6") implementation("io.papermc:paperlib:1.0.6")
"compileOnly"("com.sk89q:dummypermscompat:1.10") { compileOnly("com.sk89q:dummypermscompat:1.10") {
exclude("com.github.MilkBowl", "VaultAPI") exclude("com.github.MilkBowl", "VaultAPI")
} }
"implementation"("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1") implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.8.1")
"testImplementation"("org.mockito:mockito-core:1.9.0-rc1") testImplementation("org.mockito:mockito-core:1.9.0-rc1")
"compileOnly"("com.sk89q.worldguard:worldguard-bukkit:7.+") { compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.+") {
exclude("com.sk89q.worldedit", "worldedit-bukkit") exclude("com.sk89q.worldedit", "worldedit-bukkit")
exclude("com.sk89q.worldedit", "worldedit-core") exclude("com.sk89q.worldedit", "worldedit-core")
exclude("com.sk89q.worldedit.worldedit-libs", "bukkit") exclude("com.sk89q.worldedit.worldedit-libs", "bukkit")
exclude("com.sk89q.worldedit.worldedit-libs", "core") exclude("com.sk89q.worldedit.worldedit-libs", "core")
} }
"compile"("org.bstats:bstats-bukkit:1.8") implementation("org.bstats:bstats-bukkit:1.8")
"compile"("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT") api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT")
// Third party // Third party
compileOnlyApi("org.inventivetalent:mapmanager:1.7.+") { isTransitive = false } compileOnlyApi("org.inventivetalent:mapmanager:1.7.+") { isTransitive = false }
"implementation"("com.github.TechFortress:GriefPrevention:16.+") { isTransitive = false } implementation("com.github.TechFortress:GriefPrevention:16.+") { isTransitive = false }
"implementation"("com.massivecraft:mcore:7.0.1") { 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.bekvon.bukkit.residence:Residence:4.5._13.1") { isTransitive = false }
"implementation"("com.palmergames.bukkit:towny:0.84.0.9") { 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.thevoxelbox.voxelsniper:voxelsniper:5.171.0") { isTransitive = false }
"implementation"("com.comphenix.protocol:ProtocolLib:4.5.1") { isTransitive = false } implementation("com.comphenix.protocol:ProtocolLib:4.5.1") { isTransitive = false }
} }
tasks.named<Copy>("processResources") { tasks.named<Copy>("processResources") {

54
worldedit-core/build.gradle.kts
Datei anzeigen

@ -12,10 +12,8 @@ plugins {
} }
repositories { 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/") } maven { url = uri("https://mvn.intellectualsites.com/content/groups/public/") }
mavenCentral()
} }
applyPlatformAndCoreConfiguration() applyPlatformAndCoreConfiguration()
@ -27,39 +25,39 @@ configurations.all {
} }
dependencies { dependencies {
"api"(project(":worldedit-libs:core")) api(project(":worldedit-libs:core"))
"implementation"("de.schlichtherle:truezip:6.8.4") implementation("de.schlichtherle:truezip:6.8.4")
"implementation"("net.java.truevfs:truevfs-profile-default_2.13:0.12.2") implementation("net.java.truevfs:truevfs-profile-default_2.13:0.12.2")
"implementation"("org.mozilla:rhino-runtime:1.7.12") implementation("org.mozilla:rhino-runtime:1.7.12")
"implementation"("org.yaml:snakeyaml:1.27") implementation("org.yaml:snakeyaml:1.27")
"implementation"("com.google.guava:guava:${Versions.GUAVA}") implementation("com.google.guava:guava:${Versions.GUAVA}")
"implementation"("com.google.code.findbugs:jsr305:3.0.2") implementation("com.google.code.findbugs:jsr305:3.0.2")
"implementation"("com.google.code.gson:gson:${Versions.GSON}") implementation("com.google.code.gson:gson:${Versions.GSON}")
"implementation"("org.slf4j:slf4j-api:1.7.26") implementation("org.slf4j:slf4j-api:1.7.26")
"implementation"("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}") implementation("it.unimi.dsi:fastutil:${Versions.FAST_UTIL}")
val antlrVersion = "4.7.2" val antlrVersion = "4.7.2"
"antlr"("org.antlr:antlr4:$antlrVersion") antlr("org.antlr:antlr4:$antlrVersion")
"implementation"("org.antlr:antlr4-runtime:$antlrVersion") implementation("org.antlr:antlr4-runtime:$antlrVersion")
"implementation"("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false } implementation("com.googlecode.json-simple:json-simple:1.1.1") { isTransitive = false }
"compileOnly"(project(":worldedit-libs:core:ap")) compileOnly(project(":worldedit-libs:core:ap"))
"annotationProcessor"(project(":worldedit-libs:core:ap")) annotationProcessor(project(":worldedit-libs:core:ap"))
// ensure this is on the classpath for the AP // ensure this is on the classpath for the AP
"annotationProcessor"("com.google.guava:guava:21.0") annotationProcessor("com.google.guava:guava:21.0")
"compileOnly"("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}") compileOnly("com.google.auto.value:auto-value-annotations:${Versions.AUTO_VALUE}")
"annotationProcessor"("com.google.auto.value:auto-value:${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-core:${Versions.LOGBACK}")
"testImplementation"("ch.qos.logback:logback-classic:${Versions.LOGBACK}") testImplementation("ch.qos.logback:logback-classic:${Versions.LOGBACK}")
"compile"("com.github.luben:zstd-jni:1.4.8-1") implementation("com.github.luben:zstd-jni:1.4.8-1")
"compileOnly"("net.fabiozumbi12:redprotect:1.9.6") compileOnly("net.fabiozumbi12:redprotect:1.9.6")
"compile"("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") { api("com.github.intellectualsites.plotsquared:PlotSquared-API:latest") {
isTransitive = false isTransitive = false
} }
"compile"("com.plotsquared:PlotSquared-Core:5.13.3") { api("com.plotsquared:PlotSquared-Core:5.13.3") {
isTransitive = false isTransitive = false
} }
"api"("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT") api("com.intellectualsites.paster:Paster:1.0.1-SNAPSHOT")
} }
tasks.named<Test>("test") { tasks.named<Test>("test") {