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

[Gradle] Fix warnings in experimentalConifguration.kt

Browse Source 
^KT-56904 In Progress
This commit is contained in:
Yahor Berdnikau
2024-02-08 22:17:06 +01:00
committed by Space Team
parent d2c8565d55
commit 05f3019fcf
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/experimentalConifguration.kt
+5 -3
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.utils
import org.gradle.api.Project
import org.gradle.api.provider.ProviderFactory
import org.jetbrains.kotlin.gradle.dsl.KotlinCommonCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider
@@ -14,15 +15,16 @@ import org.jetbrains.kotlin.gradle.plugin.PropertiesProvider.Companion.kotlinPro
internal fun <T : KotlinCommonCompilerOptions> T.configureExperimentalTryNext(
project: Project,
kotlinProperties: PropertiesProvider = project.kotlinPropertiesProvider
): T = configureExperimentalTryNext(kotlinProperties)
): T = configureExperimentalTryNext(kotlinProperties, project.providers)
internal val KotlinVersion.Companion.nextKotlinLanguageVersion get() = KotlinVersion.values().first { it > KotlinVersion.DEFAULT }
internal fun <T : KotlinCommonCompilerOptions> T.configureExperimentalTryNext(
kotlinProperties: PropertiesProvider
kotlinProperties: PropertiesProvider,
providerFactory: ProviderFactory,
): T = apply {
languageVersion.convention(
kotlinProperties.kotlinExperimentalTryNext.map { enabled ->
kotlinProperties.kotlinExperimentalTryNext.mapOrNull(providerFactory) { enabled ->
@Suppress("TYPE_MISMATCH")
if (enabled) KotlinVersion.nextKotlinLanguageVersion else null
}