From db9c440e9061173e19ffab86f5ca2fb1af3eda1f Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Thu, 9 Feb 2023 21:02:14 +0100
Subject: [PATCH] Drop leftovers usages 'forUseAtConfigurationTime'

---
 .../cache-redirector.settings.gradle.kts      | 19 ++++++++++++++----
 .../kotlin-bootstrap.settings.gradle.kts      | 20 +++++++++----------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/repo/scripts/cache-redirector.settings.gradle.kts b/repo/scripts/cache-redirector.settings.gradle.kts
index 0a15a982eb0..ccfb4d0aa0d 100644
--- a/repo/scripts/cache-redirector.settings.gradle.kts
+++ b/repo/scripts/cache-redirector.settings.gradle.kts
@@ -1,4 +1,5 @@
 import java.net.URI
+import org.gradle.util.GradleVersion
 
 /*
  * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
@@ -10,10 +11,18 @@ import java.net.URI
 //    apply from: 'cache-redirector.settings.gradle.kts'
 // }
 
+// This script is also being used in the Gradle integration tests which runs older Gradle versions
+fun <T : Any> Provider<T>.forUseAtConfigurationTimeCompat(): Provider<T> =
+    if (GradleVersion.current() < GradleVersion.version("7.4")) {
+        forUseAtConfigurationTime()
+    } else {
+        this
+    }
+
 internal val Settings.cacheRedirectorEnabled: Provider<Boolean>
     get() = providers
         .gradleProperty("cacheRedirectorEnabled")
-        .forUseAtConfigurationTime()
+        .forUseAtConfigurationTimeCompat()
         .map { it.toBoolean() }
         .orElse(false)
 
@@ -151,9 +160,11 @@ fun Project.overrideNativeCompilerDownloadUrl() {
 
 fun Project.addCheckRepositoriesTask() {
     val checkRepoTask = tasks.register("checkRepositories") {
-        val isTeamcityBuildInput = providers.provider {
-            project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
-        }.forUseAtConfigurationTime()
+        val isTeamcityBuildInput = providers
+            .provider {
+                project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
+            }
+            .forUseAtConfigurationTimeCompat()
 
         doLast {
             val testName = "$name in ${project.displayName}"
diff --git a/repo/scripts/kotlin-bootstrap.settings.gradle.kts b/repo/scripts/kotlin-bootstrap.settings.gradle.kts
index 0d0aee31084..a8767de63cd 100644
--- a/repo/scripts/kotlin-bootstrap.settings.gradle.kts
+++ b/repo/scripts/kotlin-bootstrap.settings.gradle.kts
@@ -101,14 +101,14 @@ private val localProperties = providers.of(PropertiesValueSource::class.java) {
         fileName.set("local.properties")
         rootDir.set(kotlinRootDir)
     }
-}.forUseAtConfigurationTime()
+}
 
 private val rootGradleProperties = providers.of(PropertiesValueSource::class.java) {
     parameters {
         fileName.set("gradle.properties")
         rootDir.set(kotlinRootDir)
     }
-}.forUseAtConfigurationTime()
+}
 
 fun loadLocalOrGradleProperty(
     propertyName: String
@@ -116,13 +116,13 @@ fun loadLocalOrGradleProperty(
     // Workaround for https://github.com/gradle/gradle/issues/19114
     // as in the includedBuild GradleProperties are empty on configuration cache reuse
     return if ((gradle as GradleInternal).isRootBuild()) {
-        localProperties.map { it.getProperty(propertyName) }.forUseAtConfigurationTime()
-            .orElse(providers.gradleProperty(propertyName).forUseAtConfigurationTime())
-            .orElse(rootGradleProperties.map { it.getProperty(propertyName) }.forUseAtConfigurationTime())
+        localProperties.map { it.getProperty(propertyName) }
+            .orElse(providers.gradleProperty(propertyName))
+            .orElse(rootGradleProperties.map { it.getProperty(propertyName) })
     } else {
-        localProperties.map { it.getProperty(propertyName) }.forUseAtConfigurationTime()
-            .orElse(rootSettings.providers.gradleProperty(propertyName).forUseAtConfigurationTime())
-            .orElse(rootGradleProperties.map { it.getProperty(propertyName) }.forUseAtConfigurationTime())
+        localProperties.map { it.getProperty(propertyName) }
+            .orElse(rootSettings.providers.gradleProperty(propertyName))
+            .orElse(rootGradleProperties.map { it.getProperty(propertyName) })
     }
 }
 
@@ -218,7 +218,7 @@ fun Settings.applyBootstrapConfiguration(
 }
 
 val isLocalBootstrapEnabled: Provider<Boolean> = loadLocalOrGradleProperty(Config.LOCAL_BOOTSTRAP)
-    .mapToBoolean().orElse(false).forUseAtConfigurationTime()
+    .mapToBoolean().orElse(false)
 
 val localBootstrapVersion: Provider<String> = loadLocalOrGradleProperty(Config.LOCAL_BOOTSTRAP_VERSION)
     .orElse(loadLocalOrGradleProperty(Config.DEFAULT_SNAPSHOT_VERSION))
@@ -232,7 +232,7 @@ val customBootstrapVersion = loadLocalOrGradleProperty(Config.CUSTOM_BOOTSTRAP_V
 val customBootstrapRepo = loadLocalOrGradleProperty(Config.CUSTOM_BOOTSTRAP_REPO)
 val defaultBootstrapVersion = loadLocalOrGradleProperty(Config.DEFAULT_BOOTSTRAP_VERSION)
 val isJpsBuildEnabled = loadLocalOrGradleProperty(Config.IS_JPS_BUILD_ENABLED)
-    .mapToBoolean().orElse(false).forUseAtConfigurationTime()
+    .mapToBoolean().orElse(false)
 
 var Project.bootstrapKotlinVersion: String
     get() = property(Config.PROJECT_KOTLIN_VERSION) as String