From ee46f4fee172efbc959dd8d7d7fdb6b7a52e5f5f Mon Sep 17 00:00:00 2001 From: mezz Date: Sat, 8 Aug 2015 11:13:05 -0700 Subject: [PATCH] Add sources jar to maven, try to clean up gradle --- build.gradle | 102 +++++++++++++++------------------------------------ 1 file changed, 30 insertions(+), 72 deletions(-) diff --git a/build.gradle b/build.gradle index 52424bc14..d4bfef238 100755 --- a/build.gradle +++ b/build.gradle @@ -172,120 +172,75 @@ jar { } } -task mainJarSigned ( type: Jar, dependsOn: 'reobf' ) { - from (zipTree(jar.getArchivePath())) { - exclude '**/api/**' - exclude '**/codechicken/**' - exclude '**/uristqwerty/**' - } - - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - destinationDir = file("build/tmp") - archiveName = "signed.jar" - - doLast { - if (project.hasProperty('signingKeystore')) { - ant.signjar(jar: getArchivePath(), - alias: signingAlias, - keystore: signingKeystore, - storepass: signingStorepass) - } else { - println 'Signing disabled, gradle.properties is missing.' - } - } -} - -task mainJar ( type: Zip, dependsOn: mainJarSigned ) { - from (zipTree(mainJarSigned.getArchivePath())) { - include '**' - } - +task mainJar(type: Jar, dependsOn: 'reobf') { from (zipTree(jar.getArchivePath())) { include '**' exclude '**/codechicken/**' exclude '**/uristqwerty/**' } - duplicatesStrategy = DuplicatesStrategy.EXCLUDE destinationDir = file(dirDest) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE includeEmptyDirs = false - extension = 'jar' } -task devJarSigned ( type: Jar, dependsOn: 'classes' ) { - from(sourceSets.main.output) { - exclude '**/api/**' +task devJar(type: Jar, dependsOn: 'classes') { + from (sourceSets.main.output) { exclude '**/codechicken/**' exclude '**/uristqwerty/**' } - destinationDir = file("build/tmp") - archiveName = "signed-dev.jar" - - doLast { - if (project.hasProperty('signingKeystore')) { - ant.signjar(jar: getArchivePath(), - alias: signingAlias, - keystore: signingKeystore, - storepass: signingStorepass) - } else { - println 'Signing disabled, gradle.properties is missing.' - } - } -} - -task devJar ( type: Zip, dependsOn: devJarSigned ) { - from (zipTree(devJarSigned.getArchivePath())) { - include '**' - } - - from(sourceSets.main.allSource) { - include '**' - exclude '**/codechicken/**' - exclude '**/uristqwerty/**' - } - - from(sourceSets.main.output) { - include '**' - exclude '**/codechicken/**' - exclude '**/uristqwerty/**' - } - - duplicatesStrategy = DuplicatesStrategy.EXCLUDE destinationDir = file(dirDest) - extension = 'jar' + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + includeEmptyDirs = false classifier = 'dev' } task apiJar(type: Jar, dependsOn: 'classes') { from project.apiForestry - - from (sourceSets.main.output) { + from(sourceSets.main.output) { include 'forestry/api/**' } - + destinationDir = file(dirDest) - extension = 'jar' + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + includeEmptyDirs = false + classifier = 'api' } +task sourceJar(type: Jar, dependsOn: 'classes') { + from (sourceSets.main.allSource) { + exclude '**/codechicken/**' + exclude '**/uristqwerty/**' + } + + destinationDir = file(dirDest) + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + includeEmptyDirs = false + + classifier = 'sources' +} + task releaseInit << { println '*************************************************************' println 'This build will be version: ' + rootProject.version println '*************************************************************' } -task release (dependsOn: [releaseInit, apiJar, devJar, mainJar]) { +task release (dependsOn: [releaseInit, mainJar, apiJar, devJar, sourceJar]) { } mainJar.shouldRunAfter releaseInit devJar.shouldRunAfter releaseInit apiJar.shouldRunAfter releaseInit +sourceJar.shouldRunAfter releaseInit artifacts { archives apiJar archives devJar + archives sourceJar } uploadArchives { @@ -300,6 +255,9 @@ uploadArchives { addFilter('dev') { artifact, file -> file == devJar.archivePath } + addFilter('source') { artifact, file -> + file == sourceJar.archivePath + } } } else { println 'Archives upload disabled, gradle.properties is missing.'