Bundle Compose Hot Reload Gradle plugin into the Compose Gradle plugin #5444
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package org.jetbrains.compose.test.tests.integration | ||
|
|
||
| import org.gradle.testkit.runner.BuildResult | ||
| import org.jetbrains.compose.ComposeBuildConfig | ||
| import org.jetbrains.compose.test.utils.GradlePluginTestBase | ||
| import org.jetbrains.compose.test.utils.checks | ||
| import org.jetbrains.compose.test.utils.modify | ||
| import org.junit.jupiter.api.Test | ||
| import kotlin.concurrent.thread | ||
|
|
||
| class HotReloadTest : GradlePluginTestBase() { | ||
| @Test | ||
| fun smokeTestHotRunTask() = with(testProject("application/jvm")) { | ||
| file("build.gradle").modify { | ||
| it + """ | ||
| afterEvaluate { | ||
| tasks.getByName("hotRun").doFirst { | ||
| throw new StopExecutionException("Skip hotRun task") | ||
| } | ||
| } | ||
| """.trimIndent() | ||
| } | ||
| gradle("hotRun").checks { | ||
| check.taskSuccessful(":hotRun") | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testHotReload() = with(testProject("application/hotReload")) { | ||
| var result: BuildResult? = null | ||
| val hotRunThread = thread { | ||
| result = gradle("hotRunJvm") | ||
| } | ||
|
|
||
| while (!file("started").exists()) { | ||
| Thread.sleep(200) | ||
| } | ||
|
|
||
| modifyText("src/jvmMain/kotlin/main.kt") { | ||
| it.replace("Kotlin MPP", "KMP") | ||
| } | ||
|
|
||
| gradle("reload").checks { | ||
| check.taskSuccessful(":reload") | ||
| check.logContains("MainKt.class: modified") | ||
| } | ||
|
|
||
| hotRunThread.join() | ||
| check(result != null) | ||
| result.checks { | ||
| check.taskSuccessful(":hotRunJvm") | ||
| check.logContains("Kotlin MPP app is running!") | ||
| check.logContains("KMP app is running!") | ||
| check.logContains("Compose Hot Reload (${ComposeBuildConfig.composeHotReloadVersion})") | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun testExternalHotReload() = with(testProject("application/mpp")) { | ||
| val externalHotReloadVersion = "1.0.0-beta04" | ||
| modifyText("settings.gradle") { | ||
| it.replace( | ||
| "plugins {", "plugins {\n" + | ||
| """ | ||
| id 'org.jetbrains.compose.hot-reload' version '$externalHotReloadVersion' | ||
| """.trimIndent() | ||
| ) | ||
| } | ||
| modifyText("build.gradle") { | ||
| it.replace( | ||
| "plugins {", "plugins {\n" + | ||
| """ | ||
| id "org.jetbrains.compose.hot-reload" | ||
| """.trimIndent() | ||
| ) | ||
| } | ||
| gradle("hotRunJvm").checks { | ||
| check.taskSuccessful(":hotRunJvm") | ||
| check.logContains("Compose Hot Reload ($externalHotReloadVersion)") | ||
| check.logContains("Kotlin MPP app is running!") | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| import org.jetbrains.compose.desktop.application.dsl.TargetFormat | ||
|
|
||
| plugins { | ||
| id "com.android.application" | ||
| id "org.jetbrains.kotlin.multiplatform" | ||
| id "org.jetbrains.kotlin.plugin.compose" | ||
| id "org.jetbrains.compose" | ||
| } | ||
|
|
||
| kotlin { | ||
| // empty stub (no actual android app) to detect configuration conflicts | ||
| // like https://github.com/JetBrains/compose-jb/issues/2345 | ||
| androidTarget() | ||
|
|
||
| jvm() | ||
| sourceSets { | ||
| jvmMain { | ||
| dependsOn(commonMain) | ||
|
|
||
| dependencies { | ||
| implementation(compose.desktop.currentOs) | ||
| } | ||
| } | ||
| } | ||
| jvmToolchain { | ||
| languageVersion.set(JavaLanguageVersion.of(11)) | ||
| } | ||
| } | ||
|
|
||
| android { | ||
| namespace = "org.jetbrains.compose.testapp" | ||
| compileSdk = 35 | ||
|
|
||
| defaultConfig { | ||
| minSdk = 23 | ||
| targetSdk = 35 | ||
| } | ||
| } | ||
|
|
||
| compose.desktop { | ||
| application { | ||
| mainClass = "MainKt" | ||
| nativeDistributions { | ||
| targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) | ||
|
|
||
| packageVersion = "1.0.0" | ||
| packageName = "TestPackage" | ||
| description = "Test description" | ||
| copyright = "Test Copyright Holder" | ||
| vendor = "Test Vendor" | ||
|
|
||
| linux { | ||
| shortcut = true | ||
| packageName = "test-package" | ||
| debMaintainer = "[email protected]" | ||
| menuGroup = "menu-group" | ||
| } | ||
| windows { | ||
| console = true | ||
| dirChooser = true | ||
| perUserInstall = true | ||
| shortcut = true | ||
| menu = true | ||
| menuGroup = "compose" | ||
| upgradeUuid = "2d6ff464-75be-40ad-a256-56420b9cc374" | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| android.useAndroidX=true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| pluginManagement { | ||
| plugins { | ||
| id 'org.jetbrains.kotlin.multiplatform' version 'KOTLIN_VERSION_PLACEHOLDER' | ||
| id 'org.jetbrains.kotlin.plugin.compose' version 'KOTLIN_VERSION_PLACEHOLDER' | ||
| id 'org.jetbrains.compose' version 'COMPOSE_GRADLE_PLUGIN_VERSION_PLACEHOLDER' | ||
| id 'com.android.application' version 'AGP_VERSION_PLACEHOLDER' | ||
| } | ||
| repositories { | ||
| mavenLocal() | ||
| gradlePluginPortal() | ||
| mavenCentral() | ||
| google() | ||
| maven { | ||
| url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' | ||
| } | ||
| maven { | ||
| url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/' | ||
| } | ||
| } | ||
| } | ||
| dependencyResolutionManagement { | ||
| repositories { | ||
| mavenCentral() | ||
| google() | ||
| maven { | ||
| url 'https://maven.pkg.jetbrains.space/public/p/compose/dev' | ||
| } | ||
| maven { | ||
| url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev/' | ||
| } | ||
| mavenLocal() | ||
| } | ||
| } | ||
| rootProject.name = "mpp" |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import java.io.File | ||
|
|
||
| fun message() = "Kotlin MPP app is running!" | ||
|
|
||
| fun main() { | ||
| println(message()) | ||
| File("started").createNewFile() | ||
| //wait for reload | ||
| while(!message().startsWith("KMP")){ | ||
| Thread.sleep(200) | ||
| } | ||
| println(message()) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,3 +25,4 @@ compose.tests.gradle-agp.exclude=8.7/8.9.0, 8.7/9.0.0-alpha01 | |
| # A version of Gradle plugin, that will be published, | ||
| # unless overridden by COMPOSE_GRADLE_PLUGIN_VERSION env var. | ||
| deploy.version=9999.0.0-SNAPSHOT | ||
| hotreload.version=1.0.0-beta08 | ||
|
There was a problem hiding this comment. I guess Ii's supposed to be configured on CI, here is the place only for some placeholder cc @igordmn There was a problem hiding this comment. It is better to configure it only here, not on CI. Because it is a dependency version, not a version of the building component. There was a problem hiding this comment. It is usually better to define such versions in There was a problem hiding this comment. I have to have a place for version declaration that I can use in build script as well as in tests. I can't use There was a problem hiding this comment.
It is not so important, but I suggested this because of the different nature from the build perspective - HotReload is hardcoded dependency that is built separately, Compose/Material3 on the other hand are non-hardcoded components passed from CI. That is why, it is probably better to have them configured differently. From user (not build) perspective, they probably have the same nature - they are all versions of something provided by the plugin. That is why, it is probably better to have them in one place in The edge between component/dependency and hardcoded/passed from CI is thin, so any solution in the end should work, choose one you think is better. |
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.