Correct build setups for CLI and Forge implementations

This commit is contained in:
Blue (Lukas Rieger) 2020-04-06 17:55:35 +02:00
parent 77c11b9c06
commit 8d9220f611
3 changed files with 26 additions and 16 deletions

View File

@ -13,11 +13,16 @@ build.dependsOn shadowJar {
destinationDir = file '../build/release'
archiveFileName = "BlueMap-${version}-cli.jar"
relocate 'com.google', 'de.bluecolored.bluemap.google'
relocate 'com.flowpowered', 'de.bluecolored.bluemap.flowpowered'
relocate 'com.typesafe', 'de.bluecolored.bluemap.typesafe'
relocate 'net.querz', 'de.bluecolored.bluemap.querz'
relocate 'ninja', 'de.bluecolored.bluemap.ninja'
relocate 'org.apache', 'de.bluecolored.bluemap.apache'
relocate 'org.yaml', 'de.bluecolored.bluemap.yaml'
relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math'
relocate 'com.google.common', 'de.bluecolored.shadow.google.common'
relocate 'com.google.gson', 'de.bluecolored.shadow.google.gson'
relocate 'com.google.thirdparty', 'de.bluecolored.shadow.google.thirdparty'
relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config'
relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt'
relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate'
relocate 'org.apache.commons.cli', 'de.bluecolored.shadow.apache.commons.cli'
relocate 'org.apache.commons.io', 'de.bluecolored.shadow.apache.commons.io'
relocate 'org.apache.commons.lang3', 'de.bluecolored.shadow.apache.commons.lang3'
relocate 'org.bstats.bukkit', 'de.bluecolored.shadow.bstats.bukkit'
relocate 'org.yaml.snakeyaml', 'de.bluecolored.shadow.yaml.snakeyaml'
}

View File

@ -6,7 +6,7 @@ dependencies {
compile 'com.google.guava:guava:21.0'
compile 'com.google.code.gson:gson:2.8.0'
compile 'org.apache.commons:commons-lang3:3.5'
compile group: 'commons-io', name: 'commons-io', version: '2.6'
compile group: 'commons-io', name: 'commons-io', version: '2.5'
compile 'com.flowpowered:flow-math:1.0.3'
compile 'ninja.leaping.configurate:configurate-hocon:3.3'
compile 'ninja.leaping.configurate:configurate-gson:3.3'

View File

@ -21,7 +21,14 @@ configurations {
dependencies {
minecraft 'net.minecraftforge:forge:1.15.2-31.1.0'
include project(':BlueMapCommon')
include (project(':BlueMapCommon')) {
//exclude dependencies provided by forge
exclude group: 'com.google.guava', module: 'guava'
exclude group: 'com.google.code.gson', module: 'gson'
exclude group: 'org.apache.commons', module: 'commons-lang3'
exclude group: 'commons-io', module: 'commons-io'
}
}
build.dependsOn shadowJar {
@ -30,13 +37,11 @@ build.dependsOn shadowJar {
configurations = [project.configurations.include]
relocate 'com.google', 'de.bluecolored.bluemap.google'
relocate 'com.flowpowered', 'de.bluecolored.bluemap.flowpowered'
relocate 'com.typesafe', 'de.bluecolored.bluemap.typesafe'
relocate 'net.querz', 'de.bluecolored.bluemap.querz'
relocate 'ninja', 'de.bluecolored.bluemap.ninja'
relocate 'org.apache.commons', 'de.bluecolored.bluemap.apache.commons'
relocate 'org.yaml', 'de.bluecolored.bluemap.yaml'
relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math'
relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config'
relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt'
relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate'
relocate 'org.yaml.snakeyaml', 'de.bluecolored.shadow.yaml.snakeyaml'
}
processResources {