Further minor cleanup from Gradle 5 change

This commit is contained in:
Kenzie Togami 2019-07-10 11:07:00 -07:00
parent 4874c314d0
commit 59c2a15cda
No known key found for this signature in database
GPG Key ID: 5D200B325E157A81
5 changed files with 21 additions and 39 deletions

View File

@ -1,25 +1,8 @@
buildscript {
repositories {
mavenCentral()
maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter()
}
configurations.all {
resolutionStrategy {
force 'commons-io:commons-io:2.4'
}
}
dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1'
}
}
plugins { plugins {
id 'net.minecrell.licenser' version '0.4.1' apply false id 'net.minecrell.licenser' version '0.4.1' apply false
id "org.ajoberstar.grgit" version "2.3.0" id "org.ajoberstar.grgit" version "3.1.1"
id "com.github.johnrengelman.shadow" version "5.1.0"
id "com.jfrog.artifactory" version "4.9.7"
} }
println """ println """
@ -109,7 +92,7 @@ configure(['core', 'bukkit', 'forge', 'sponge', 'fabric'].collect { project(":wo
} }
task javadocJar(type: Jar, dependsOn: javadoc) { task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc' getArchiveClassifier().set('javadoc')
from javadoc.destinationDir from javadoc.destinationDir
} }
@ -120,7 +103,7 @@ configure(['core', 'bukkit', 'forge', 'sponge', 'fabric'].collect { project(":wo
if (name == "worldedit-core" || name == "worldedit-bukkit") { if (name == "worldedit-core" || name == "worldedit-bukkit") {
task sourcesJar(type: Jar, dependsOn: classes) { task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources' getArchiveClassifier().set('sources')
from sourceSets.main.allSource from sourceSets.main.allSource
} }
@ -146,7 +129,7 @@ configure(['core', 'bukkit', 'forge', 'sponge', 'fabric'].collect { project(":wo
configure(['bukkit', 'forge', 'sponge', 'fabric'].collect { project(":worldedit-$it") }) { configure(['bukkit', 'forge', 'sponge', 'fabric'].collect { project(":worldedit-$it") }) {
shadowJar { shadowJar {
classifier 'dist' getArchiveClassifier().set('dist')
dependencies { dependencies {
include(project(":worldedit-libs:core")) include(project(":worldedit-libs:core"))
include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}")) include(project(":worldedit-libs:${project.name.replace("worldedit-", "")}"))

View File

@ -1,11 +0,0 @@
rootProject.name = 'worldedit'
include 'worldedit-libs'
['bukkit', 'core', 'forge', 'sponge', 'fabric'].forEach {
include "worldedit-libs:$it"
include "worldedit-$it"
}
include "worldedit-libs:core:ap"
include "worldedit-core:doctools"

11
settings.gradle.kts Normal file
View File

@ -0,0 +1,11 @@
rootProject.name = "worldedit"
include("worldedit-libs")
listOf("bukkit", "core", "forge", "sponge", "fabric").forEach {
include("worldedit-libs:$it")
include("worldedit-$it")
}
include("worldedit-libs:core:ap")
include("worldedit-core:doctools")

View File

@ -108,7 +108,7 @@ afterEvaluate {
task deobfJar(type: Jar) { task deobfJar(type: Jar) {
from sourceSets.main.output from sourceSets.main.output
classifier = 'dev' getArchiveClassifier().set("dev")
} }
artifacts { artifacts {

View File

@ -13,7 +13,7 @@ dependents of `-core` to compile and work with WorldEdit's API.
*/ */
configure(subprojects + project("core:ap")) { configure(subprojects + project("core:ap")) {
apply plugin: 'java' apply plugin: 'java-base'
apply plugin: 'maven' apply plugin: 'maven'
apply plugin: 'com.github.johnrengelman.shadow' apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'com.jfrog.artifactory' apply plugin: 'com.jfrog.artifactory'
@ -24,8 +24,7 @@ configure(subprojects + project("core:ap")) {
group = rootProject.group + ".worldedit-libs" group = rootProject.group + ".worldedit-libs"
tasks.replace("jar", ShadowJar) tasks.register("jar", ShadowJar) {
tasks.withType(ShadowJar).named("jar").configure {
configurations = [project.configurations.shade] configurations = [project.configurations.shade]
classifier = "" classifier = ""
@ -79,7 +78,7 @@ configure(subprojects + project("core:ap")) {
} }
} }
tasks.withType(Upload).named("install").configure { tasks.register("install", Upload) {
configuration = configurations.archives configuration = configurations.archives
repositories.mavenInstaller { repositories.mavenInstaller {
pom.version = project.version pom.version = project.version