Updated to 6.2.0, using new eco jar system

This commit is contained in:
Auxilor 2021-01-17 11:04:40 +00:00
parent 152d12a97e
commit 00346013fa
13 changed files with 12 additions and 20 deletions

View File

@ -7,7 +7,6 @@ plugins {
dependencies { dependencies {
implementation project(":eco-core").getSubprojects() implementation project(":eco-core").getSubprojects()
implementation 'com.willfp:eco:1.1.3'
} }
allprojects { allprojects {
@ -50,7 +49,7 @@ allprojects {
} }
dependencies { dependencies {
compileOnly 'com.willfp:eco:1.1.3' compileOnly 'com.willfp:eco:2.0.0'
compileOnly 'org.jetbrains:annotations:19.0.0' compileOnly 'org.jetbrains:annotations:19.0.0'
@ -72,10 +71,6 @@ 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.options.encoding = 'UTF-8'
compileJava.dependsOn clean compileJava.dependsOn clean
@ -91,8 +86,6 @@ clean.doLast {
} }
shadowJar { shadowJar {
relocate('org.apache.maven', 'com.willfp.ecoenchants.eco.shaded.maven')
relocate('org.bstats', 'com.willfp.ecoenchants.eco.shaded.bstats')
archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar"
} }

View File

@ -6,6 +6,7 @@ authors: [Auxilor]
website: willfp.com website: willfp.com
load: STARTUP load: STARTUP
depend: depend:
- eco
- ProtocolLib - ProtocolLib
softdepend: softdepend:
- WorldGuard - WorldGuard

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Alchemy Extension' description = 'Alchemy Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Biomes Extension' description = 'Biomes Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -11,6 +11,4 @@ subprojects {
tasks.withType(Jar) { tasks.withType(Jar) {
destinationDirectory = file("$rootDir/bin/") destinationDirectory = file("$rootDir/bin/")
} }
tasks.jar.enabled = false
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Effects Extension' description = 'Effects Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Endershot Extension' description = 'Endershot Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Firewand Extension' description = 'Firewand Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Precision Extension' description = 'Precision Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Sprint Artifacts Extension' description = 'Sprint Artifacts Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '3.0.1' version '3.0.1'
description = 'Summoning Extension' description = 'Summoning Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -2,6 +2,6 @@ group 'com.willfp'
version '1.0.2' version '1.0.2'
description = 'Xray Extension' description = 'Xray Extension'
shadowJar { jar {
archiveFileName = project.getDescription() + " v" + project.version + ".jar" archiveFileName = project.getDescription() + " v" + project.version + ".jar"
} }

View File

@ -1,2 +1,2 @@
version = 6.1.2 version = 6.2.0
plugin-name = EcoEnchants plugin-name = EcoEnchants