From a112bebf785aa87aafa5139b69fd6d7f54311e66 Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Thu, 29 Nov 2018 20:47:24 +0300
Subject: [PATCH] Build: Configure cache-redirector in allprojects block

---
 build.gradle.kts                        | 11 ++++++++++-
 compiler/psi/build.gradle.kts           |  2 +-
 idea/build.gradle.kts                   |  2 +-
 idea/build.gradle.kts.173               |  2 +-
 idea/build.gradle.kts.as31              |  2 +-
 idea/build.gradle.kts.as32              |  2 +-
 idea/build.gradle.kts.as33              |  2 +-
 idea/build.gradle.kts.as34              |  2 +-
 plugins/imports-dumper/build.gradle.kts |  2 +-
 settings.gradle                         |  2 +-
 10 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e2e7b1dc407..9650d6610be 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -313,7 +313,7 @@ allprojects {
 
     val mirrorRepo: String? = findProperty("maven.repository.mirror")?.toString()
 
-    repositories.withRedirector(project) {
+    repositories {
         intellijSdkRepo(project)
         androidDxJarRepo(project)
         mirrorRepo?.let(::maven)
@@ -787,3 +787,12 @@ tasks.create("findShadowJarsInClasspath").doLast {
         project.checkConfig("testCompileClasspath")
     }
 }
+
+allprojects {
+    afterEvaluate {
+        if (cacheRedirectorEnabled()) {
+            logger.info("Redirecting repositories for $displayName")
+            repositories.redirect()
+        }
+    }
+}
diff --git a/compiler/psi/build.gradle.kts b/compiler/psi/build.gradle.kts
index 93f95ebf3ee..568a29bc83c 100644
--- a/compiler/psi/build.gradle.kts
+++ b/compiler/psi/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://jetbrains.bintray.com/intellij-third-party-dependencies")
 }
 
diff --git a/idea/build.gradle.kts b/idea/build.gradle.kts
index 53a2bb209e2..7fd622ce897 100644
--- a/idea/build.gradle.kts
+++ b/idea/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://jetbrains.bintray.com/markdown")
 }
 
diff --git a/idea/build.gradle.kts.173 b/idea/build.gradle.kts.173
index 5f5a8f04adc..e6e2293a283 100644
--- a/idea/build.gradle.kts.173
+++ b/idea/build.gradle.kts.173
@@ -5,7 +5,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://jetbrains.bintray.com/markdown")
 }
 
diff --git a/idea/build.gradle.kts.as31 b/idea/build.gradle.kts.as31
index 974a63a2659..f04bde29e97 100644
--- a/idea/build.gradle.kts.as31
+++ b/idea/build.gradle.kts.as31
@@ -5,7 +5,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://jetbrains.bintray.com/markdown")
 }
 
diff --git a/idea/build.gradle.kts.as32 b/idea/build.gradle.kts.as32
index 2e5678d4159..c8fc6767e61 100644
--- a/idea/build.gradle.kts.as32
+++ b/idea/build.gradle.kts.as32
@@ -5,7 +5,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://jetbrains.bintray.com/markdown")
 }
 
diff --git a/idea/build.gradle.kts.as33 b/idea/build.gradle.kts.as33
index 5c6ec076e70..6b2c67a8620 100644
--- a/idea/build.gradle.kts.as33
+++ b/idea/build.gradle.kts.as33
@@ -5,7 +5,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://jetbrains.bintray.com/markdown")
 }
 
diff --git a/idea/build.gradle.kts.as34 b/idea/build.gradle.kts.as34
index 5c6ec076e70..6b2c67a8620 100644
--- a/idea/build.gradle.kts.as34
+++ b/idea/build.gradle.kts.as34
@@ -5,7 +5,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://jetbrains.bintray.com/markdown")
 }
 
diff --git a/plugins/imports-dumper/build.gradle.kts b/plugins/imports-dumper/build.gradle.kts
index 0ff6436f4dc..3b776353a68 100644
--- a/plugins/imports-dumper/build.gradle.kts
+++ b/plugins/imports-dumper/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
     id("jps-compatible")
 }
 
-repositories.withRedirector(project) {
+repositories {
     maven("https://dl.bintray.com/kotlin/kotlinx")
 }
 
diff --git a/settings.gradle b/settings.gradle
index 737e63d8326..bde4727e2bf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -10,7 +10,7 @@ pluginManagement {
     }
 
     if (cacheRedirectorEnabled == 'true') {
-        println("cache-redirector is enabled for pluginManagement")
+        logger.info("Redirecting repositories for settings.gradle pluginManagement")
         JbCacheRedirectorKt.redirect(repositories)
     }
 }