[build] cache repository fix

buildSrc/build.gradle.kts

@@ -30,8 +30,6 @@ buildscript {
     }
 }
 
-val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() == true
-
 logger.info("buildSrcKotlinVersion: " + extra["bootstrapKotlinVersion"])
 logger.info("buildSrc kotlin compiler version: " + org.jetbrains.kotlin.config.KotlinCompilerVersion.VERSION)
 logger.info("buildSrc stdlib version: " + KotlinVersion.CURRENT)

gradle/cacheRedirector.gradle.kts

@@ -77,7 +77,8 @@ val mirroredUrls = listOf(
     "https://www.python.org/ftp",
     "https://www.jetbrains.com/intellij-repository/nightly",
     "https://www.jetbrains.com/intellij-repository/releases",
-    "https://www.jetbrains.com/intellij-repository/snapshots"
+    "https://www.jetbrains.com/intellij-repository/snapshots",
+    "https://kotlin.bintray.com/kotlinx"
 )
 
 val aliases = mapOf(

kotlin-native/backend.native/tests/build.gradle

@@ -7,6 +7,7 @@ import org.jetbrains.kotlin.gradle.plugin.tasks.KonanCompileNativeBinary
 import org.jetbrains.kotlin.*
 import org.jetbrains.kotlin.konan.target.Family
 import org.jetbrains.kotlin.konan.target.KonanTarget
+import org.jetbrains.kotlin.UtilsKt
 
 import java.nio.file.Paths
 
@@ -14,11 +15,12 @@ import static org.jetbrains.kotlin.konan.target.Architecture.*
 
 buildscript {
     repositories {
+        if (UtilsKt.getCacheRedirectorEnabled(project))
+            maven { url 'https://cache-redirector.jetbrains.com/maven-central'}
+        else
+            mavenCentral()
+
         maven {
-            url 'https://cache-redirector.jetbrains.com/maven-central'
-        }
-        mavenCentral()
-	    maven {
             url project.bootstrapKotlinRepo
         }
     }

kotlin-native/build-tools/src/main/kotlin/org/jetbrains/kotlin/Utils.kt

@@ -52,6 +52,7 @@ import org.gradle.nativeplatform.toolchain.internal.tools.GccCommandLineToolConf
 import org.gradle.nativeplatform.toolchain.internal.tools.ToolSearchPath
 import org.gradle.process.internal.ExecActionFactory
 import java.io.ByteArrayOutputStream
+import java.net.URI
 
 //region Project properties.
 
@@ -82,6 +83,15 @@ val Project.testOutputFramework
 val Project.testOutputExternal
     get() = (findProperty("testOutputExternal") as File).toString()
 
+val Project.cacheRedirectorEnabled
+    get() = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false
+
+fun Project.redirectIfEnabled(url: String):String = if (cacheRedirectorEnabled) {
+    val base = URL(url)
+    "https://cache-redirector.jetbrains.com/${base.host}/${base.path}"
+} else
+    url
+
 val validPropertiesNames = listOf("kotlin.native.home",
                                   "org.jetbrains.kotlin.native.home",
                                   "konan.home")

kotlin-native/build.gradle

@@ -33,11 +33,16 @@ buildscript {
     apply from: "gradle/kotlinGradlePlugin.gradle"
 
     repositories {
-        maven { url "https://kotlin.bintray.com/kotlinx" }
+        if (UtilsKt.getCacheRedirectorEnabled(project)) {
-        maven { url "https://cache-redirector.jetbrains.com/maven-central" }
+            maven { url "https://cache-redirector.jetbrains.com/dl.kotlin.bintray.com/kotlinx" }
-        mavenCentral()
+            maven { url "https://cache-redirector.jetbrains.com/maven-central" }
-        maven { url "https://cache-redirector.jetbrains.com/jcenter" }
+            maven { url "https://cache-redirector.jetbrains.com/jcenter" }
-        jcenter()
+        }
+        else {
+            maven { url "https://kotlin.bintray.com/kotlinx" }
+            mavenCentral()
+            jcenter()
+        }
     }
 
     dependencies {
@@ -97,10 +102,10 @@ ext {
 allprojects {
     buildscript {
         repositories {
-            maven {
+            if (UtilsKt.getCacheRedirectorEnabled(project))
-                url 'https://cache-redirector.jetbrains.com/jcenter'
+                maven { url 'https://cache-redirector.jetbrains.com/jcenter' }
-            }
+            else
-            jcenter()
+                jcenter()
         }
     }
     if (path != ":kotlin-native:dependencies") {
@@ -108,10 +113,10 @@ allprojects {
     }
 
     repositories {
-        maven {
+        if (UtilsKt.getCacheRedirectorEnabled(project))
-            url 'https://cache-redirector.jetbrains.com/maven-central'
+            maven { url 'https://cache-redirector.jetbrains.com/maven-central' }
-        }
+        else
-        mavenCentral()
+            mavenCentral()
         maven {
             url project.bootstrapKotlinRepo
         }

kotlin-native/endorsedLibraries/build.gradle

@@ -1,11 +1,14 @@
 import org.jetbrains.kotlin.UtilsKt
 import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask
 import org.jetbrains.kotlin.EndorsedLibraryInfo
+import org.jetbrains.kotlin.UtilsKt
 
 buildscript {
     repositories {
-        maven { url 'https://cache-redirector.jetbrains.com/jcenter' }
+        if (UtilsKt.getCacheRedirectorEnabled(project))
-        jcenter()
+            maven { url 'https://cache-redirector.jetbrains.com/jcenter' }
+        else
+            jcenter()
     }
 }
 

kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle

@@ -4,10 +4,10 @@ import org.jetbrains.kotlin.*
 
 buildscript {
     repositories {
-        maven {
+        if (UtilsKt.getCacheRedirectorEnabled(project))
-            url 'https://cache-redirector.jetbrains.com/jcenter'
+            maven { url 'https://cache-redirector.jetbrains.com/jcenter' }
-        }
+        else
-        jcenter()
+            jcenter()
         maven {
             url project.bootstrapKotlinRepo
         }
@@ -18,10 +18,10 @@ buildscript {
 apply plugin: 'kotlin-multiplatform'
 
 repositories {
-    maven {
+    if (UtilsKt.getCacheRedirectorEnabled(project))
-        url 'https://cache-redirector.jetbrains.com/jcenter'
+        maven { url 'https://cache-redirector.jetbrains.com/jcenter' }
-    }
+    else
-    jcenter()
+        jcenter()
 }
 
 kotlin {

kotlin-native/gradle/kotlinGradlePlugin.gradle

@@ -1,11 +1,13 @@
+import org.jetbrains.kotlin.UtilsKt
+
 project.buildscript.repositories {
     maven {
         url project.bootstrapKotlinRepo
     }
-    maven {
+    if (UtilsKt.getCacheRedirectorEnabled(project))
-        url 'https://cache-redirector.jetbrains.com/maven-central'
+        maven { url 'https://cache-redirector.jetbrains.com/maven-central' }
-    }
+    else
-    mavenCentral()
+        mavenCentral()
 }
 
 project.buildscript.dependencies {

kotlin-native/platformLibs/build.gradle

@@ -2,21 +2,20 @@ import org.jetbrains.kotlin.gradle.plugin.konan.tasks.KonanCacheTask
 import org.jetbrains.kotlin.KlibInstall
 import org.jetbrains.kotlin.konan.target.*
 import org.jetbrains.kotlin.konan.util.*
+import org.jetbrains.kotlin.UtilsKt
 
 import static org.jetbrains.kotlin.konan.util.VisibleNamedKt.getVisibleName
 
 buildscript {
     repositories {
-        maven {
+        if (UtilsKt.getCacheRedirectorEnabled(project))
-            url 'https://cache-redirector.jetbrains.com/maven-central'
+            maven { url 'https://cache-redirector.jetbrains.com/maven-central'}
-        }
+        else
-        mavenCentral()
+            mavenCentral()
         maven {
             url project.bootstrapKotlinRepo
         }
-        maven {
+        maven { url UtilsKt.redirectIfEnabled(project, "https://kotlin.bintray.com/kotlinx") }
-            url "https://kotlin.bintray.com/kotlinx"
-        }
     }
 }
 // These properties are used by the 'konan' plugin, thus we set them before applying it.