From 6b3f341ab5b2993bdb0bc0efffd18545dde2acf2 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Fri, 24 May 2019 17:31:42 +0300
Subject: [PATCH] Build: Publish jcabi-aether-1.0-SNAPSHOT to
 kotlin-dependencies as 1.0-dev-3

This allows to remove dependency on snapshot repository
https://oss.sonatype.org/content/repositories/snapshots
---
 dependencies/jcabi-aether/build.gradle.kts    | 52 +++++++++++++++++++
 dependencies/jcabi-aether/settings.gradle     |  0
 dependencies/publishing.gradle.kts            |  4 +-
 .../tools/kotlin-script-util/build.gradle.kts |  8 +--
 4 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 dependencies/jcabi-aether/build.gradle.kts
 create mode 100644 dependencies/jcabi-aether/settings.gradle

diff --git a/dependencies/jcabi-aether/build.gradle.kts b/dependencies/jcabi-aether/build.gradle.kts
new file mode 100644
index 00000000000..a0b0885a750
--- /dev/null
+++ b/dependencies/jcabi-aether/build.gradle.kts
@@ -0,0 +1,52 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    id("com.jfrog.bintray") version "1.8.4"
+}
+
+group = "org.jetbrains.kotlin"
+version = "1.0-dev-3"
+
+repositories {
+    mavenCentral()
+    maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
+}
+
+val aether by configurations.creating
+dependencies {
+    aether("com.jcabi:jcabi-aether:1.0-SNAPSHOT")
+}
+
+val jar = tasks.named<Jar>("jar") {
+    from(provider {
+        provider {
+            zipTree(
+                aether.resolvedConfiguration
+                    .firstLevelModuleDependencies
+                    .single()
+                    .moduleArtifacts
+                    .single()
+                    .file
+            )
+        }
+    })
+}
+
+apply(from="../publishing.gradle.kts")
+
+configure<PublishingExtension> {
+    publications.getByName<MavenPublication>("maven") {
+        pom.withXml {
+            asNode().appendNode("dependencies").apply {
+                aether.resolvedConfiguration.firstLevelModuleDependencies.single().children.forEach {
+                    appendNode("dependency").apply {
+                        appendNode("groupId", it.moduleGroup)
+                        appendNode("artifactId", it.moduleName)
+                        appendNode("version", it.moduleVersion)
+                        appendNode("scope", "compile")
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/dependencies/jcabi-aether/settings.gradle b/dependencies/jcabi-aether/settings.gradle
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dependencies/publishing.gradle.kts b/dependencies/publishing.gradle.kts
index ff9b8cf28e5..99278f17b1a 100644
--- a/dependencies/publishing.gradle.kts
+++ b/dependencies/publishing.gradle.kts
@@ -30,8 +30,8 @@ configure<PublishingExtension> {
 }
 
 configure<BintrayExtension> {
-    user = extra["bintray.user"] as String
-    key = extra["bintray.apikey"] as String
+    user = findProperty("bintray.user") as String?
+    key = findProperty("bintray.apikey") as String?
 
     setPublications("maven")
 
diff --git a/libraries/tools/kotlin-script-util/build.gradle.kts b/libraries/tools/kotlin-script-util/build.gradle.kts
index c48a6033cde..c0f8d975fa4 100644
--- a/libraries/tools/kotlin-script-util/build.gradle.kts
+++ b/libraries/tools/kotlin-script-util/build.gradle.kts
@@ -6,10 +6,6 @@ plugins {
     id("jps-compatible")
 }
 
-repositories {
-    maven(url = "https://oss.sonatype.org/content/repositories/snapshots") // for jcabi-aether:1.0-SNAPSHOT
-}
-
 dependencies {
     compile(kotlinStdlib())
     compile(project(":kotlin-script-runtime"))
@@ -19,7 +15,7 @@ dependencies {
     compileOnly(project(":daemon-common"))
     compileOnly(project(":kotlin-scripting-compiler"))
     compile(projectRuntimeJar(":kotlin-daemon-client"))
-    compileOnly("com.jcabi:jcabi-aether:1.0-SNAPSHOT")
+    compileOnly("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     compileOnly("org.sonatype.aether:aether-api:1.13.1")
     compileOnly("org.apache.maven:maven-core:3.0.3")
     testCompileOnly(project(":compiler:cli"))
@@ -28,7 +24,7 @@ dependencies {
     testCompile(commonDep("junit:junit"))
     testCompile(project(":kotlin-scripting-compiler"))
     testRuntimeOnly(projectRuntimeJar(":kotlin-compiler"))
-    testRuntime("com.jcabi:jcabi-aether:1.0-SNAPSHOT")
+    testRuntime("org.jetbrains.kotlin:jcabi-aether:1.0-dev-3")
     testRuntime("org.sonatype.aether:aether-api:1.13.1")
     testRuntime("org.apache.maven:maven-core:3.0.3")
     compileOnly(intellijDep()) { includeJars("openapi", "util") }