From ad8df3ed5594c21b71e19a58ac9e1fb6213f1d1c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 4 Jan 2021 14:12:47 +0000 Subject: [PATCH] Fixed extensions --- build.gradle | 9 ++++++--- eco-extensions/alchemy/build.gradle | 4 ++-- eco-extensions/biomes/build.gradle | 4 ++-- eco-extensions/build.gradle | 2 ++ eco-extensions/effects/build.gradle | 4 ++-- eco-extensions/endershot/build.gradle | 4 ++-- eco-extensions/firewand/build.gradle | 4 ++-- eco-extensions/precision/build.gradle | 2 +- eco-extensions/sprint-artifacts/build.gradle | 4 ++-- eco-extensions/summoning/build.gradle | 2 +- eco-extensions/xray/build.gradle | 4 ++-- 11 files changed, 24 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index a5af15bc..d3ec191c 100644 --- a/build.gradle +++ b/build.gradle @@ -68,8 +68,14 @@ allprojects { } } + shadowJar { + relocate('com.willfp.eco.', 'com.willfp.ecoenchants.eco.') // Dot is to prevent plugin being shaded into itself + } + compileJava.options.encoding = 'UTF-8' compileJava.dependsOn clean + + build.dependsOn shadowJar } tasks.withType(Jar) { @@ -83,7 +89,6 @@ clean.doLast { shadowJar { relocate('org.apache.maven', 'com.willfp.ecoenchants.eco.shaded.maven') relocate('org.bstats', 'com.willfp.ecoenchants.eco.shaded.bstats') - relocate('com.willfp.eco.', 'com.willfp.ecoenchants.eco.') // Dot is to prevent plugin being shaded into itself archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" } @@ -98,8 +103,6 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8 compileJava.options.encoding = 'UTF-8' -build.dependsOn shadowJar - publishing { publications { maven(MavenPublication) { diff --git a/eco-extensions/alchemy/build.gradle b/eco-extensions/alchemy/build.gradle index c7068295..1579a7be 100644 --- a/eco-extensions/alchemy/build.gradle +++ b/eco-extensions/alchemy/build.gradle @@ -1,7 +1,7 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Alchemy Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/biomes/build.gradle b/eco-extensions/biomes/build.gradle index a98f1278..b8f44f55 100644 --- a/eco-extensions/biomes/build.gradle +++ b/eco-extensions/biomes/build.gradle @@ -1,7 +1,7 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Biomes Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/build.gradle b/eco-extensions/build.gradle index 70a61b0a..475ecf53 100644 --- a/eco-extensions/build.gradle +++ b/eco-extensions/build.gradle @@ -12,4 +12,6 @@ subprojects { tasks.withType(Jar) { destinationDirectory = file("$rootDir/bin/") } + + tasks.jar.enabled = false } \ No newline at end of file diff --git a/eco-extensions/effects/build.gradle b/eco-extensions/effects/build.gradle index 88fa5bc7..1793c990 100644 --- a/eco-extensions/effects/build.gradle +++ b/eco-extensions/effects/build.gradle @@ -1,7 +1,7 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Effects Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/endershot/build.gradle b/eco-extensions/endershot/build.gradle index bf748b1d..d7cfa250 100644 --- a/eco-extensions/endershot/build.gradle +++ b/eco-extensions/endershot/build.gradle @@ -1,7 +1,7 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Endershot Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/firewand/build.gradle b/eco-extensions/firewand/build.gradle index 49d2b25a..c415db80 100644 --- a/eco-extensions/firewand/build.gradle +++ b/eco-extensions/firewand/build.gradle @@ -1,7 +1,7 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Firewand Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/precision/build.gradle b/eco-extensions/precision/build.gradle index c4533054..fbbe3894 100644 --- a/eco-extensions/precision/build.gradle +++ b/eco-extensions/precision/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Precision Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/sprint-artifacts/build.gradle b/eco-extensions/sprint-artifacts/build.gradle index 7d6566cc..b4eb5d37 100644 --- a/eco-extensions/sprint-artifacts/build.gradle +++ b/eco-extensions/sprint-artifacts/build.gradle @@ -1,7 +1,7 @@ group 'com.willfp' -version '3.0.0' +version '3.0.1' description = 'Sprint Artifacts Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/summoning/build.gradle b/eco-extensions/summoning/build.gradle index 8c698dab..feae2c7e 100644 --- a/eco-extensions/summoning/build.gradle +++ b/eco-extensions/summoning/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Summoning Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/eco-extensions/xray/build.gradle b/eco-extensions/xray/build.gradle index 7e2aad63..6435050e 100644 --- a/eco-extensions/xray/build.gradle +++ b/eco-extensions/xray/build.gradle @@ -1,7 +1,7 @@ group 'com.willfp' -version '1.0.0' +version '1.0.1' description = 'Xray Extension' -jar { +shadowJar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file