From 8beabcda274c913be804dbbdedb68f9f577b3992 Mon Sep 17 00:00:00 2001 From: Tang Cheng Date: Fri, 12 Jul 2019 11:48:01 +0800 Subject: [PATCH] =?utf8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=AF=91=E9=97=AE?= =?utf8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build.gradle | 4 ++++ payapi/build.gradle | 4 ++-- ynrcc-agent/build.gradle | 19 ++----------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index 188a626e..58926496 100644 --- a/build.gradle +++ b/build.gradle @@ -19,4 +19,8 @@ subprojects { version = '1.0' } +bootJar { + enabled = false +} + group = 'com.supwisdom' \ No newline at end of file diff --git a/payapi/build.gradle b/payapi/build.gradle index 123ad8b5..18f9d7f8 100644 --- a/payapi/build.gradle +++ b/payapi/build.gradle @@ -16,12 +16,12 @@ payapiVersion = gitVersion() group = rootProject.group version = '1' sourceCompatibility = jdkVersion -def startClass = 'com.supwisdom.dlpay.PayApiApplicationKt' +def payapiStartClass = 'com.supwisdom.dlpay.PayApiApplicationKt' println("Build version: $payapiVersion") bootJar { - mainClassName = startClass + mainClassName = payapiStartClass manifest { attributes('Payapi-Version': payapiVersion) } diff --git a/ynrcc-agent/build.gradle b/ynrcc-agent/build.gradle index d2ef07c0..acd4a895 100644 --- a/ynrcc-agent/build.gradle +++ b/ynrcc-agent/build.gradle @@ -1,8 +1,6 @@ plugins { id 'java' id 'org.springframework.boot' - id 'org.jetbrains.kotlin.jvm' - id 'org.jetbrains.kotlin.plugin.spring' id "com.palantir.git-version" id 'com.palantir.docker' } @@ -15,12 +13,12 @@ def ynrccVersion = gitVersion() group = rootProject.group version = '1' sourceCompatibility = jdkVersion -def startClass = 'com.supwisdom.agent.YnrccAgentApplication' +def ynrccStartClass = 'com.supwisdom.agent.YnrccAgentApplication' println("Build version: $ynrccVersion") bootJar { - mainClassName = startClass + mainClassName = ynrccStartClass manifest { attributes('YnrccAgent-Version': ynrccVersion) } @@ -58,16 +56,3 @@ dependencies { testImplementation 'org.hamcrest:hamcrest:2.1' } -compileKotlin { - kotlinOptions { - freeCompilerArgs = ['-Xjsr305=strict'] - jvmTarget = jdkVersion - } -} - -compileTestKotlin { - kotlinOptions { - freeCompilerArgs = ['-Xjsr305=strict'] - jvmTarget = jdkVersion - } -} -- 2.17.1