Bundle Compose Hot Reload Gradle plugin into the Compose Gradle plugin by pjBooms · Pull Request #5444 · JetBrains/compose-multiplatform

pjBooms · 2025-10-03T15:49:33Z

Compose Hot Reload Gradle plugin is bundled with Compose Gradle plugin.

Thus Compose Hot Reload is available from Compose Multiplatform projects with the desktop target.

Fixes CMP-8885

Testing

Integration tests added.

This should be tested by QA.

Release Notes

Highlights - Desktop

Compose Hot Reload Gradle plugin is bundled with the Compose Gradle plugin and is enabled for Kotlin version 2.1.20 or higher (no need to configure it separately).

gradle-plugins/gradle.properties

gradle-plugins/compose/src/test/test-projects/application/hotReload/build.gradle

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

gradle-plugins/compose/build.gradle.kts

sellmair

Waiting for the approach with the 'preferred' dependency

sellmair

The approach seems elegant to me.
Note: I am not reviewing the tests, but only the mechanics of how the 'bundling' works. Using a preferred versioned dependency seems like a good solution.

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

gradle-plugins/compose/build.gradle.kts

gradle-plugins/compose/src/test/test-projects/application/hotReload/build.gradle

...lugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/HotReloadTest.kt

terrakok · 2025-10-13T15:23:46Z

topics to discuss:

is it possible to apply plugin by id + version in another plugin?
what will happen in multimodule project where custom CHR is applied only to one of the modules (not in root)
Applied by default CHR plugin implicitly enables new code generation + new tasks require JetBrains runtime. I think we have to provide a flag to disable CHR at least. (or even not apply it by default) cc @MatkovIvan
Project with no desktop target shouldn't have applied CHR

pjBooms · 2025-10-16T08:25:19Z

topics to discuss:

is it possible to apply plugin by id + version in another plugin?

what will happen in multimodule project where custom CHR is applied only to one of the modules (not in root)

Applied by default CHR plugin implicitly enables new code generation + new tasks require JetBrains runtime. I think we have to provide a flag to disable CHR at least. (or even not apply it by default) cc @MatkovIvan

Project with no desktop target shouldn't have applied CHR

"3." & "4." are addressed here.

...ose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureHotReload.kt

.github/workflows/gradle-plugin.yml

...ose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureHotReload.kt

...lugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/HotReloadTest.kt

...ose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureHotReload.kt

...lugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/HotReloadTest.kt

terrakok · 2025-10-17T10:21:26Z

...lugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt

-        gradle("prepareKotlinIdeaImport").checks {
+        gradle("prepareKotlinIdeaImport", "-P$disabaleProperty=false").checks {
            val expected = if (System.getProperty("os.name").lowercase().contains("windows")) {
                // Windows has different line endings in comparison with Unixes,


⚠️ ⚠️ ⚠️ BTW! Does the CHR plugin break reproducible builds between Win and Unix machines?

⚠️ ⚠️ ⚠️ BTW! Does the CHR plugin break reproducible builds between Win and Unix machines?

Can you please elaborate?

The only thing I could imagine is that different OS create different hashes for resources (which would be a bug?)

The only thing I could imagine is that different OS create different hashes for resources (which would be a bug?)

Windows has different line endings in comparison with Unixes. So vector.xml vector drawables become binary different when are they checked out from Git and thus produce different hashes.

Last time when we discussed it, we came into conclusion that the hashes must be different, because the content is different and fixed the test by providing different "expected" directories for Windows and non-Windows. However "reproducible builds" sounds like a valid contra-argument so I would handle it in the hash calculation. "Cons" of this approach was that we had to add a custom platform-specific handling logic that sounds fragile.

Handled this in the commit.

Makes sense! I strongly agree that any text-based resource should produce the same hashCode regardless of the formatting used. The 'hash' here is not an indicator of the actual text hash, but a hash for its 'semantic'. It should not change if something meaningless changed (e.g., if the format of line-endings changed).
However, I wonder how projects would end up with different XML files in their project? Is there some generation happening that produces different XML files (e.g., uses different line-endings on different platforms)?

…to the compose gradle plugin + use version catalog for the dependency

…itHub actions

…tion

…oduce a property to disable it. Previously introduced API for enabling its generation is removed.

… for them

…tentHash generation.

...ins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResourceAccessorsTask.kt

terrakok · 2025-10-21T13:31:25Z

...ins/compose/src/main/kotlin/org/jetbrains/compose/resources/GenerateResourceAccessorsTask.kt

+            return readText().replace("\r\n", "\n").toByteArray().contentHashCode()
+        } else {
+            // Once a new text resource file is introduced, we have to catch it and handle its line endings.
+            check(type == ResourceType.DRAWABLE || type == ResourceType.FONT) { "Cannot calculate content hash for $type resource type!" }


why do you check font type?
why should binary PNGs throw the error?

add all type of resources in the test case, please. to check stability of the hashes

Currently we generate accessors only for font and drawable files (strings and raw files are handled separately). Here I am just checking this fact, so if we introduce a new text resource type, we could catch it and recall that we may need to do something with its line endings. It is reflected in the comment.

add all type of resources in the test case, please.

Do you mean add .svg and raster images?

Added two more files

I don't agree. If we add a new text based resource type with a new extension, it will fail tests because hashes will be different. We don't need resource type here. And we don't need to check type == ResourceType.DRAWABLE as well. for any file based xml/svg resource we must do conversion on win machines

Ok, done.

(let's hope that we don't forget to add tests for new text files)

But just to double-check:
Any project would just check in those text files using a common line-ending, right? Will the git checkout then provide different line endings on different platforms?

...monMainResourceAccessors/app/group/resources_test/generated/resources/Plurals0.commonMain.kt

MohammadKHC · 2025-11-04T15:29:36Z

@terrakok I know that this is off-topic, but I couldn't resist to say that your new GitHub profile picture is cool!
Have a nice day!

pjBooms requested a review from sellmair October 3, 2025 15:49

pjBooms force-pushed the pjBooms/embed-compose-hot-reload-plugin branch from 2195620 to a800d3f Compare October 6, 2025 10:11

MatkovIvan reviewed Oct 6, 2025

View reviewed changes

gradle-plugins/gradle.properties Outdated Show resolved Hide resolved

gradle-plugins/compose/src/test/test-projects/application/hotReload/build.gradle Outdated Show resolved Hide resolved

sellmair reviewed Oct 8, 2025

View reviewed changes

gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposePlugin.kt Outdated Show resolved Hide resolved

sellmair reviewed Oct 8, 2025

View reviewed changes

gradle-plugins/compose/build.gradle.kts Outdated Show resolved Hide resolved

sellmair requested changes Oct 8, 2025

View reviewed changes

sellmair approved these changes Oct 9, 2025

View reviewed changes

pjBooms requested a review from terrakok October 9, 2025 12:47

pjBooms force-pushed the pjBooms/embed-compose-hot-reload-plugin branch 5 times, most recently from 4be7a02 to 4fcf98d Compare October 13, 2025 07:58

terrakok requested changes Oct 13, 2025

View reviewed changes

pjBooms force-pushed the pjBooms/embed-compose-hot-reload-plugin branch 7 times, most recently from ce75c3b to 88a3982 Compare October 16, 2025 08:19

pjBooms force-pushed the pjBooms/embed-compose-hot-reload-plugin branch 2 times, most recently from 05aada2 to f796ba0 Compare October 16, 2025 12:23

terrakok requested changes Oct 16, 2025

View reviewed changes

...ose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureHotReload.kt Outdated Show resolved Hide resolved

pjBooms force-pushed the pjBooms/embed-compose-hot-reload-plugin branch 3 times, most recently from 34fdad0 to 0c5274f Compare October 16, 2025 16:00

terrakok requested changes Oct 17, 2025

View reviewed changes

pjBooms force-pushed the pjBooms/embed-compose-hot-reload-plugin branch from 2f47039 to 1bd3f05 Compare October 20, 2025 14:14

pjBooms added 17 commits October 21, 2025 15:01

Bundle Compose Hot Reload Gradle plugin into the Compose Gradle plugin

d44a0e0

Explicitly depend on the hot reload plugin instead of embedding it in…

1f44a5c

…to the compose gradle plugin + use version catalog for the dependency

Change java-setup distribution to jetbrains

0c628b2

Fix testHotReload test

16c3732

Change hot reload version to rc02

1231e47

increase timeout

f27c022

Temporally disable testHotReload until we find a way to debug it on G…

ba21238

…itHub actions

Introduce a property for enabling/disabling Hot Reload plugin applica…

3dcbfe2

…tion

Enable @ResourceContentHash annotation generation by default and intr…

0371f66

…oduce a property to disable it. Previously introduced API for enabling its generation is removed.

Configure hot reload: listen jvm targets to appear instead of looking…

918d9d0

… for them

WIP: workaround for failing test on Windows

61705ef

Comment refinement

b622797

Review fixes

ac85382

Handle Windows line ending in text resource files during @ResourceCon…

2e4b065

…tentHash generation.

Workaround for failing tests on Windows

b00caaf

Consider .svg as a text file when generating content hash.

2602633

Run hot reload in headless mode in tests

b097888

pjBooms force-pushed the pjBooms/embed-compose-hot-reload-plugin branch from 597fdf8 to b097888 Compare October 21, 2025 12:03

Tests refinement

29e2a49

terrakok requested changes Oct 21, 2025

View reviewed changes

pjBooms added 2 commits October 21, 2025 17:06

Review fixes

fbb015c

Svg and webp test resource files added

2acaffb

terrakok reviewed Oct 21, 2025

View reviewed changes

...monMainResourceAccessors/app/group/resources_test/generated/resources/Plurals0.commonMain.kt Outdated Show resolved Hide resolved

Handle line endings on Windows for any known text resource files

aa9b874

sellmair approved these changes Oct 21, 2025

View reviewed changes

terrakok approved these changes Oct 21, 2025

View reviewed changes

pjBooms merged commit eb852d8 into master Oct 22, 2025
23 checks passed

pjBooms deleted the pjBooms/embed-compose-hot-reload-plugin branch October 22, 2025 09:11

Comments

Conversation

pjBooms commented Oct 3, 2025 • edited by ASalavei Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing

Release Notes

Highlights - Desktop

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sellmair left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sellmair left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

terrakok commented Oct 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pjBooms commented Oct 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sellmair Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pjBooms Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pjBooms Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pjBooms Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

pjBooms commented Oct 3, 2025 •

edited by ASalavei

Loading

sellmair left a comment •

edited

Loading

terrakok commented Oct 13, 2025 •

edited

Loading

pjBooms commented Oct 16, 2025 •

edited

Loading

sellmair Oct 17, 2025 •

edited

Loading

pjBooms Oct 20, 2025 •

edited

Loading

pjBooms Oct 20, 2025 •

edited

Loading

pjBooms Oct 21, 2025 •

edited

Loading