Fix shadow, remove extra source jar in forge

This commit is contained in:
Kenzie Togami 2016-01-12 15:32:58 -08:00
parent e91859130c
commit e19820e04d
2 changed files with 16 additions and 9 deletions

View File

@ -75,11 +75,6 @@ subprojects {
} }
} }
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) { task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc' classifier = 'javadoc'
from javadoc.destinationDir from javadoc.destinationDir
@ -87,13 +82,23 @@ subprojects {
artifacts { artifacts {
archives jar archives jar
archives sourcesJar
archives javadocJar archives javadocJar
} }
if (!name.equals('worldedit-forge')) {
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
}
artifacts {
archives sourcesJar
}
build.dependsOn(sourcesJar)
}
build.dependsOn(checkstyleMain) build.dependsOn(checkstyleMain)
build.dependsOn(checkstyleTest) build.dependsOn(checkstyleTest)
build.dependsOn(sourcesJar)
build.dependsOn(javadocJar) build.dependsOn(javadocJar)
shadowJar { shadowJar {

View File

@ -67,7 +67,9 @@ shadowJar {
} }
reobf { reobf {
shadowJar shadowJar {
mappingType = 'SEARGE'
}
} }
task deobfJar(type: Jar) { task deobfJar(type: Jar) {
@ -79,4 +81,4 @@ artifacts {
archives deobfJar archives deobfJar
} }
build.dependsOn(shadowJar) build.dependsOn(reobfShadowJar)