Skip to content

Commit e7c66b6

Browse files
committed
Bump minimal supported Kotlin to 2.2.0.
1 parent 13cc6f0 commit e7c66b6

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ internal fun Project.checkComposeCompilerPlugin() {
2828
}
2929
}
3030

31-
internal const val minimalSupportedKgpVersion = "2.1.0"
31+
internal const val minimalSupportedKgpVersion = "2.2.0"
3232
internal const val minimalSupportedKgpVersionError = "e: Configuration problem: " +
3333
"Minimal supported Kotlin Gradle Plugin version is $minimalSupportedKgpVersion"
3434
internal const val newComposeCompilerKotlinSupportPluginId = "org.jetbrains.kotlin.plugin.compose"

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureHotReload.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,7 @@ import org.jetbrains.compose.internal.mppExt
88
import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
99
import org.jetbrains.kotlin.gradle.targets.jvm.KotlinJvmTarget
1010

11-
private const val minimalKotlinVersionForCHR = "2.1.20"
12-
13-
private const val minimalKotlinVersionForCHRWarning = "w: " +
14-
"Compose Hot Reload is disabled. To make use of it, you need to be on Kotlin $minimalKotlinVersionForCHR or higher."
15-
1611
private fun Project.applyHotReload(kgp: KotlinBasePlugin) {
17-
// check minimal kotlin version requirement
18-
val kgpVersion = kgp.pluginVersion
19-
if (Version.fromString(kgpVersion) < Version.fromString(minimalKotlinVersionForCHR)) {
20-
logger.warn(minimalKotlinVersionForCHRWarning)
21-
return
22-
}
23-
2412
// We add an explicit runtime dependency to the Compose Hot Reload Gradle plugin of a
2513
// specific preferred version (https://docs.gradle.org/current/userguide/dependency_versions.html),
2614
// so we are able to apply the plugin by id here at least of that preferred version

gradle-plugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/HotReloadTest.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ class HotReloadTest : GradlePluginTestBase() {
3838
TestEnvironment(defaultTestEnvironment.workingDir, kotlinVersion = "2.1.0")))
3939
{
4040
gradleFailure("hotRun").checks {
41-
check.logContains("w: Compose Hot Reload is disabled")
42-
check.logContains("Task 'hotRun' not found")
41+
check.logContains("e: Configuration problem: Minimal supported Kotlin")
4342
}
4443
}
4544

0 commit comments

Comments
 (0)