From aa79c1bcf6d35b709d5f81a73782d911cf5341d5 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Thu, 23 May 2019 23:37:30 +0300
Subject: [PATCH] Build: Extract publication for dependencies to
 publishing.gradle.kts

---
 dependencies/android-dx/build.gradle.kts | 31 ++---------------
 dependencies/publishing.gradle.kts       | 43 ++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 28 deletions(-)
 create mode 100644 dependencies/publishing.gradle.kts

diff --git a/dependencies/android-dx/build.gradle.kts b/dependencies/android-dx/build.gradle.kts
index 6ab3a94c4b3..0a0603752e0 100644
--- a/dependencies/android-dx/build.gradle.kts
+++ b/dependencies/android-dx/build.gradle.kts
@@ -94,32 +94,7 @@ val dxArtifact = artifacts.add("default", unzipDxJar.outputs.files.singleFile) {
     builtBy(unzipDxJar)
 }
 
-artifacts.add("default", prepareDxSourcesJar)
+artifacts.add("archives", dxArtifact)
+artifacts.add("archives", prepareDxSourcesJar)
 
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            artifact(dxArtifact)
-            artifact(prepareDxSourcesJar)
-        }
-    }
-
-    repositories {
-        maven {
-            url = uri("${rootProject.buildDir}/internal/repo")
-        }
-    }
-}
-
-bintray {
-    user = extra["bintray.user"] as String
-    key = extra["bintray.key"] as String
-
-    setPublications("maven")
-
-    pkg.apply {
-        repo = "kotlin-dependencies"
-        name = project.name
-        userOrg = "kotlin"
-    }
-}
\ No newline at end of file
+apply(from="../publishing.gradle.kts")
diff --git a/dependencies/publishing.gradle.kts b/dependencies/publishing.gradle.kts
new file mode 100644
index 00000000000..ff9b8cf28e5
--- /dev/null
+++ b/dependencies/publishing.gradle.kts
@@ -0,0 +1,43 @@
+import com.jfrog.bintray.gradle.BintrayExtension
+
+buildscript {
+    repositories {
+        maven("https://plugins.gradle.org/m2")
+    }
+
+    dependencies {
+        classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")
+    }
+}
+
+apply(plugin = "maven-publish")
+apply(plugin = "com.jfrog.bintray")
+
+val archives by configurations
+
+configure<PublishingExtension> {
+    publications {
+        create<MavenPublication>("maven") {
+            setArtifacts(archives.artifacts)
+        }
+    }
+
+    repositories {
+        maven {
+            url = uri("${rootProject.buildDir}/internal/repo")
+        }
+    }
+}
+
+configure<BintrayExtension> {
+    user = extra["bintray.user"] as String
+    key = extra["bintray.apikey"] as String
+
+    setPublications("maven")
+
+    pkg.apply {
+        repo = "kotlin-dependencies"
+        name = project.name
+        userOrg = "kotlin"
+    }
+}
\ No newline at end of file