From d253c28b43f06283bd89029d094f89072b80d931 Mon Sep 17 00:00:00 2001
From: Michael Zhang <yidongnan@gmail.com>
Date: Sat, 6 Jun 2020 16:06:41 +0800
Subject: [PATCH] Modify deploy.gradle for github actions Use gpg agent for
 sign file

---
 build.gradle  |  1 -
 deploy.gradle | 28 ++++++++++++++--------------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8c4de3857..54199a857 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,6 @@ buildscript {
 
         springBootVersion = '2.2.7.RELEASE'
         springCloudVersion = 'Hoxton.SR4'
-        springDependencyManagementVersion = '1.0.9.RELEASE'
         springCloudAlibabaNacosVersion = '2.2.1.RELEASE'
         springSecurityOAuthVersion = '2.4.1.RELEASE'
 
diff --git a/deploy.gradle b/deploy.gradle
index 6f820797e..788cc3c3f 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -1,21 +1,8 @@
 apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
-gradle.taskGraph.whenReady { taskGraph ->
-    if (taskGraph.allTasks.any { it instanceof Sign } && project.ext.isReleaseVersion) {
-        def id = System.getenv('GPG_ID')
-        def file = '/home/travis/.gnupg/secring.gpg'
-        def password = System.getenv('GPG_PASSWORD')
-
-        allprojects { ext."signing.keyId" = id }
-        allprojects { ext."signing.secretKeyRingFile" = file }
-        allprojects { ext."signing.password" = password }
-    }
-}
-
 ext {
     isReleaseVersion = !(projectVersion =~ /-SNAPSHOT$/)
-    isNeedSign = System.getenv('GPG_ID') && isReleaseVersion
 }
 
 task sourcesJar(type: Jar) {
@@ -67,6 +54,15 @@ publishing {
                     url = 'https://github.com/yidongnan/grpc-spring-boot-starter'
                 }
             }
+
+            versionMapping {
+                usage('java-api') {
+                    fromResolutionOf('runtimeClasspath')
+                }
+                usage('java-runtime') {
+                    fromResolutionResult()
+                }
+            }
         }
     }
     repositories {
@@ -83,8 +79,12 @@ publishing {
         }
     }
 
+    tasks.withType(Sign) {
+        onlyIf { project.ext.isReleaseVersion && gradle.taskGraph.hasTask("publish") }
+    }
+
     signing {
-        required { project.ext.isNeedSign }
+        useGpgCmd()
         sign publishing.publications.mavenJava
     }