diff options
| -rw-r--r-- | spark-common/build.gradle | 8 | ||||
| -rw-r--r-- | spark-universal/build.gradle | 10 | ||||
| -rw-r--r-- | spark-velocity/build.gradle | 16 |
3 files changed, 21 insertions, 13 deletions
diff --git a/spark-common/build.gradle b/spark-common/build.gradle index dbc02da..7238c9f 100644 --- a/spark-common/build.gradle +++ b/spark-common/build.gradle @@ -8,17 +8,17 @@ dependencies { compile 'com.squareup.okhttp3:okhttp:3.14.1' compile 'com.squareup.okio:okio:1.17.3' compile 'org.tukaani:xz:1.8' - compile('net.kyori:text-api:3.0.2') { + compile('net.kyori:text-api:3.0.3') { exclude(module: 'checker-qual') } - compile('net.kyori:text-serializer-gson:3.0.2') { + compile('net.kyori:text-serializer-gson:3.0.3') { exclude(module: 'text-api') exclude(module: 'gson') } - compile('net.kyori:text-serializer-legacy:3.0.2') { + compile('net.kyori:text-serializer-legacy:3.0.3') { exclude(module: 'text-api') } - compile('net.kyori:text-feature-pagination:3.0.2') { + compile('net.kyori:text-feature-pagination:3.0.3') { exclude(module: 'text-api') } compileOnly 'com.google.code.gson:gson:2.7' diff --git a/spark-universal/build.gradle b/spark-universal/build.gradle index d758fb2..10c6e69 100644 --- a/spark-universal/build.gradle +++ b/spark-universal/build.gradle @@ -6,7 +6,6 @@ dependencies { compile project(':spark-common') compile project(':spark-bukkit') compile project(':spark-bungeecord') - compile project(':spark-velocity') compile project(':spark-sponge') } @@ -15,6 +14,7 @@ shadowJar { relocate 'okio', 'me.lucko.spark.lib.okio' relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3' + relocate 'net.kyori.text', 'me.lucko.spark.lib.text' relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz' relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf' relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm' @@ -25,11 +25,3 @@ artifacts { shadow shadowJar } -// Only used occasionally for deployment - not needed for normal builds. -/* -apply plugin: 'signing' -signing { - useGpgCmd() - sign configurations.archives -} -*/ diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle index e90ed7f..51c0be8 100644 --- a/spark-velocity/build.gradle +++ b/spark-velocity/build.gradle @@ -1,5 +1,6 @@ plugins { id 'net.kyori.blossom' version '1.1.0' + id 'com.github.johnrengelman.shadow' version '4.0.1' } dependencies { @@ -12,4 +13,19 @@ blossom { replaceTokenIn('src/main/java/me/lucko/spark/velocity/VelocitySparkPlugin.java') replaceToken '@version@', project.pluginVersion replaceToken '@desc@', project.pluginDescription +} + +shadowJar { + archiveName = 'spark-velocity.jar' + + relocate 'okio', 'me.lucko.spark.lib.okio' + relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3' + relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz' + relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf' + relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm' +} + +artifacts { + archives shadowJar + shadow shadowJar }
\ No newline at end of file |