From 215ccc5ef4ddb6aac123857a8ac5d1f049cb03c1 Mon Sep 17 00:00:00 2001
From: Nikolay Kochetkov <nkochetkov@jetsmarter.com>
Date: Wed, 13 Sep 2023 16:46:31 +0200
Subject: [PATCH] Publishing fix

---
 cache/build.gradle.kts      | 13 +++++++++----
 common/build.gradle.kts     | 13 +++++++++----
 coroutines/build.gradle.kts | 13 +++++++++----
 lce/build.gradle.kts        | 13 +++++++++----
 utils/build.gradle.kts      | 13 +++++++++----
 5 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/cache/build.gradle.kts b/cache/build.gradle.kts
index d0da92b2..f45e95fc 100644
--- a/cache/build.gradle.kts
+++ b/cache/build.gradle.kts
@@ -150,9 +150,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
+}
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
 }
\ No newline at end of file
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 346e957e..649fef9f 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -143,9 +143,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
+}
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
 }
\ No newline at end of file
diff --git a/coroutines/build.gradle.kts b/coroutines/build.gradle.kts
index 37216ee8..7971019f 100644
--- a/coroutines/build.gradle.kts
+++ b/coroutines/build.gradle.kts
@@ -153,9 +153,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
+}
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
 }
\ No newline at end of file
diff --git a/lce/build.gradle.kts b/lce/build.gradle.kts
index b75ea68f..b491fb1e 100644
--- a/lce/build.gradle.kts
+++ b/lce/build.gradle.kts
@@ -148,9 +148,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
+}
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
 }
\ No newline at end of file
diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts
index 34723b46..59705112 100644
--- a/utils/build.gradle.kts
+++ b/utils/build.gradle.kts
@@ -136,9 +136,14 @@ publishing {
             }
         }
     }
+}
 
-    signing {
-        useInMemoryPgpKeys(signingKey, signingPassword)
-        sign(publishing.publications)
-    }
+signing {
+    useInMemoryPgpKeys(signingKey, signingPassword)
+    sign(publishing.publications)
+}
+
+val signingTasks = tasks.withType<Sign>()
+tasks.withType<AbstractPublishToMaven>().configureEach {
+    dependsOn(signingTasks)
 }
\ No newline at end of file