Browse Source

Bump minimal supported Kotlin version to 2.1.0 (#5474)

Bump minimal supported Kotlin version to 2.1.0

Fixes
[CMP-9218](https://youtrack.jetbrains.com/issue/CMP-9218/Bump-minimal-supported-Kotlin-version-to-2.1.0-in-CMP-Gradle-Plugin)

## Release Notes
N/A
pull/5477/head v1.10.0-beta02+dev3227
Nikita Lipsky 1 month ago committed by GitHub
parent
commit
9e527f6b54
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 10
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/CheckComposeCompilerPlugin.kt
  2. 2
      gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt

10
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/CheckComposeCompilerPlugin.kt

@ -28,20 +28,20 @@ internal fun Project.checkComposeCompilerPlugin() {
} }
} }
internal const val minimalSupportedKgpVersion = "2.1.0"
internal const val minimalSupportedKgpVersionError = "e: Configuration problem: " + internal const val minimalSupportedKgpVersionError = "e: Configuration problem: " +
"Minimal supported Kotlin Gradle Plugin version is 2.0.0" "Minimal supported Kotlin Gradle Plugin version is $minimalSupportedKgpVersion"
internal const val newCompilerIsAvailableVersion = "2.0.0"
internal const val newComposeCompilerKotlinSupportPluginId = "org.jetbrains.kotlin.plugin.compose" internal const val newComposeCompilerKotlinSupportPluginId = "org.jetbrains.kotlin.plugin.compose"
internal const val newComposeCompilerError = internal const val newComposeCompilerError =
"Since Kotlin 2.0.0 to use Compose Multiplatform " + "Starting with Compose Multiplatform 1.6.10, " +
"you must apply \"$newComposeCompilerKotlinSupportPluginId\" plugin." + "you should apply \"$newComposeCompilerKotlinSupportPluginId\" plugin." +
"\nSee the migration guide https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compiler.html#migrating-a-compose-multiplatform-project" "\nSee the migration guide https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compiler.html#migrating-a-compose-multiplatform-project"
private fun Project.checkComposeCompilerPlugin(kgp: KotlinBasePlugin) { private fun Project.checkComposeCompilerPlugin(kgp: KotlinBasePlugin) {
val kgpVersion = kgp.pluginVersion val kgpVersion = kgp.pluginVersion
val ideaIsInSync = project.ideaIsInSyncProvider().get() val ideaIsInSync = project.ideaIsInSyncProvider().get()
if (Version.fromString(kgpVersion) < Version.fromString(newCompilerIsAvailableVersion)) { if (Version.fromString(kgpVersion) < Version.fromString(minimalSupportedKgpVersion)) {
if (ideaIsInSync) logger.error(minimalSupportedKgpVersionError) if (ideaIsInSync) logger.error(minimalSupportedKgpVersionError)
else error(minimalSupportedKgpVersionError) else error(minimalSupportedKgpVersionError)
} else { } else {

2
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt

@ -15,6 +15,8 @@ import org.jetbrains.compose.internal.utils.nullableProperty
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import javax.inject.Inject import javax.inject.Inject
private const val newCompilerIsAvailableVersion = "2.0.0"
abstract class ComposeExtension @Inject constructor( abstract class ComposeExtension @Inject constructor(
objects: ObjectFactory, objects: ObjectFactory,
project: Project project: Project

Loading…
Cancel
Save