Revert "Merge pull request #274 from IntellectualSites/api"

This reverts commit 79d9bda912, reversing
changes made to 0fcac39592.
This commit is contained in:
NotMyFault 2019-11-29 14:28:06 +01:00
parent 79d9bda912
commit 0f1715ea9f
2 changed files with 2 additions and 94 deletions

View File

@ -2,9 +2,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
plugins { plugins {
`java-library` `java-library`
maven
java
`maven-publish`
} }
applyPlatformAndCoreConfiguration() applyPlatformAndCoreConfiguration()
@ -23,8 +20,8 @@ repositories {
maven { url = uri("https://repo.destroystokyo.com/repository/maven-public//") } maven { url = uri("https://repo.destroystokyo.com/repository/maven-public//") }
maven { url = uri("http://repo.dmulloy2.net/content/groups/public/") } maven { url = uri("http://repo.dmulloy2.net/content/groups/public/") }
maven { url = uri("http://ci.ender.zone/plugin/repository/everything/") } maven { url = uri("http://ci.ender.zone/plugin/repository/everything/") }
maven { url = uri("https://repo.inventivetalent.org/content/groups/public/") } maven { url = uri("https://repo.inventivetalent.org/content/groups/public/")}
flatDir { dir(File("src/main/resources")) } flatDir {dir(File("src/main/resources"))}
} }
configurations.all { configurations.all {
@ -84,44 +81,6 @@ tasks.named<Jar>("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>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
dependencies { dependencies {
relocate("org.slf4j", "com.sk89q.worldedit.slf4j") relocate("org.slf4j", "com.sk89q.worldedit.slf4j")
@ -148,7 +107,3 @@ tasks.named<ShadowJar>("shadowJar") {
tasks.named("assemble").configure { tasks.named("assemble").configure {
dependsOn("shadowJar") dependsOn("shadowJar")
} }
tasks.named("dataContent").configure {
dependsOn("writeNewPom")
}

View File

@ -5,9 +5,6 @@ import com.mendhak.gradlecrowdin.UploadSourceFileTask
plugins { plugins {
id("java-library") id("java-library")
id("java")
id("maven")
id("maven-publish")
id("net.ltgt.apt-eclipse") id("net.ltgt.apt-eclipse")
id("net.ltgt.apt-idea") id("net.ltgt.apt-idea")
id("antlr") id("antlr")
@ -101,45 +98,6 @@ tasks.named<Copy>("processResources") {
"date" to "${rootProject.ext["date"]}") "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>("shadowJar") { tasks.named<ShadowJar>("shadowJar") {
dependencies { dependencies {
include(dependency("com.github.luben:zstd-jni:1.4.3-1")) include(dependency("com.github.luben:zstd-jni:1.4.3-1"))
@ -171,8 +129,3 @@ if (project.hasProperty(crowdinApiKey)) {
dependsOn("crowdinDownload") dependsOn("crowdinDownload")
} }
} }
tasks.named("dataContent").configure {
dependsOn("writeNewPom")
}