From e92055fbd2d166cd1bf3cf18640d8b9185fa6da1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=81=AA=E8=81=AA?= <178666380@qq.com>
Date: Sun, 23 Jul 2017 14:15:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E7=A9=BAjar=E4=BB=BB=E5=8A=A1,?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4bundleStub=E4=BB=BB=E5=8A=A1,=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9packageBundle=E6=89=93=E5=8C=85=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/build.gradle b/build.gradle
index 270e2cf..86cfbd6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -197,10 +197,7 @@ tasks.packageUniversal {
     manifest.attributes(generateManifest(true))
 }
 
-task jar(type: Jar, dependsOn: packageUniversal) {
-    destinationDir file("${buildDir}/distributions")
-    from zipTree(tasks.packageUniversal.archivePath)
-    manifest.attributes(generateManifest())
+task jar(dependsOn: packageUniversal) {
 }
 
 tasks.createChangelog.onlyIf { false }
@@ -218,6 +215,7 @@ task packageChangelog(type: CreateChangelog) {
     */
 }
 
+/*
 task bundleStub(type: Jar) {
     classifier = 'stub'
     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"
     ])
 }
+*/
 
-task installBundle(type: InstallBundle, dependsOn: jar) {
-    serverJar tasks.jar.archivePath
+task installBundle(type: InstallBundle, dependsOn: packageUniversal) {
+    serverJar tasks.packageUniversal.archivePath
     bootstrapClasspath configurations.bootstrap
     bootstrapMain 'pw.prok.bootstrap.Main'
 }
@@ -235,14 +234,15 @@ task installBundle(type: InstallBundle, dependsOn: jar) {
 task packageBundle(type: Zip, dependsOn: installBundle) {
     classifier = 'bundle'
     from fileTree(installBundle.installLocation)
-    from bundleStub
-    rename bundleStub.archiveName, 'KCauldron.jar'
+    from packageUniversal
+    // 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 packageBundle
-    sign jar
+    sign packageUniversal
 }
 
 task signPom(type: Sign, dependsOn: 'generatePomFileForMavenPublication') {
@@ -320,6 +320,9 @@ tasks.generateProjectCauldron {
         }
         
     }
+
+    [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
+
     dependencies {
     ''')
         configurations.libraries.resolvedConfiguration.resolvedArtifacts.collect { it.moduleVersion.id }.each { module ->