Skip to content
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

Unify runtime-saveable's targets with the runtime #894

Merged

Conversation

JakeWharton
Copy link

It supports more targets than the general compose multiplatform libraries, and the two should be unified.

Test: gw :compose:runtime:runtime-saveable:watchosArm64Binaries :compose:runtime:runtime-saveable:watchosArm32Binaries :compose:runtime:runtime-saveable:watchosX86Binaries :compose:runtime:runtime-saveable:watchosX64Binaries :compose:runtime:runtime-saveable:watchosSimulatorArm64Binaries :compose:runtime:runtime-saveable:tvosArm64Binaries :compose:runtime:runtime-saveable:tvosX64Binaries :compose:runtime:runtime-saveable:tvosSimulatorArm64Binaries :compose:runtime:runtime-saveable:mingwX64Binaries :compose:runtime:runtime-saveable:linuxX64Binaries

Closes JetBrains/compose-multiplatform#3899

@JakeWharton
Copy link
Author

I couldn't do a normal task like assemble because the build kept failing trying to find artifacts like org.jetbrains.dokka:android-documentation-plugin:1.8.10-dev-203. Didn't feel like digging into it since I know my changes don't affect whatever that is.

@eymar
Copy link
Member

eymar commented Nov 6, 2023

One more thing to change:

Index: mpp/build.gradle.kts
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/mpp/build.gradle.kts b/mpp/build.gradle.kts
--- a/mpp/build.gradle.kts	(revision 93a43bf0aafd64acf81bfa4e4b154dcc75e939fd)
+++ b/mpp/build.gradle.kts	(date 1699283345001)
@@ -36,7 +36,7 @@
         ComposeComponent(":compose:material:material-icons-core"),
         ComposeComponent(":compose:material:material-ripple"),
         ComposeComponent(":compose:runtime:runtime", supportedPlatforms = ComposePlatforms.ALL),
-        ComposeComponent(":compose:runtime:runtime-saveable"),
+        ComposeComponent(":compose:runtime:runtime-saveable", supportedPlatforms = ComposePlatforms.ALL),
         ComposeComponent(":compose:ui:ui"),
         ComposeComponent(":compose:ui:ui-geometry"),
         ComposeComponent(":compose:ui:ui-graphics"),

@eymar eymar self-requested a review November 6, 2023 15:10
@JakeWharton
Copy link
Author

I'm traveling today. Will do tomorrow!

It supports more targets than the general compose multiplatform libraries, and the two should be unified.

Test: gw :compose:runtime:runtime-saveable:watchosArm64Binaries :compose:runtime:runtime-saveable:watchosArm32Binaries :compose:runtime:runtime-saveable:watchosX86Binaries :compose:runtime:runtime-saveable:watchosX64Binaries :compose:runtime:runtime-saveable:watchosSimulatorArm64Binaries :compose:runtime:runtime-saveable:tvosArm64Binaries :compose:runtime:runtime-saveable:tvosX64Binaries :compose:runtime:runtime-saveable:tvosSimulatorArm64Binaries :compose:runtime:runtime-saveable:mingwX64Binaries :compose:runtime:runtime-saveable:linuxX64Binaries
@JakeWharton
Copy link
Author

Done!

Copy link
Member

@eymar eymar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great! Thank you!

@eymar eymar merged commit b82f26d into JetBrains:jb-main Nov 9, 2023
1 check passed
@JakeWharton JakeWharton deleted the jw.saveable-targets.2023-11-03 branch November 9, 2023 06:23
mazunin-v-jb pushed a commit that referenced this pull request Dec 7, 2023
It supports more targets than the general compose multiplatform
libraries, and the two should be unified.

Test: gw :compose:runtime:runtime-saveable:watchosArm64Binaries
:compose:runtime:runtime-saveable:watchosArm32Binaries
:compose:runtime:runtime-saveable:watchosX86Binaries
:compose:runtime:runtime-saveable:watchosX64Binaries
:compose:runtime:runtime-saveable:watchosSimulatorArm64Binaries
:compose:runtime:runtime-saveable:tvosArm64Binaries
:compose:runtime:runtime-saveable:tvosX64Binaries
:compose:runtime:runtime-saveable:tvosSimulatorArm64Binaries
:compose:runtime:runtime-saveable:mingwX64Binaries
:compose:runtime:runtime-saveable:linuxX64Binaries

Closes JetBrains/compose-multiplatform#3899
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Unify 'runtime-saveable' targets to match 'runtime'
2 participants