azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle, JS] Fix gradle <5.1 incompatibility with fileProperty

Browse Source
This commit is contained in:
Ilya Goncharov
2020-01-29 16:33:12 +03:00
parent 24451f62ac
commit c208f038ad
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/utils/providerApiUtils.kt
+12 -4
View File
@@ -6,8 +6,8 @@
package org.jetbrains.kotlin.gradle.utils package org.jetbrains.kotlin.gradle.utils
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.file.RegularFile import org.gradle.api.file.RegularFile
import org.gradle.api.file.RegularFileProperty
import org.gradle.api.provider.Property import org.gradle.api.provider.Property
import org.gradle.api.provider.Provider import org.gradle.api.provider.Provider
import java.io.File import java.io.File
@@ -38,9 +38,17 @@ private class OptionalProviderDelegate<T>(private val provider: Provider<T?>) :
internal fun <T> Project.optionalProvider(initialize: () -> T?): ReadOnlyProperty<Any?, T?> = internal fun <T> Project.optionalProvider(initialize: () -> T?): ReadOnlyProperty<Any?, T?> =
OptionalProviderDelegate(provider(initialize)) OptionalProviderDelegate(provider(initialize))
// 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 = internal fun Project.newFileProperty(initialize: (() -> File)? = null): RegularFileProperty =
project.objects.fileProperty().apply { if (isGradleVersionAtLeast(5, 0)) {
if (initialize != null) { project.objects.fileProperty().apply {
set(provider { RegularFile(initialize) }) if (initialize != null) {
set(provider { RegularFile(initialize) })
}
} }
} else {
val projectLayoutClass = Class.forName("org.gradle.api.file.ProjectLayout")
val filePropertyMethod = projectLayoutClass.getMethod("fileProperty")
filePropertyMethod(project.layout) as RegularFileProperty
} }