Merge 0c6a141294 into b5ca5d4dc1

2 weeks ago · 36d262e956
1 changed files with 4 additions and 1 deletions
--- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/providerUtils.kt
+++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/internal/utils/providerUtils.kt
@ -36,7 +36,10 @@ internal fun ProviderFactory.valueOrNull(prop: String): Provider<String?> =
    }

 private fun Provider<String?>.forUseAtConfigurationTimeSafe(): Provider<String?> =
-    try {
+    // https://docs.gradle.org/current/userguide/upgrading_version_7.html
+    if (org.gradle.util.GradleVersion.current() >= org.gradle.util.GradleVersion.version("8.0")) {
+        this
+    } else try {
        forUseAtConfigurationTime()
    } catch (e: NoSuchMethodError) {
        // todo: remove once we drop support for Gradle 6.4