Skip to content

Commit 323cb1b

Browse files
TBlueFTBlueF
committed
Change project setup: split targets into different jars and relocate shadowed libs
1 parent 0816529 commit 323cb1b

File tree

11 files changed

+109
-25
lines changed

11 files changed

+109
-25
lines changed

‎BlueMapBukkit/build.gradle‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,28 @@ dependencies {
1313
compile group: 'org.bstats', name: 'bstats-bukkit-lite', version: '1.5'
1414
compile project(':BlueMapCommon')
1515
}
16+
17+
build.dependsOn shadowJar {
18+
destinationDir = file '../build/release'
19+
archiveFileName = "BlueMap-${version}-bukkit.jar"
20+
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'
30+
}
31+
32+
processResources {
33+
from(sourceSets.main.resources.srcDirs) {
34+
include 'plugin.yml'
35+
36+
expand (
37+
version: project.version
38+
)
39+
}
40+
}

‎BlueMapBukkit/src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: BlueMap
22
description: "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)"
33
main: de.bluecolored.bluemap.bukkit.BukkitPlugin
4-
version: 0.5.1-mc1.13
4+
version: ${version}
55
author: "Blue (TBlueF / Lukas Rieger)"
66
authors: [Blue (TBlueF / Lukas Rieger)]
77
website: "https://github.com/BlueMap-Minecraft"

‎BlueMapCLI/build.gradle‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,22 @@ dependencies {
22
compile group: 'commons-cli', name: 'commons-cli', version: '1.4'
33
compile project(':BlueMapCommon')
44
}
5+
6+
jar {
7+
manifest {
8+
attributes 'Main-Class' : "de.bluecolored.bluemap.cli.BlueMapCLI"
9+
}
10+
}
11+
12+
build.dependsOn shadowJar {
13+
destinationDir = file '../build/release'
14+
archiveFileName = "BlueMap-${version}-cli.jar"
15+
16+
relocate 'com.google', 'de.bluecolored.bluemap.google'
17+
relocate 'com.flowpowered', 'de.bluecolored.bluemap.flowpowered'
18+
relocate 'com.typesafe', 'de.bluecolored.bluemap.typesafe'
19+
relocate 'net.querz', 'de.bluecolored.bluemap.querz'
20+
relocate 'ninja', 'de.bluecolored.bluemap.ninja'
21+
relocate 'org.apache', 'de.bluecolored.bluemap.apache'
22+
relocate 'org.yaml', 'de.bluecolored.bluemap.yaml'
23+
}

‎BlueMapCommon/src/main/java/de/bluecolored/bluemap/common/plugin/Plugin.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import de.bluecolored.bluemap.common.MapType;
2626
import de.bluecolored.bluemap.common.RenderManager;
2727
import de.bluecolored.bluemap.common.plugin.serverinterface.ServerInterface;
28-
import de.bluecolored.bluemap.core.BlueMap;
2928
import de.bluecolored.bluemap.core.config.ConfigManager;
3029
import de.bluecolored.bluemap.core.config.MainConfig;
3130
import de.bluecolored.bluemap.core.config.MainConfig.MapConfig;
@@ -48,7 +47,6 @@ public class Plugin {
4847

4948
public static final String PLUGIN_ID = "bluemap";
5049
public static final String PLUGIN_NAME = "BlueMap";
51-
public static final String PLUGIN_VERSION = BlueMap.VERSION;
5250

5351
private static Plugin instance;
5452

‎BlueMapCore/build.gradle‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,16 @@ dependencies {
1616
testCompile 'junit:junit:4.12'
1717
}
1818

19+
processResources {
20+
from(sourceSets.main.resources.srcDirs) {
21+
include 'core.json'
22+
23+
expand (
24+
version: project.version
25+
)
26+
}
27+
}
28+
1929
node {
2030
version = '12.14.1'
2131
download = true

‎BlueMapCore/src/main/java/de/bluecolored/bluemap/core/BlueMap.java‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,24 @@
11
package de.bluecolored.bluemap.core;
22

3+
import java.io.IOException;
4+
5+
import de.bluecolored.bluemap.core.logger.Logger;
6+
import ninja.leaping.configurate.gson.GsonConfigurationLoader;
7+
38
public class BlueMap {
49

5-
public static final String VERSION = "0.5.1-mc1.13";
10+
public static final String VERSION;
11+
static {
12+
String version = "DEV";
13+
try {
14+
version = GsonConfigurationLoader.builder().setURL(BlueMap.class.getResource("/core.json")).build().load().getNode("version").getString("DEV");
15+
} catch (IOException ex) {
16+
Logger.global.logError("Failed to load core.json from resources!", ex);
17+
}
18+
19+
if (version.equals("${version}")) version = "DEV";
20+
21+
VERSION = version;
22+
}
623

724
}

‎BlueMapCore/src/main/resources/core.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"version": "${version}"
3+
}

‎BlueMapSponge/build.gradle‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,26 @@ dependencies {
33
compile group: 'org.bstats', name: 'bstats-sponge-lite', version: '1.5'
44
compile project(':BlueMapCommon')
55
}
6+
7+
build.dependsOn shadowJar {
8+
destinationDir = file '../build/release'
9+
archiveFileName = "BlueMap-${version}-sponge.jar"
10+
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'
18+
}
19+
20+
processResources {
21+
from(sourceSets.main.resources.srcDirs) {
22+
include 'mcmod.info'
23+
24+
expand (
25+
version: project.version
26+
)
27+
}
28+
}

‎BlueMapSponge/src/main/java/de/bluecolored/bluemap/sponge/SpongePlugin.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
id = Plugin.PLUGIN_ID,
5353
name = Plugin.PLUGIN_NAME,
5454
authors = { "Blue (Lukas Rieger)" },
55-
description = "This plugin provides a fully 3D map of your world for your browser!",
56-
version = Plugin.PLUGIN_VERSION
55+
description = "This plugin provides a fully 3D map of your world for your browser!"
5756
)
5857
public class SpongePlugin implements ServerInterface {
5958

BlueMapCommon/src/main/resources/mcmod.info renamed to BlueMapSponge/src/main/resources/mcmod.info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"modid": "bluemap",
44
"name": "BlueMap",
5-
"version": "0.5.1-mc1.13",
5+
"version": "${version}",
66
"description": "A 3d-map of your Minecraft worlds view-able in your browser using three.js (WebGL)",
77
"url": "https://github.com/BlueMap-Minecraft",
88
"authorList": [

0 commit comments

Comments
 (0)