diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | spark-bukkit/build.gradle | 6 | ||||
| -rw-r--r-- | spark-bukkit/src/main/resources/plugin.yml | 2 | ||||
| -rw-r--r-- | spark-bungeecord/build.gradle | 6 | ||||
| -rw-r--r-- | spark-bungeecord/src/main/resources/bungee.yml | 2 | ||||
| -rw-r--r-- | spark-forge/build.gradle | 13 | ||||
| -rw-r--r-- | spark-forge/src/main/resources/mcmod.info | 2 | ||||
| -rw-r--r-- | spark-sponge/build.gradle | 4 | ||||
| -rw-r--r-- | spark-universal/build.gradle | 11 | ||||
| -rw-r--r-- | spark-velocity/build.gradle | 4 |
10 files changed, 26 insertions, 26 deletions
diff --git a/build.gradle b/build.gradle index 82ff57a..1cdc0d4 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ subprojects { ext { pluginVersion = '1.1.0' - pluginDesc = '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-bukkit/build.gradle b/spark-bukkit/build.gradle index 7fd90d6..27c624c 100644 --- a/spark-bukkit/build.gradle +++ b/spark-bukkit/build.gradle @@ -5,8 +5,10 @@ dependencies { processResources { from(sourceSets.main.resources.srcDirs) { - expand 'pluginVersion': project.pluginVersion - expand 'pluginDesc': project.pluginDesc + expand ( + 'pluginVersion': project.pluginVersion, + 'pluginDescription': project.pluginDescription + ) include 'plugin.yml' } }
\ No newline at end of file diff --git a/spark-bukkit/src/main/resources/plugin.yml b/spark-bukkit/src/main/resources/plugin.yml index 922f8c9..6e7608f 100644 --- a/spark-bukkit/src/main/resources/plugin.yml +++ b/spark-bukkit/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: spark version: ${pluginVersion} -description: ${pluginDesc} +description: ${pluginDescription} authors: [Luck, sk89q] main: me.lucko.spark.bukkit.SparkBukkitPlugin diff --git a/spark-bungeecord/build.gradle b/spark-bungeecord/build.gradle index 7713359..f94e651 100644 --- a/spark-bungeecord/build.gradle +++ b/spark-bungeecord/build.gradle @@ -5,8 +5,10 @@ dependencies { processResources { from(sourceSets.main.resources.srcDirs) { - expand 'pluginVersion': project.pluginVersion - expand 'pluginDesc': project.pluginDesc + expand ( + 'pluginVersion': project.pluginVersion, + 'pluginDescription': project.pluginDescription + ) include 'bungee.yml' } }
\ No newline at end of file diff --git a/spark-bungeecord/src/main/resources/bungee.yml b/spark-bungeecord/src/main/resources/bungee.yml index 2194180..4485e11 100644 --- a/spark-bungeecord/src/main/resources/bungee.yml +++ b/spark-bungeecord/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: spark version: ${pluginVersion} -description: ${pluginDesc} +description: ${pluginDescription} author: Luck, sk89q main: me.lucko.spark.bungeecord.SparkBungeeCordPlugin diff --git a/spark-forge/build.gradle b/spark-forge/build.gradle index be1982d..d8b4049 100644 --- a/spark-forge/build.gradle +++ b/spark-forge/build.gradle @@ -1,16 +1,17 @@ buildscript { repositories { - jcenter() maven { url = "http://files.minecraftforge.net/maven" } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' } } +plugins { + id 'com.github.johnrengelman.shadow' version '4.0.1' +} + apply plugin: 'net.minecraftforge.gradle.forge' -apply plugin: 'com.github.johnrengelman.shadow' minecraft { version = '1.12.2-14.23.4.2705' @@ -23,8 +24,10 @@ minecraft { processResources { from(sourceSets.main.resources.srcDirs) { - expand 'pluginVersion': project.pluginVersion - expand 'pluginDesc': project.pluginDesc + expand ( + 'pluginVersion': project.pluginVersion, + 'pluginDescription': project.pluginDescription + ) include 'mcmod.info' } } diff --git a/spark-forge/src/main/resources/mcmod.info b/spark-forge/src/main/resources/mcmod.info index 861646f..6b3be4c 100644 --- a/spark-forge/src/main/resources/mcmod.info +++ b/spark-forge/src/main/resources/mcmod.info @@ -1,7 +1,7 @@ [{ "modid": "spark", "name": "spark", - "description": "${pluginDesc}", + "description": "${pluginDescription}", "version": "${pluginVersion}", "authors": ["Luck", "sk89q"] }]
\ No newline at end of file diff --git a/spark-sponge/build.gradle b/spark-sponge/build.gradle index 581c1ec..bfb901c 100644 --- a/spark-sponge/build.gradle +++ b/spark-sponge/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'ninja.miserable.blossom' version '1.0.1' + id 'net.kyori.blossom' version '1.1.0' } dependencies { @@ -11,5 +11,5 @@ dependencies { blossom { replaceTokenIn('src/main/java/me/lucko/spark/sponge/SparkSpongePlugin.java') replaceToken '@version@', project.pluginVersion - replaceToken '@desc@', project.pluginDesc + replaceToken '@desc@', project.pluginDescription }
\ No newline at end of file diff --git a/spark-universal/build.gradle b/spark-universal/build.gradle index 79172e3..ec56501 100644 --- a/spark-universal/build.gradle +++ b/spark-universal/build.gradle @@ -1,14 +1,7 @@ -buildscript { - repositories { - jcenter() - } - dependencies { - classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' - } +plugins { + id 'com.github.johnrengelman.shadow' version '4.0.1' } -apply plugin: 'com.github.johnrengelman.shadow' - dependencies { compile project(':spark-common') compile project(':spark-bukkit') diff --git a/spark-velocity/build.gradle b/spark-velocity/build.gradle index b7f02e0..847a70d 100644 --- a/spark-velocity/build.gradle +++ b/spark-velocity/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'ninja.miserable.blossom' version '1.0.1' + id 'net.kyori.blossom' version '1.1.0' } dependencies { @@ -11,5 +11,5 @@ dependencies { blossom { replaceTokenIn('src/main/java/me/lucko/spark/velocity/SparkVelocityPlugin.java') replaceToken '@version@', project.pluginVersion - replaceToken '@desc@', project.pluginDesc + replaceToken '@desc@', project.pluginDescription }
\ No newline at end of file |