From f87420a37a602c81d5467bda4fad1becf9821fe3 Mon Sep 17 00:00:00 2001 From: Luck Date: Fri, 19 Oct 2018 15:48:55 +0100 Subject: more buildscript changes --- build.gradle | 2 +- spark-sponge/build.gradle | 13 ++----------- spark-universal/build.gradle | 33 +++++++++++++++++++++------------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/build.gradle b/build.gradle index 1cdc0d4..45c54a8 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ subprojects { ext { pluginVersion = '1.1.0' - pluginDescription = 'Spark is a performance profiling plugin based on sk89q\'s WarmRoast profiler' + pluginDescription = 'spark is a performance profiling plugin based on sk89q\'s WarmRoast profiler' } sourceCompatibility = 1.8 diff --git a/spark-sponge/build.gradle b/spark-sponge/build.gradle index 494b872..b9388b9 100644 --- a/spark-sponge/build.gradle +++ b/spark-sponge/build.gradle @@ -4,8 +4,8 @@ plugins { dependencies { compile project(':spark-common') - compileOnly 'org.spongepowered:spongeapi:8.0.0-SNAPSHOT' - annotationProcessor 'org.spongepowered:spongeapi:8.0.0-SNAPSHOT' + compileOnly 'org.spongepowered:spongeapi:7.1.0' + annotationProcessor 'org.spongepowered:spongeapi:7.1.0' } blossom { @@ -13,12 +13,3 @@ blossom { replaceToken '@version@', project.pluginVersion replaceToken '@desc@', project.pluginDescription } - -// Only used occasionally for deployment - not needed for normal builds. -/* -apply plugin: 'signing' -signing { - useGpgCmd() - sign configurations.archives -} -*/ \ No newline at end of file diff --git a/spark-universal/build.gradle b/spark-universal/build.gradle index ec56501..6058e0f 100644 --- a/spark-universal/build.gradle +++ b/spark-universal/build.gradle @@ -1,23 +1,32 @@ plugins { - id 'com.github.johnrengelman.shadow' version '4.0.1' + id 'com.github.johnrengelman.shadow' version '4.0.1' } dependencies { - compile project(':spark-common') - compile project(':spark-bukkit') - compile project(':spark-bungeecord') - compile project(':spark-velocity') - compile project(':spark-sponge') + compile project(':spark-common') + compile project(':spark-bukkit') + compile project(':spark-bungeecord') + compile project(':spark-velocity') + compile project(':spark-sponge') } shadowJar { - archiveName = 'spark.jar' + archiveName = 'spark.jar' - relocate 'okio', 'me.lucko.spark.lib.okio' - relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3' + relocate 'okio', 'me.lucko.spark.lib.okio' + relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3' } artifacts { - archives shadowJar - shadow shadowJar -} \ No newline at end of file + archives shadowJar + shadow shadowJar +} + +// Only used occasionally for deployment - not needed for normal builds. +/* +apply plugin: 'signing' +signing { + useGpgCmd() + sign configurations.archives +} +*/ -- cgit