From fd5f8372994aab3619015195e647abdd9e1e03a6 Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Wed, 29 Mar 2017 22:37:03 +0700
Subject: [PATCH] Use download.jetbrains.com for user dependency downloading

---
 backend.native/konan.properties                       |  2 +-
 dependencies/build.gradle                             | 10 ++++++----
 tools/helpers/src/main/kotlin/DependencyDownloader.kt |  5 +----
 tools/helpers/src/main/kotlin/Helper0.kt              |  6 +++++-
 tools/helpers/src/main/kotlin/main.kt                 |  5 +++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/backend.native/konan.properties b/backend.native/konan.properties
index 1a48ee003c9..97361ad731e 100644
--- a/backend.native/konan.properties
+++ b/backend.native/konan.properties
@@ -1,7 +1,7 @@
 
 # TODO: Do we need a $variable substitution mechanism here?
 llvmVersion = 3.9.0
-dependenciesUrl = https://jetbrains.bintray.com/kotlin-native-dependencies
+dependenciesUrl = http://download.jetbrains.com/kotlin/native
 
 # macbook
 arch.osx = x86_64
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index e77e03bc429..cc197072900 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -26,7 +26,11 @@ abstract class NativeDep extends DefaultTask {
     abstract String getFileName()
 
     protected String getUrl() {
-        return "https://jetbrains.bintray.com/kotlin-native-dependencies/$fileName"
+        return "$baseUrl/$fileName"
+    }
+
+    protected String getBaseUrl() {
+        return "https://jetbrains.bintray.com/kotlin-native-dependencies"
     }
 
     protected File getBaseOutDir() {
@@ -88,9 +92,7 @@ class HelperNativeDep extends TgzNativeDep {
             main = "org.jetbrains.kotlin.konan.MainKt"
             classpath += project.findProject(':tools:helpers').getConfigurations().getByName("runtime")
             classpath += project.findProject(':tools:helpers').getConfigurations().getByName("runtime").artifacts.files
-                    args baseOutDir.canonicalPath,
-                    project.findProject(":backend.native").file("konan.properties").canonicalPath,
-                    baseName
+            args baseOutDir.canonicalPath, baseUrl, baseName
         }
     }
 }
diff --git a/tools/helpers/src/main/kotlin/DependencyDownloader.kt b/tools/helpers/src/main/kotlin/DependencyDownloader.kt
index 6b20e973616..77efd5b15b2 100644
--- a/tools/helpers/src/main/kotlin/DependencyDownloader.kt
+++ b/tools/helpers/src/main/kotlin/DependencyDownloader.kt
@@ -6,7 +6,7 @@ import java.util.Properties
 import kotlin.concurrent.thread
 
 // TODO: Try to use some dependency management system (Ivy?)
-class DependencyDownloader(dependenciesRoot: File, val properties: Properties, val dependencies: List<String>) {
+class DependencyDownloader(dependenciesRoot: File, val dependenciesUrl: String, val dependencies: List<String>) {
 
     val dependenciesDirectory = dependenciesRoot.apply { mkdirs() }
     val cacheDirectory = System.getProperty("user.home")?.let {
@@ -15,9 +15,6 @@ class DependencyDownloader(dependenciesRoot: File, val properties: Properties, v
 
     val lockFile = File(cacheDirectory, ".lock").apply { if (!exists()) createNewFile() }
 
-    val dependenciesUrl: String =
-            properties.getProperty("dependenciesUrl", "https://jetbrains.bintray.com/kotlin-native-dependencies")
-
     var isInfoShown = false
 
     class DependencyFile(directory: File, fileName: String) {
diff --git a/tools/helpers/src/main/kotlin/Helper0.kt b/tools/helpers/src/main/kotlin/Helper0.kt
index 589dfc11993..58f4a44157f 100644
--- a/tools/helpers/src/main/kotlin/Helper0.kt
+++ b/tools/helpers/src/main/kotlin/Helper0.kt
@@ -8,6 +8,10 @@ class Helper0(val dependenciesDir: String,
               val dependencies: List<String>): Runnable {
 
     override fun run() {
-        DependencyDownloader(File(dependenciesDir), properties, dependencies).run()
+        DependencyDownloader(
+                File(dependenciesDir),
+                properties.getProperty("dependenciesUrl", "https://download.jetbrains.com/kotlin/native"),
+                dependencies
+        ).run()
     }
 }
\ No newline at end of file
diff --git a/tools/helpers/src/main/kotlin/main.kt b/tools/helpers/src/main/kotlin/main.kt
index 24e49b61efb..7a3de7faf4a 100644
--- a/tools/helpers/src/main/kotlin/main.kt
+++ b/tools/helpers/src/main/kotlin/main.kt
@@ -4,12 +4,13 @@ import java.io.File
 import java.util.*
 
 // TODO: Add command line keys
+// Args: dependencies directory, dependencies url, dependencies list
 fun main(args: Array<String>) {
     if (args.size < 2) {
         System.exit(1)
     }
     val dependenciesDir = File(args[0])
-    val properties = Properties().apply { load(File(args[1]).inputStream()) }
+    val dependenciesUrl = args[1]
     val dependencies = List<String>(args.size - 2) { args[2 + it] }
-    DependencyDownloader(dependenciesDir, properties, dependencies).run()
+    DependencyDownloader(dependenciesDir, dependenciesUrl, dependencies).run()
 }