From 3362f4d772d2a15622524b09f26d3f551359b3e3 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Tue, 17 Nov 2020 14:42:37 +0000 Subject: [PATCH] Removed unneeded gradle --- NMS/API/build.gradle | 2 +- NMS/v1_15_R1/build.gradle | 2 +- NMS/v1_16_R1/build.gradle | 2 +- NMS/v1_16_R2/build.gradle | 2 +- NMS/v1_16_R3/build.gradle | 2 +- Plugin/build.gradle | 5 +- build.gradle | 113 +++++++++++++++++ ...willfp.ecoenchants.java-conventions.gradle | 114 ------------------ 8 files changed, 120 insertions(+), 122 deletions(-) create mode 100644 build.gradle delete mode 100644 buildSrc/src/main/groovy/com.willfp.ecoenchants.java-conventions.gradle diff --git a/NMS/API/build.gradle b/NMS/API/build.gradle index 3ca290e7..90233545 100644 --- a/NMS/API/build.gradle +++ b/NMS/API/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.willfp.ecoenchants.java-conventions' + id 'java' } dependencies { diff --git a/NMS/v1_15_R1/build.gradle b/NMS/v1_15_R1/build.gradle index f034058c..cb1f6784 100644 --- a/NMS/v1_15_R1/build.gradle +++ b/NMS/v1_15_R1/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.willfp.ecoenchants.java-conventions' + id 'java' } dependencies { diff --git a/NMS/v1_16_R1/build.gradle b/NMS/v1_16_R1/build.gradle index b56d1d2c..bee083ce 100644 --- a/NMS/v1_16_R1/build.gradle +++ b/NMS/v1_16_R1/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.willfp.ecoenchants.java-conventions' + id 'java' } dependencies { diff --git a/NMS/v1_16_R2/build.gradle b/NMS/v1_16_R2/build.gradle index 38bdda2b..d2b5660d 100644 --- a/NMS/v1_16_R2/build.gradle +++ b/NMS/v1_16_R2/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.willfp.ecoenchants.java-conventions' + id 'java' } dependencies { diff --git a/NMS/v1_16_R3/build.gradle b/NMS/v1_16_R3/build.gradle index e0f6dbc9..ce619e3c 100644 --- a/NMS/v1_16_R3/build.gradle +++ b/NMS/v1_16_R3/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'com.willfp.ecoenchants.java-conventions' + id 'java' } dependencies { diff --git a/Plugin/build.gradle b/Plugin/build.gradle index dc761fcb..0de6f5bd 100644 --- a/Plugin/build.gradle +++ b/Plugin/build.gradle @@ -1,6 +1,5 @@ plugins { id 'com.github.johnrengelman.shadow' version '5.2.0' - id 'com.willfp.ecoenchants.java-conventions' id 'java' } @@ -37,7 +36,7 @@ shadowJar { relocate('org.jetbrains', 'com.willfp.ecoenchants.shaded.jetbrains') relocate('org.intellij', 'com.willfp.ecoenchants.shaded.intellij') relocate('org.apache.maven', 'com.willfp.ecoenchants.shaded.maven') - archiveName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" + archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + ".jar" } processResources { @@ -47,7 +46,7 @@ processResources { } jar { - archiveName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" + archiveFileName = findProperty("plugin-name") + " v" + findProperty("version") + " " + "unshaded" + ".jar" } compileJava.dependsOn clean diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..66f1707a --- /dev/null +++ b/build.gradle @@ -0,0 +1,113 @@ +plugins { + id 'java-library' + id 'maven-publish' + id 'java' +} + +allprojects { + repositories { + mavenCentral() + jcenter() + mavenLocal() + maven { + url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' + } + + maven { + url 'https://repo.codemc.org/repository/maven-public' + } + + maven { + url 'https://oss.sonatype.org/content/groups/public/' + } + + maven { + url 'https://maven.enginehub.org/repo/' + } + + maven { + url 'https://jitpack.io' + } + + maven { + url 'https://ci.ender.zone/plugin/repository/project/' + } + + maven { + url 'https://ci.ender.zone/plugin/repository/everything/' + } + + maven { + url 'https://repo.md-5.net/content/repositories/snapshots/' + } + + maven { + url 'https://repo.janmm14.de/repository/public/' + } + + maven { + url 'https://repo.dmulloy2.net/nexus/repository/public/' + } + + maven { + url 'https://papermc.io/repo/repository/maven-public/' + } + + maven { + url 'https://repo.maven.apache.org/maven2/' + } + + maven { + url 'https://repo.dustplanet.de/artifactory/ext-release-local/' + } + + maven { + url 'https://maven.seyfahni.de/repository/snapshots/' + } + + maven { + url 'https://libraries.minecraft.net/' + } + + maven { + url 'https://repo.spongepowered.org/maven/' + } + + maven { + url 'https://org.kitteh.pastegg' + } + + maven { + url 'http://repo.mikeprimm.com/' + } + + maven { + url 'http://maven.sk89q.com/repo/' + } + + maven { + url 'https://github.com/factions-site/repo/raw/public/' + } + + maven { + url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' + } + } +} + +group = 'com.willfp.ecoenchants' +archivesBaseName = project.name +version = project.version +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/buildSrc/src/main/groovy/com.willfp.ecoenchants.java-conventions.gradle b/buildSrc/src/main/groovy/com.willfp.ecoenchants.java-conventions.gradle deleted file mode 100644 index eb8520db..00000000 --- a/buildSrc/src/main/groovy/com.willfp.ecoenchants.java-conventions.gradle +++ /dev/null @@ -1,114 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - id 'java-library' - id 'maven-publish' -} - -repositories { - mavenCentral() - jcenter() - mavenLocal() - maven { - url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' - } - - maven { - url 'https://repo.codemc.org/repository/maven-public' - } - - maven { - url 'https://oss.sonatype.org/content/groups/public/' - } - - maven { - url 'https://maven.enginehub.org/repo/' - } - - maven { - url 'https://jitpack.io' - } - - maven { - url 'https://ci.ender.zone/plugin/repository/project/' - } - - maven { - url 'https://ci.ender.zone/plugin/repository/everything/' - } - - maven { - url 'https://repo.md-5.net/content/repositories/snapshots/' - } - - maven { - url 'https://repo.janmm14.de/repository/public/' - } - - maven { - url 'https://repo.dmulloy2.net/nexus/repository/public/' - } - - maven { - url 'https://papermc.io/repo/repository/maven-public/' - } - - maven { - url 'https://repo.maven.apache.org/maven2/' - } - - maven { - url 'https://repo.dustplanet.de/artifactory/ext-release-local/' - } - - maven { - url 'https://maven.seyfahni.de/repository/snapshots/' - } - - maven { - url 'https://libraries.minecraft.net/' - } - - maven { - url 'https://repo.spongepowered.org/maven/' - } - - maven { - url 'https://org.kitteh.pastegg' - } - - maven { - url 'http://repo.mikeprimm.com/' - } - - maven { - url 'http://maven.sk89q.com/repo/' - } - - maven { - url 'https://github.com/factions-site/repo/raw/public/' - } - - maven { - url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' - } -} - -group = 'com.willfp.ecoenchants' -archivesBaseName = project.name -version = project.version -java.sourceCompatibility = JavaVersion.VERSION_1_8 - -publishing { - publications { - maven(MavenPublication) { - from(components.java) - } - } -} - -tasks.withType(JavaCompile) { - options.encoding = 'UTF-8' -}