From 2675531624d42851af502a993bbefd65ee3e38ef Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Wed, 9 Aug 2023 18:21:48 +0200
Subject: [PATCH] [Build] allow empty build cache url to disable it

4af1970b28dd54afcae0525e0668957bd43f07f1 allows it only for the included build
---
 .../src/main/kotlin/build-cache.settings.gradle.kts           | 4 ++--
 repo/gradle-settings-conventions/settings.gradle.kts          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/repo/gradle-settings-conventions/build-cache/src/main/kotlin/build-cache.settings.gradle.kts b/repo/gradle-settings-conventions/build-cache/src/main/kotlin/build-cache.settings.gradle.kts
index 64b4c35516e..07a0c130461 100644
--- a/repo/gradle-settings-conventions/build-cache/src/main/kotlin/build-cache.settings.gradle.kts
+++ b/repo/gradle-settings-conventions/build-cache/src/main/kotlin/build-cache.settings.gradle.kts
@@ -8,8 +8,8 @@ buildCache {
         }
     }
 
-    val remoteBuildCacheUrl = buildProperties.buildCacheUrl
-    if (remoteBuildCacheUrl != null) {
+    val remoteBuildCacheUrl = buildProperties.buildCacheUrl?.trim()
+    if (!remoteBuildCacheUrl.isNullOrEmpty()) {
         remote<HttpBuildCache> {
             url = uri(remoteBuildCacheUrl)
             isPush = buildProperties.pushToBuildCache
diff --git a/repo/gradle-settings-conventions/settings.gradle.kts b/repo/gradle-settings-conventions/settings.gradle.kts
index a34d749cc0c..2601401d375 100644
--- a/repo/gradle-settings-conventions/settings.gradle.kts
+++ b/repo/gradle-settings-conventions/settings.gradle.kts
@@ -48,7 +48,7 @@ buildCache {
         }
     }
 
-    val remoteBuildCacheUrl = buildProperties.buildCacheUrl
+    val remoteBuildCacheUrl = buildProperties.buildCacheUrl?.trim()
     if (!remoteBuildCacheUrl.isNullOrEmpty()) {
         remote<HttpBuildCache> {
             url = uri(remoteBuildCacheUrl)