From 00346013fa08bff63bb8295de0bf3e78cc694fdc Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sun, 17 Jan 2021 11:04:40 +0000 Subject: [PATCH] Updated to 6.2.0, using new eco jar system --- build.gradle | 9 +-------- eco-core/core-plugin/src/main/resources/plugin.yml | 1 + eco-extensions/alchemy/build.gradle | 2 +- eco-extensions/biomes/build.gradle | 2 +- eco-extensions/build.gradle | 2 -- eco-extensions/effects/build.gradle | 2 +- eco-extensions/endershot/build.gradle | 2 +- eco-extensions/firewand/build.gradle | 2 +- eco-extensions/precision/build.gradle | 2 +- eco-extensions/sprint-artifacts/build.gradle | 2 +- eco-extensions/summoning/build.gradle | 2 +- eco-extensions/xray/build.gradle | 2 +- gradle.properties | 2 +- 13 files changed, 12 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index e2c83d85..2b548040 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,6 @@ plugins { dependencies { implementation project(":eco-core").getSubprojects() - implementation 'com.willfp:eco:1.1.3' } allprojects { @@ -50,7 +49,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:1.1.3' + compileOnly 'com.willfp:eco:2.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.dependsOn clean @@ -91,8 +86,6 @@ clean.doLast { } 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" } diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index ed90e195..0c097f75 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -6,6 +6,7 @@ authors: [Auxilor] website: willfp.com load: STARTUP depend: + - eco - ProtocolLib softdepend: - WorldGuard diff --git a/eco-extensions/alchemy/build.gradle b/eco-extensions/alchemy/build.gradle index 1579a7be..176951ae 100644 --- a/eco-extensions/alchemy/build.gradle +++ b/eco-extensions/alchemy/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Alchemy Extension' -shadowJar { +jar { 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 b8f44f55..898989f8 100644 --- a/eco-extensions/biomes/build.gradle +++ b/eco-extensions/biomes/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Biomes Extension' -shadowJar { +jar { 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 8437aeaf..7e7a5ff2 100644 --- a/eco-extensions/build.gradle +++ b/eco-extensions/build.gradle @@ -11,6 +11,4 @@ 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 1793c990..d41beab4 100644 --- a/eco-extensions/effects/build.gradle +++ b/eco-extensions/effects/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Effects Extension' -shadowJar { +jar { 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 d7cfa250..1217a8cc 100644 --- a/eco-extensions/endershot/build.gradle +++ b/eco-extensions/endershot/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Endershot Extension' -shadowJar { +jar { 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 c415db80..f7a2666f 100644 --- a/eco-extensions/firewand/build.gradle +++ b/eco-extensions/firewand/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Firewand Extension' -shadowJar { +jar { 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 fbbe3894..c4533054 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' -shadowJar { +jar { 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 b4eb5d37..7104881c 100644 --- a/eco-extensions/sprint-artifacts/build.gradle +++ b/eco-extensions/sprint-artifacts/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '3.0.1' description = 'Sprint Artifacts Extension' -shadowJar { +jar { 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 feae2c7e..8c698dab 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' -shadowJar { +jar { 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 53d216be..a8e45310 100644 --- a/eco-extensions/xray/build.gradle +++ b/eco-extensions/xray/build.gradle @@ -2,6 +2,6 @@ group 'com.willfp' version '1.0.2' description = 'Xray Extension' -shadowJar { +jar { archiveFileName = project.getDescription() + " v" + project.version + ".jar" } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 231a6284..56c7bd15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 6.1.2 +version = 6.2.0 plugin-name = EcoEnchants \ No newline at end of file