feat: Support Compose Resources in Native macOS Executables #5431
+233
−0
Conversation
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
terrakok
requested changes
Sep 16, 2025
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt
Outdated
Show resolved
Hide resolved
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt
Outdated
Show resolved
Hide resolved
gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/resources/IosResources.kt
Outdated
Show resolved
Hide resolved
...lugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
Outdated
Show resolved
Hide resolved
...lugins/compose/src/test/kotlin/org/jetbrains/compose/test/tests/integration/ResourcesTest.kt
Outdated
Show resolved
Hide resolved
|
I revisited the codebase and decided the feature should be done in configureNativeApplication function. Could you refactor it? |
Ok |
Should i keep the |
|
Better to revert all changes. Because the file is related to ios specifics (yes, it helps with macos unit tests, as I see, but by chance 😄). |
This commit introduces support for Compose Resources in native macOS applications. Key changes: - Added `composeResourcesDirs` property to `AbstractNativeMacApplicationPackageAppDirTask` to include resources during app packaging. - Updated `configureNativeApplication.kt` to pass Compose resource directories from Kotlin Native binaries to the packaging task. - Included a new test project `misc/macosNativeResources` to verify the integration. - Added `macosExecutableResources` test in `ResourcesTest.kt` to ensure resources are correctly packaged into the `.app` bundle.
Sanlorng
force-pushed
the
update_mac_os_package
branch
from
5d36c32 to
1b9547c
Compare
|
I have reverterd all the previous changes and rewritten the function. |
terrakok
requested changes
Sep 18, 2025
...jetbrains/compose/desktop/application/tasks/AbstractNativeMacApplicationPackageAppDirTask.kt
Outdated
Show resolved
Hide resolved
This commit changes the type of `composeResourcesDirs` in `AbstractNativeMacApplicationPackageAppDirTask` from `ListProperty<SourceDirectorySet>` to `Property<FileCollection?>`. This change simplifies the configuration of native application packaging by directly using `project.files` to gather resource directories from Kotlin source sets.
…ackageAppDirTask` was changed from `Property<FileCollection?>` to `ConfigurableFileCollection`.
|
Is there anything else that needs to be changed? |
1 similar comment
|
Is there anything else that needs to be changed? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Support for Compose Resources in native macOS executables.
macosExecutableResourcesto verify resource copying for macOS executables.configureNativeApplication.ktto pass Compose resource directories from Kotlin Native binaries to the packaging task..app/Contents/Resourcesdirectory for packaged macOS applications.Testing
Executing tasks: [:compose:test-Gradle(9.0.0)-Agp(8.9.0), --tests, org.jetbrains.compose.test.tests.integration.ResourcesTest.macosExectuableResources]
Release Notes
Fixes - macOS Native