-
Notifications
You must be signed in to change notification settings - Fork 72
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
Commonize :compose:material3:adaptive
modules
#1468
Conversation
Please specify the source commit. is it |
...rc/jvmStubsMain/kotlin/androidx/compose/material3/adaptive/layout/NotImplemented.jvmStubs.kt
Outdated
Show resolved
Hide resolved
9b2b35d
to
5b1a50a
Compare
material3/adaptive
from androidx:compose:material3:adaptive:adaptive
module
06914eb
to
1a9612c
Compare
:compose:material3:adaptive:adaptive
module:compose:material3:adaptive
modules
d707981
to
76106df
Compare
...rc/commonTest/kotlin/androidx/compose/material3/adaptive/layout/PaneScaffoldDirectiveTest.kt
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm surprised to see no dependencies to a navigation library here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is quite small module with independent logic how to behave when a screen has different layouts
@@ -292,6 +292,7 @@ WEAR_TILES = { group = "androidx.wear.tiles", atomicGroupVersion = "versions.WEA | |||
WEAR_WATCHFACE = { group = "androidx.wear.watchface", atomicGroupVersion = "versions.WEAR_WATCHFACE" } | |||
WEBKIT = { group = "androidx.webkit", atomicGroupVersion = "versions.WEBKIT" } | |||
WINDOW = { group = "androidx.window", atomicGroupVersion = "versions.WINDOW" } | |||
WINDOW_CORE = { group = "org.jetbrains.window.core", atomicGroupVersion = "versions.WINDOW", overrideInclude = [ ":window:window-core" ] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"versions.WINDOW" is already 1.6.0-alpha01
in AOSP. Shouldn't we update it here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't touch the version. As I understand the version was set in the commit we based our fork on
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is because we don't merge window
and libversions
to jb-main, they can be old. The actual state is in integration
, but as with any other lib we merge only released commits to jb-main
gradle.properties
Outdated
# We use artifactRedirecting not only for Compose libs: | ||
artifactRedirecting.androidx.collection.version=1.4.0 | ||
artifactRedirecting.androidx.annotation.version=1.8.0 | ||
artifactRedirecting.androidx.lifecycle.version=2.8.0 | ||
artifactRedirecting.androidx.navigation.version=2.8.0-beta05 | ||
artifactRedirecting.androidx.savedstate.version=1.2.1 | ||
# Look for `WINDOW` in libraryversions.toml | ||
artifactRedirecting.androidx.window.core.version=1.3.0-alpha01 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The stable 1.3.0 was release a few months ago. Any reason to use alpha?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't touch the version. As I understand the version was set in the commit we based our fork on
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
window subfolder wasn't involved in specific version selection, If it's outdated, please merge the stable state (might be done separately)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I'm almost sure that this version doesn't match to the commit/state of the code. Blocking the merge before explicit check
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM overall, no blockers. Please recheck the versions on our CI and redirecting artifacts before merge
gradle.properties
Outdated
# We use artifactRedirecting not only for Compose libs: | ||
artifactRedirecting.androidx.collection.version=1.4.0 | ||
artifactRedirecting.androidx.annotation.version=1.8.0 | ||
artifactRedirecting.androidx.lifecycle.version=2.8.0 | ||
artifactRedirecting.androidx.navigation.version=2.8.0-beta05 | ||
artifactRedirecting.androidx.savedstate.version=1.2.1 | ||
# Look for `WINDOW` in libraryversions.toml | ||
artifactRedirecting.androidx.window.core.version=1.3.0-alpha01 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, I'm almost sure that this version doesn't match to the commit/state of the code. Blocking the merge before explicit check
visibilityThreshold = 0.1f, | ||
delayedRatio = delayedRatio, | ||
) | ||
dampingRatio = 0.7f, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's reset formatting to avoid merge conflicts (in the other files too)
@@ -292,6 +292,7 @@ WEAR_TILES = { group = "androidx.wear.tiles", atomicGroupVersion = "versions.WEA | |||
WEAR_WATCHFACE = { group = "androidx.wear.watchface", atomicGroupVersion = "versions.WEAR_WATCHFACE" } | |||
WEBKIT = { group = "androidx.webkit", atomicGroupVersion = "versions.WEBKIT" } | |||
WINDOW = { group = "androidx.window", atomicGroupVersion = "versions.WINDOW" } | |||
WINDOW_CORE = { group = "org.jetbrains.window.core", atomicGroupVersion = "versions.WINDOW", overrideInclude = [ ":window:window-core" ] } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is because we don't merge window
and libversions
to jb-main, they can be old. The actual state is in integration
, but as with any other lib we merge only released commits to jb-main
…nfigure publication.
…d configure publication.
…rial3:adaptive:adaptive-navigation` API.
It was pinned in the original `androidx.compose.material3.adaptive` module dependencies
f10cc9f
to
a986c98
Compare
Commonize and configure publishing for - `:compose:material3:adaptive:adaptive` - `:compose:material3:adaptive:adaptive-layout` - `:compose:material3:adaptive:adaptive-navigation` - `:window:window-core` modules. Added new method to non-android source set to get `WindowAdaptiveInfo`. Fixes https://youtrack.jetbrains.com/issue/CMP-5817 ## Testing Checked it in the MPP demo app: <img width="600" alt="image" src="https://github.com/user-attachments/assets/e2dbe01f-1481-4e4f-ab9d-e2641bc441d0"> ## Release Notes ### Features - Multiple Platforms - Commonized `:compose:material3:adaptive:adaptive`, `:compose:material3:adaptive:adaptive-layout`, `:compose:material3:adaptive:adaptive-navigation` and `:window:window-core` modules
Commonize and configure publishing for
:compose:material3:adaptive:adaptive
:compose:material3:adaptive:adaptive-layout
:compose:material3:adaptive:adaptive-navigation
:window:window-core
modules.
Added new method to non-android source set to get
WindowAdaptiveInfo
.Fixes https://youtrack.jetbrains.com/issue/CMP-5817
Testing
Checked it in the MPP demo app:
![image](https://private-user-images.githubusercontent.com/3532155/353499902-e2dbe01f-1481-4e4f-ab9d-e2641bc441d0.png?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MjU4NDI5NzgsIm5iZiI6MTcyNTg0MjY3OCwicGF0aCI6Ii8zNTMyMTU1LzM1MzQ5OTkwMi1lMmRiZTAxZi0xNDgxLTRlNGYtYWI5ZC1lMjY0MWJjNDQxZDAucG5nP1gtQW16LUFsZ29yaXRobT1BV1M0LUhNQUMtU0hBMjU2JlgtQW16LUNyZWRlbnRpYWw9QUtJQVZDT0RZTFNBNTNQUUs0WkElMkYyMDI0MDkwOSUyRnVzLWVhc3QtMSUyRnMzJTJGYXdzNF9yZXF1ZXN0JlgtQW16LURhdGU9MjAyNDA5MDlUMDA0NDM4WiZYLUFtei1FeHBpcmVzPTMwMCZYLUFtei1TaWduYXR1cmU9YzhkMjI2N2I2M2FkOGRiNjQ4OTA2ZjUxYjI3MTg0NGY5MTVhOThmNGVhNGMxNWZjYTA3MmUxZDNjMmQxODY4ZiZYLUFtei1TaWduZWRIZWFkZXJzPWhvc3QmYWN0b3JfaWQ9MCZrZXlfaWQ9MCZyZXBvX2lkPTAifQ.uKK9XhOwt3lkJlMpcHqY8HWAiiJt6agAgG0YVwNQHOY)
Release Notes
Features - Multiple Platforms
:compose:material3:adaptive:adaptive
,:compose:material3:adaptive:adaptive-layout
,:compose:material3:adaptive:adaptive-navigation
and:window:window-core
modules