Skip to content

Commit f389663

Browse files
committed
Bump minimal supported Kotlin version to 2.1.0
1 parent 840d490 commit f389663

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ internal fun Project.checkComposeCompilerPlugin() {
2828
}
2929
}
3030

31+
internal const val minimalSupportedKgpVersion = "2.1.0"
3132
internal const val minimalSupportedKgpVersionError = "e: Configuration problem: " +
32-
"Minimal supported Kotlin Gradle Plugin version is 2.0.0"
33-
internal const val newCompilerIsAvailableVersion = "2.0.0"
33+
"Minimal supported Kotlin Gradle Plugin version is $minimalSupportedKgpVersion"
3434
internal const val newComposeCompilerKotlinSupportPluginId = "org.jetbrains.kotlin.plugin.compose"
3535
internal const val newComposeCompilerError =
36-
"Since Kotlin 2.0.0 to use Compose Multiplatform " +
37-
"you must apply \"$newComposeCompilerKotlinSupportPluginId\" plugin." +
36+
"Starting with Compose Multiplatform 1.6.10, " +
37+
"you should apply \"$newComposeCompilerKotlinSupportPluginId\" plugin." +
3838
"\nSee the migration guide https://www.jetbrains.com/help/kotlin-multiplatform-dev/compose-compiler.html#migrating-a-compose-multiplatform-project"
3939

4040
private fun Project.checkComposeCompilerPlugin(kgp: KotlinBasePlugin) {
4141
val kgpVersion = kgp.pluginVersion
4242
val ideaIsInSync = project.ideaIsInSyncProvider().get()
4343

44-
if (Version.fromString(kgpVersion) < Version.fromString(newCompilerIsAvailableVersion)) {
44+
if (Version.fromString(kgpVersion) < Version.fromString(minimalSupportedKgpVersion)) {
4545
if (ideaIsInSync) logger.error(minimalSupportedKgpVersionError)
4646
else error(minimalSupportedKgpVersionError)
4747
} else {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ import org.jetbrains.compose.internal.utils.nullableProperty
1515
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
1616
import javax.inject.Inject
1717

18+
private const val newCompilerIsAvailableVersion = "2.0.0"
19+
1820
abstract class ComposeExtension @Inject constructor(
1921
objects: ObjectFactory,
2022
project: Project

0 commit comments

Comments
 (0)