Entonez
/
KCauldronX
forked from xjboss/KCauldronX
1
0
Fork 0
Code Releases Activity

清空jar任务,删除bundleStub任务,修改packageBundle打包内容

kcx-1614
聪聪 2017-07-23 14:15:19 +08:00
parent a8a2073de8
commit e92055fbd2
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.gradle
View File

@ -197,10 +197,7 @@ tasks.packageUniversal {
manifest.attributes(generateManifest(true)) manifest.attributes(generateManifest(true))
} }
task jar(type: Jar, dependsOn: packageUniversal) { task jar(dependsOn: packageUniversal) {
destinationDir file("${buildDir}/distributions")
from zipTree(tasks.packageUniversal.archivePath)
manifest.attributes(generateManifest())
} }
tasks.createChangelog.onlyIf { false } tasks.createChangelog.onlyIf { false }
@ -218,6 +215,7 @@ task packageChangelog(type: CreateChangelog) {
*/ */
} }
/*
task bundleStub(type: Jar) { task bundleStub(type: Jar) {
classifier = 'stub' classifier = 'stub'
manifest.attributes([ manifest.attributes([
@ -225,9 +223,10 @@ task bundleStub(type: Jar) {
'Class-Path': "libraries/${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar" 'Class-Path': "libraries/${project.group.replace('.', '/')}/${project.name}/${project.version}/${project.name}-${project.version}.jar"
]) ])
} }
*/
task installBundle(type: InstallBundle, dependsOn: jar) { task installBundle(type: InstallBundle, dependsOn: packageUniversal) {
serverJar tasks.jar.archivePath serverJar tasks.packageUniversal.archivePath
bootstrapClasspath configurations.bootstrap bootstrapClasspath configurations.bootstrap
bootstrapMain 'pw.prok.bootstrap.Main' bootstrapMain 'pw.prok.bootstrap.Main'
} }
@ -235,14 +234,15 @@ task installBundle(type: InstallBundle, dependsOn: jar) {
task packageBundle(type: Zip, dependsOn: installBundle) { task packageBundle(type: Zip, dependsOn: installBundle) {
classifier = 'bundle' classifier = 'bundle'
from fileTree(installBundle.installLocation) from fileTree(installBundle.installLocation)
from bundleStub from packageUniversal
rename bundleStub.archiveName, 'KCauldron.jar' // from bundleStub
// rename bundleStub.archiveName, 'KCauldron.jar'
} }
task signJars(type: Sign, dependsOn: [packageChangelog, packageBundle, jar, 'generatePomFileForMavenPublication']) { task signJars(type: Sign, dependsOn: [packageChangelog, packageBundle, packageUniversal, 'generatePomFileForMavenPublication']) {
sign packageChangelog sign packageChangelog
sign packageBundle sign packageBundle
sign jar sign packageUniversal
} }
task signPom(type: Sign, dependsOn: 'generatePomFileForMavenPublication') { task signPom(type: Sign, dependsOn: 'generatePomFileForMavenPublication') {
@ -320,6 +320,9 @@ tasks.generateProjectCauldron {
} }
} }
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
dependencies { dependencies {
''') ''')
configurations.libraries.resolvedConfiguration.resolvedArtifacts.collect { it.moduleVersion.id }.each { module -> configurations.libraries.resolvedConfiguration.resolvedArtifacts.collect { it.moduleVersion.id }.each { module ->