Fix publication to bintray code.

pdvrieze · Nov 3, 2018 · 7eb66e4 · 7eb66e4
1 parent 98ea2eb
commit 7eb66e4
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -147,18 +147,25 @@ repositories {
     jcenter()
 }
 
-extensions.configure<BintrayExtension>("bintray") {
-    val user: String?
-    val key: String?
+publishing.publications.getByName<MavenPublication>("kotlinMultiplatform") {
+    groupId="net.devrieze"
+    artifactId="xmlutil"
+}
 
+extensions.configure<BintrayExtension>("bintray") {
     if (rootProject.hasProperty("bintrayUser")) {
         user = rootProject.property("bintrayUser") as String?
         key = rootProject.property("bintrayApiKey") as String?
-    } else {
-        user = null
-        key = null
     }
-    setPublications(*publishing.publications.map { it.name }.filter { "js" in it || "metadata" in it }.toTypedArray())
+
+    val pubs = publishing.publications
+        .filter { it.name != "metadata" }
+        .map { it.name }
+        .apply { forEach{ logger.lifecycle("Registering publication \"${it}\" to Bintray") }}
+        .toTypedArray()
+
+
+    setPublications(*pubs)
 
     pkg(closureOf<BintrayExtension.PackageConfig> {
         repo = "maven"

diff --git a/serialization/build.gradle.kts b/serialization/build.gradle.kts
@@ -249,18 +249,27 @@ repositories {
     jcenter()
 }
 
-extensions.configure<BintrayExtension>("bintray") {
-    val user: String?
-    val key: String?
+publishing.publications.getByName<MavenPublication>("kotlinMultiplatform") {
+    groupId="net.devrieze"
+    artifactId="xmlutil-serialization"
+}
 
+extensions.configure<BintrayExtension>("bintray") {
     if (rootProject.hasProperty("bintrayUser")) {
         user = rootProject.property("bintrayUser") as String?
         key = rootProject.property("bintrayApiKey") as String?
-    } else {
-        user = null
-        key = null
     }
-    setPublications(*publishing.publications.map { it.name }.filter { "js" in it || "metadata" in it }.toTypedArray())
+
+    val pubs = publishing.publications
+        .filter { it.name != "metadata" && it.name != "js" }
+        .map { it.name }
+        .apply { forEach{ logger.lifecycle("Registering publication \"${it}\" to Bintray") }}
+        .toTypedArray()
+
+
+    setPublications(*pubs)
+
+    setPublications(*publishing.publications.map { it.name }.filter { "js" !in it && "metadata" !in it }.toTypedArray())
 
     pkg(closureOf<BintrayExtension.PackageConfig> {
         repo = "maven"