From 85456bd6d8698772e025df7b9570eaf48d2dbb4b Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Mon, 26 Apr 2021 10:45:26 +0200
Subject: [PATCH] Add helper methods simplifying working with lazy properties
 from Kotlin.

Just allow to write Kotlin code easier and nicer when using Gradle
lazy properties.

^KT-45611 In Progress
---
 .../kotlin/gradle/utils/providerApiUtils.kt   | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
index c49e977dcab..dc79725e1eb 100644
--- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
+++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.gradle.utils
 import org.gradle.api.Project
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
 import java.io.File
@@ -37,6 +38,32 @@ internal fun <T : Any> Project.newProperty(initialize: (() -> T)? = null): Prope
             set(provider(initialize))
     }
 
+internal inline fun <reified T : Any?> ObjectFactory.property() = property(T::class.java)
+
+internal inline fun <reified T : Any?> ObjectFactory.property(initialValue: T) = property<T>().value(initialValue)
+
+internal inline fun <reified T : Any?> ObjectFactory.propertyWithConvention(
+    conventionValue: Provider<T>
+) = property<T>().convention(conventionValue)
+
+internal inline fun <reified T : Any?> ObjectFactory.propertyWithConvention(
+    conventionValue: T
+) = property<T>().convention(conventionValue)
+
+internal inline fun <reified T : Any> ObjectFactory.newInstance() = newInstance(T::class.java)
+
+internal inline fun <reified T : Any> ObjectFactory.propertyWithNewInstance(
+    vararg parameters: Any
+) = propertyWithConvention(newInstance(T::class.java, parameters))
+
+internal inline fun <reified T : Any> ObjectFactory.propertyWithNewInstance() =
+    propertyWithConvention(newInstance<T>())
+
+internal fun <PropType : Any?, T : Property<PropType>> T.chainedFinalizeValueOnRead(): T =
+    apply {
+        finalizeValueOnRead()
+    }
+
 // Before 5.0 fileProperty is created via ProjectLayout
 // https://docs.gradle.org/current/javadoc/org/gradle/api/model/ObjectFactory.html#fileProperty--
 internal fun Project.newFileProperty(initialize: (() -> File)? = null): RegularFileProperty {