Skip to content

Commit 5d5f489

Browse files
committed
Correct build setups for Sponge and Bukkit implementations
1 parent 24c50c2 commit 5d5f489

File tree

3 files changed

+31
-20
lines changed

3 files changed

+31
-20
lines changed

BlueMapBukkit/build.gradle

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,26 @@ repositories {
1111
dependencies {
1212
shadow "org.bukkit:bukkit:1.14.4-R0.1-SNAPSHOT"
1313
compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.5'
14-
compile project(':BlueMapCommon')
14+
15+
compile (project(':BlueMapCommon')) {
16+
//exclude dependencies provided by bukkit
17+
exclude group: 'com.google.guava', module: 'guava'
18+
exclude group: 'com.google.code.gson', module: 'gson'
19+
exclude group: 'org.yaml', module: 'snakeyaml'
20+
}
1521
}
1622

1723
build.dependsOn shadowJar {
1824
destinationDir = file '../build/release'
1925
archiveFileName = "BlueMap-${version}-bukkit.jar"
2026

21-
relocate 'com.google', 'de.bluecolored.bluemap.google'
22-
relocate 'com.flowpowered', 'de.bluecolored.bluemap.flowpowered'
23-
relocate 'com.typesafe', 'de.bluecolored.bluemap.typesafe'
24-
relocate 'net.querz', 'de.bluecolored.bluemap.querz'
25-
relocate 'ninja', 'de.bluecolored.bluemap.ninja'
26-
relocate 'org.apache', 'de.bluecolored.bluemap.apache'
27-
relocate 'org.yaml', 'de.bluecolored.bluemap.yaml'
28-
29-
relocate 'org.bstats.bukkit', 'de.bluecolored.bluemap.bstats.bukkit'
27+
relocate 'com.flowpowered.math', 'de.bluecolored.shadow.flowpowered.math'
28+
relocate 'com.typesafe.config', 'de.bluecolored.shadow.typesafe.config'
29+
relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt'
30+
relocate 'ninja.leaping.configurate', 'de.bluecolored.shadow.ninja.leaping.configurate'
31+
relocate 'org.apache.commons.io', 'de.bluecolored.shadow.apache.commons.io'
32+
relocate 'org.apache.commons.lang3', 'de.bluecolored.shadow.apache.commons.lang3'
33+
relocate 'org.bstats.bukkit', 'de.bluecolored.shadow.bstats.bukkit'
3034
}
3135

3236
processResources {

BlueMapSponge/build.gradle

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
dependencies {
22
shadow "org.spongepowered:spongeapi:7.1.0-SNAPSHOT"
33
compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5'
4-
compile project(':BlueMapCommon')
4+
5+
compile (project(':BlueMapCommon')) {
6+
//exclude dependencies provided by sponge
7+
exclude group: 'com.google.guava', module: 'guava'
8+
exclude group: 'com.google.code.gson', module: 'gson'
9+
exclude group: 'org.apache.commons', module: 'commons-lang3'
10+
exclude group: 'com.flowpowered', module: 'flow-math'
11+
exclude group: 'ninja.leaping.configurate', module: 'configurate-hocon'
12+
exclude group: 'ninja.leaping.configurate', module: 'configurate-gson'
13+
exclude group: 'ninja.leaping.configurate', module: 'configurate-yaml'
14+
}
515
}
616

717
build.dependsOn shadowJar {
818
destinationDir = file '../build/release'
919
archiveFileName = "BlueMap-${version}-sponge.jar"
1020

11-
relocate 'com.google', 'de.bluecolored.bluemap.google'
12-
relocate 'com.flowpowered', 'de.bluecolored.bluemap.flowpowered'
13-
relocate 'com.typesafe', 'de.bluecolored.bluemap.typesafe'
14-
relocate 'net.querz', 'de.bluecolored.bluemap.querz'
15-
relocate 'ninja', 'de.bluecolored.bluemap.ninja'
16-
relocate 'org.apache', 'de.bluecolored.bluemap.apache'
17-
relocate 'org.yaml', 'de.bluecolored.bluemap.yaml'
21+
relocate 'net.querz.nbt', 'de.bluecolored.shadow.querz.nbt'
22+
relocate 'org.apache.commons.io', 'de.bluecolored.shadow.apache.commons.io'
23+
24+
minimize()
1825
}
1926

2027
processResources {

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ If you have a question, help others using BlueMap or get the latest news and inf
2222
If you have git installed, simply use the command `git clone https://github.com/BlueMap-Minecraft/BlueMap.git` to clone BlueMap.
2323

2424
### Build
25-
In order to build BlueMap you simply need to run the `./gradlew build` command in BlueMap's root directory.
26-
You can find the compiled JAR file in `./build/libs`.
25+
In order to build BlueMap you simply need to run the `./gradlew clean build` command in BlueMap's root directory.
26+
You can find the compiled JAR files in `./build/release`.
2727

2828
### Issues / Suggestions
2929
You found a bug, have another issue or a suggestion? Please create an issue [here](https://github.com/BlueMap-Minecraft/BlueMap/issues)!

0 commit comments

Comments
 (0)