File tree Expand file tree Collapse file tree 3 files changed +2
-15
lines changed
gradle-plugins/compose/src
main/kotlin/org/jetbrains/compose
desktop/application/internal
test/kotlin/org/jetbrains/compose/test/tests/integration Expand file tree Collapse file tree 3 files changed +2
-15
lines changed Original file line number Diff line number Diff 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"
3232internal const val minimalSupportedKgpVersionError = " e: Configuration problem: " +
3333 " Minimal supported Kotlin Gradle Plugin version is $minimalSupportedKgpVersion "
3434internal const val newComposeCompilerKotlinSupportPluginId = " org.jetbrains.kotlin.plugin.compose"
Original file line number Diff line number Diff line change @@ -8,19 +8,7 @@ import org.jetbrains.compose.internal.mppExt
88import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
99import 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-
1611private 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
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments