Fixed extensions

WillFP · WillFP · commit ad8df3ed5594 · 2021-01-04T14:12:47.000Z
diff --git 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
@@ -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"
 }
diff --git 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"
 }
diff --git 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
 }
diff --git 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"
 }
diff --git 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"
 }
diff --git 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"
 }
diff --git 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"
 }
diff --git 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"
 }
diff --git 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"
 }
diff --git 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"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`group 'com.willfp'`
`2`		`-version '3.0.0'`
	`2`	`+version '3.0.1'`
`3`	`3`	`description = 'Alchemy Extension'`
`4`	`4`
`5`		`-jar {`
	`5`	`+shadowJar {`
`6`	`6`	`archiveFileName = project.getDescription() + " v" + project.version + ".jar"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,6 @@ subprojects {`
`12`	`12`	`tasks.withType(Jar) {`
`13`	`13`	`destinationDirectory = file("$rootDir/bin/")`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+ tasks.jar.enabled = false`
`15`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ group 'com.willfp'`
`2`	`2`	`version '3.0.1'`
`3`	`3`	`description = 'Precision Extension'`
`4`	`4`
`5`		`-jar {`
	`5`	`+shadowJar {`
`6`	`6`	`archiveFileName = project.getDescription() + " v" + project.version + ".jar"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ group 'com.willfp'`
`2`	`2`	`version '3.0.1'`
`3`	`3`	`description = 'Summoning Extension'`
`4`	`4`
`5`		`-jar {`
	`5`	`+shadowJar {`
`6`	`6`	`archiveFileName = project.getDescription() + " v" + project.version + ".jar"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`group 'com.willfp'`
`2`		`-version '1.0.0'`
	`2`	`+version '1.0.1'`
`3`	`3`	`description = 'Xray Extension'`
`4`	`4`
`5`		`-jar {`
	`5`	`+shadowJar {`
`6`	`6`	`archiveFileName = project.getDescription() + " v" + project.version + ".jar"`
`7`	`7`	`}`