From 0f1715ea9ff610519a9f2a92f34af2e94226f4a0 Mon Sep 17 00:00:00 2001 From: NotMyFault Date: Fri, 29 Nov 2019 14:28:06 +0100 Subject: [PATCH] Revert "Merge pull request #274 from IntellectualSites/api" This reverts commit 79d9bda9129790ef7d7d2d06c0e4410c1bed259a, reversing changes made to 0fcac395929d7d4e511f7f05b16973baa55bcf00. --- worldedit-bukkit/build.gradle.kts | 49 ++----------------------------- worldedit-core/build.gradle.kts | 47 ----------------------------- 2 files changed, 2 insertions(+), 94 deletions(-) diff --git a/worldedit-bukkit/build.gradle.kts b/worldedit-bukkit/build.gradle.kts index 2911a08d1..88b4bdb3e 100644 --- a/worldedit-bukkit/build.gradle.kts +++ b/worldedit-bukkit/build.gradle.kts @@ -2,9 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar plugins { `java-library` - maven - java - `maven-publish` } applyPlatformAndCoreConfiguration() @@ -23,8 +20,8 @@ repositories { maven { url = uri("https://repo.destroystokyo.com/repository/maven-public//") } maven { url = uri("http://repo.dmulloy2.net/content/groups/public/") } maven { url = uri("http://ci.ender.zone/plugin/repository/everything/") } - maven { url = uri("https://repo.inventivetalent.org/content/groups/public/") } - flatDir { dir(File("src/main/resources")) } + maven { url = uri("https://repo.inventivetalent.org/content/groups/public/")} + flatDir {dir(File("src/main/resources"))} } configurations.all { @@ -84,44 +81,6 @@ tasks.named("jar") { } } -val jar: Jar by tasks -jar.archiveName = "FAWE-Bukkit-API-${project.version}.jar" -jar.destinationDir = file("../mvn/com/boydti/FAWE-Bukkit-API/" + project.version) - -task("writeNewPom") { - doLast { - maven.pom { - withGroovyBuilder { - "project" { - groupId = "com.boydti" - artifactId = "FAWE-Bukkit-API" - version = "project.version" - } - } - }.writeTo("../mvn/com/boydti/FAWE-Bukkit-API/${project.version}/FAWE-Bukkit-API-${project.version}.pom") - maven.pom { - withGroovyBuilder { - "project" { - groupId = "com.boydti" - artifactId = "FAWE-Bukkit-API" - version = "latest" - } - } - }.writeTo("../mvn/com/boydti/FAWE-Bukkit-API/latest/FAWE-Bukkit-API-latest.pom") - } -} - -task("dataContent") { - doLast { - copySpec { - from("../mvn/com/boydti/FAWE-Bukkit-API/${project.version}/") - into("../mvn/com/boydti/FAWE-Bukkit-API/latest/") - include("*.jar") - rename("FAWE-Bukkit-API-${project.version}.jar", "FAWE-Bukkit-API-latest.jar") - } - } -} - tasks.named("shadowJar") { dependencies { relocate("org.slf4j", "com.sk89q.worldedit.slf4j") @@ -148,7 +107,3 @@ tasks.named("shadowJar") { tasks.named("assemble").configure { dependsOn("shadowJar") } - -tasks.named("dataContent").configure { - dependsOn("writeNewPom") -} diff --git a/worldedit-core/build.gradle.kts b/worldedit-core/build.gradle.kts index f4ec977e7..a3bb707d5 100644 --- a/worldedit-core/build.gradle.kts +++ b/worldedit-core/build.gradle.kts @@ -5,9 +5,6 @@ import com.mendhak.gradlecrowdin.UploadSourceFileTask plugins { id("java-library") - id("java") - id("maven") - id("maven-publish") id("net.ltgt.apt-eclipse") id("net.ltgt.apt-idea") id("antlr") @@ -101,45 +98,6 @@ tasks.named("processResources") { "date" to "${rootProject.ext["date"]}") } } - -val jar: Jar by tasks -jar.archiveName = "FAWE-API-${project.version}.jar" -jar.destinationDir = file("../mvn/com/boydti/FAWE-API/" + project.version) - -task("writeNewPom") { - doLast { - maven.pom { - withGroovyBuilder { - "project" { - groupId = "com.boydti" - artifactId = "FAWE-API" - version = "project.version" - } - } - }.writeTo("../mvn/com/boydti/FAWE-API/${project.version}/FAWE-API-${project.version}.pom") - maven.pom { - withGroovyBuilder { - "project" { - groupId = "com.boydti" - artifactId = "FAWE-API" - version = "latest" - } - } - }.writeTo("../mvn/com/boydti/FAWE-API/latest/FAWE-API-latest.pom") - } -} - -task("dataContent") { - doLast { - copySpec { - from("../mvn/com/boydti/FAWE-API/${project.version}/") - into("../mvn/com/boydti/FAWE-API/latest/") - include("*.jar") - rename("FAWE-API-${project.version}.jar", "FAWE-API-latest.jar") - } - } -} - tasks.named("shadowJar") { dependencies { include(dependency("com.github.luben:zstd-jni:1.4.3-1")) @@ -171,8 +129,3 @@ if (project.hasProperty(crowdinApiKey)) { dependsOn("crowdinDownload") } } - -tasks.named("dataContent").configure { - dependsOn("writeNewPom") -} -