-
Notifications
You must be signed in to change notification settings - Fork 126
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
#535 kotlin 1.9.0, compose multiplatform 1.5.0 support #575
Merged
Conversation
This file contains 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
Release 0.23.0
…530-fix-task-dependencies-for-Gradle-8.2.1 # Conflicts: # gradle/libs.versions.toml # resources-compose/src/appleMain/kotlin/dev/icerock/moko/resources/compose/internal/CGImageRef+Skia.kt # resources-compose/src/appleMain/kotlin/dev/icerock/moko/resources/compose/internal/NSDataExt.kt # resources-generator/build.gradle.kts # samples/compose-jvm-app/build.gradle.kts # samples/compose-resources-gallery/gradle.properties # samples/compose-resources-gallery/shared/build.gradle.kts # samples/ios-static-xcframework/build.gradle.kts # samples/kotlin-ios-app/build.gradle.kts # samples/resources-gallery/build.gradle.kts
…act class and fields replaced with Gradle's Property instances. Removed redundant multipaltform prefix for move convenient reading. Extension methods to access default values
…ield, because it's actually not correct by default. Users should configure package names for their projects due to their requirements
…ield, because it's actually not correct by default. Users should configure package names for their projects due to their requirements
…kotlin-1.9.0-support
Alex009
commented
Apr 15, 2024
Alex009
commented
Apr 16, 2024
ExNDY
force-pushed
the
#535-kotlin-1.9.0-support
branch
from
April 16, 2024 11:47
8fd5837
to
dca5e78
Compare
ExNDY
force-pushed
the
#535-kotlin-1.9.0-support
branch
from
April 16, 2024 12:12
7c06b4b
to
4623998
Compare
… resources-gallery
…ister-font' into #535-kotlin-1.9.0-support # Conflicts: # resources/src/iosMain/kotlin/dev/icerock/moko/resources/FontResource.kt # resources/src/macosMain/kotlin/dev/icerock/moko/resources/FontResource.kt
Alex009
commented
Apr 18, 2024
This was referenced Apr 18, 2024
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.
Include changes from:
plugin reworked to
Provider
gradle's api to support dynamic changes of projects configuration.If you have some not standard usecase - send PR with new sample project please. every sample project is our test case
This request contains breaking changes to better support dynamic changes of configurations and support new features in future (for example - configuration cache #311 ).
At first - resources directory moved from
src/<resourceSourceSetName>/resources/MR
tosrc/<sourceSetName>/moko-resources
. I have multiple reasons for this:resources
directory. Our resources inMR
directory was not ready for directly usage as resource - our resources if "source" for generation of platform resources. For example - for iOS all resources should be packed inbundle
, for androidsvg
should be converted tovector-xml
. inresources
source set in future we can put output of our generators, but "source" resources should not be copied into result app.resourceSourceSetName
that configured in plugin's extension - source sets can change at any time, andresourceSourceSetName
in plugin extension can be changed in any time. So we should generate MR tasks for all sourcesets and decide what to do at EXECUTION stage. Also it allow to put resources in any sourceSet in hierarchy. For example incommonMain
will be common resources and iniosMain
will be ios specific resources added. It's was requested in Support for platform specific strings/resources #357Second - MR object will be generated not only expect + actuals, but also for middle layer expects in different source sets. For example if we have next sourceSets hierarchy:
We can put resources in each source set. And as result we got this sources:
commonMain/MR.common.kt
:androidMain/MR.android.kt
:appleMain/MR.apple.kt
:iosMain/MR.ios.kt
:iosX64Main/MR.iosX64.kt
:iosArm64Main/MR.iosArm64.kt
,iosSimulatorArm64Main/MR.iosSimulatorArm64.kt
:To decide what exactly should be generated each generateMR task will check own
moko-resources
directory and dependencies.expect object MR
will be located at lowest level of hierarchy (for example if we have not resources incommonMain
but have iniosMain
- expect will be iniosMain
andcommonMain
will be empty. With this change we can removeresourcesSourceSet
property from extension.Current progress:
resources/MR
tomoko-resources
known issues:
fontfamily-style
) - i think we can not fix this at alltodo:
check
on 0.24.0-alpha01 #628