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.

Sign up for GitHub

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

chore(compose): Use beta bom of compose #1460

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+92 −87
Draft

chore(compose): Use beta bom of compose #1460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a13ed14
chore(compose): Use beta bom of compose
soulcramer Jan 31, 2025
3aa24ad
fix: clean warnings and deprecated code from beta upgrade
soulcramer Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion catalog/src/main/kotlin/com/adevinta/spark/catalog/icons/IconExampleScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ internal fun IconExampleScreen(
modifier = Modifier
.size(128.dp)
.sharedElement(
state = sharedTransitionScope.rememberSharedContentState(key = "icon-$name"),
sharedContentState = sharedTransitionScope.rememberSharedContentState(key = "icon-$name"),
animatedVisibilityScope = animatedContentScope,
),
atEnd = atEnd,
Expand Down
4 changes: 3 additions & 1 deletion catalog/src/main/kotlin/com/adevinta/spark/catalog/icons/IconsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,9 @@ public fun IconsScreen(
contentDescription = null,
modifier = Modifier
.sharedElement(
state = sharedTransitionScope.rememberSharedContentState(key = "icon-$iconName"),
sharedContentState = sharedTransitionScope.rememberSharedContentState(
key = "icon-$iconName",
),
animatedVisibilityScope = animatedContentScope,
)
.size(40.dp),
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
# https://androidx.tech/artifacts/appcompat/appcompat-resources/
androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appCompat" }
androidx-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "androidx-appCompat" }
androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
androidx-compose-bom = { module = "androidx.compose:compose-bom-beta", version.ref = "androidx-compose-bom" }
androidx-compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics" }
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation" }
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout" }
Expand Down
77 changes: 39 additions & 38 deletions spark-icons/dependencies/releaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
androidx.activity:activity-ktx:1.7.0
androidx.activity:activity:1.7.0
androidx.annotation:annotation-experimental:1.4.1
androidx.annotation:annotation-jvm:1.8.1
androidx.annotation:annotation:1.8.1
androidx.annotation:annotation-jvm:1.9.1
androidx.annotation:annotation:1.9.1
androidx.appcompat:appcompat-resources:1.7.0
androidx.arch.core:core-common:2.2.0
androidx.arch.core:core-runtime:2.2.0
androidx.autofill:autofill:1.0.0
androidx.collection:collection-jvm:1.4.4
androidx.collection:collection-ktx:1.4.4
androidx.collection:collection:1.4.4
androidx.compose.runtime:runtime-android:1.7.7
androidx.compose.runtime:runtime-saveable-android:1.7.7
androidx.compose.runtime:runtime-saveable:1.7.7
androidx.compose.runtime:runtime:1.7.7
androidx.compose.ui:ui-android:1.7.7
androidx.compose.ui:ui-geometry-android:1.7.7
androidx.compose.ui:ui-geometry:1.7.7
androidx.compose.ui:ui-graphics-android:1.7.7
androidx.compose.ui:ui-graphics:1.7.7
androidx.compose.ui:ui-text-android:1.7.7
androidx.compose.ui:ui-text:1.7.7
androidx.compose.ui:ui-unit-android:1.7.7
androidx.compose.ui:ui-unit:1.7.7
androidx.compose.ui:ui-util-android:1.7.7
androidx.compose.ui:ui-util:1.7.7
androidx.compose.ui:ui:1.7.7
androidx.compose:compose-bom:2025.01.01
androidx.collection:collection-jvm:1.5.0-beta03
androidx.collection:collection-ktx:1.5.0-beta03
androidx.collection:collection:1.5.0-beta03
androidx.compose.runtime:runtime-android:1.8.0-beta01
androidx.compose.runtime:runtime-saveable-android:1.8.0-beta01
androidx.compose.runtime:runtime-saveable:1.8.0-beta01
androidx.compose.runtime:runtime:1.8.0-beta01
androidx.compose.ui:ui-android:1.8.0-beta01
androidx.compose.ui:ui-geometry-android:1.8.0-beta01
androidx.compose.ui:ui-geometry:1.8.0-beta01
androidx.compose.ui:ui-graphics-android:1.8.0-beta01
androidx.compose.ui:ui-graphics:1.8.0-beta01
androidx.compose.ui:ui-text-android:1.8.0-beta01
androidx.compose.ui:ui-text:1.8.0-beta01
androidx.compose.ui:ui-unit-android:1.8.0-beta01
androidx.compose.ui:ui-unit:1.8.0-beta01
androidx.compose.ui:ui-util-android:1.8.0-beta01
androidx.compose.ui:ui-util:1.8.0-beta01
androidx.compose.ui:ui:1.8.0-beta01
androidx.compose:compose-bom-beta:2025.01.01
androidx.concurrent:concurrent-futures:1.1.0
androidx.core:core-ktx:1.12.0
androidx.core:core:1.12.0
androidx.customview:customview-poolingcontainer:1.0.0
androidx.emoji2:emoji2:1.2.0
androidx.emoji2:emoji2:1.4.0
androidx.graphics:graphics-path:1.0.1
androidx.interpolator:interpolator:1.0.0
androidx.lifecycle:lifecycle-common-jvm:2.8.3
androidx.lifecycle:lifecycle-common:2.8.3
androidx.lifecycle:lifecycle-livedata-core:2.8.3
androidx.lifecycle:lifecycle-process:2.8.3
androidx.lifecycle:lifecycle-runtime-android:2.8.3
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3
androidx.lifecycle:lifecycle-runtime-compose:2.8.3
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3
androidx.lifecycle:lifecycle-runtime-ktx:2.8.3
androidx.lifecycle:lifecycle-runtime:2.8.3
androidx.lifecycle:lifecycle-viewmodel-android:2.8.3
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3
androidx.lifecycle:lifecycle-viewmodel:2.8.3
androidx.profileinstaller:profileinstaller:1.3.1
androidx.lifecycle:lifecycle-common-jvm:2.8.7
androidx.lifecycle:lifecycle-common:2.8.7
androidx.lifecycle:lifecycle-livedata-core:2.8.7
androidx.lifecycle:lifecycle-process:2.8.7
androidx.lifecycle:lifecycle-runtime-android:2.8.7
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.7
androidx.lifecycle:lifecycle-runtime-compose:2.8.7
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.7
androidx.lifecycle:lifecycle-runtime-ktx:2.8.7
androidx.lifecycle:lifecycle-runtime:2.8.7
androidx.lifecycle:lifecycle-viewmodel-android:2.8.7
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.7
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.7
androidx.lifecycle:lifecycle-viewmodel:2.8.7
androidx.profileinstaller:profileinstaller:1.4.0
androidx.savedstate:savedstate-ktx:1.2.1
androidx.savedstate:savedstate:1.2.1
androidx.startup:startup-runtime:1.1.1
Expand All @@ -66,3 +66,4 @@ org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
org.jetbrains:annotations:23.0.0
org.jspecify:jspecify:1.0.0
79 changes: 40 additions & 39 deletions spark/dependencies/releaseRuntimeClasspath.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,54 @@ androidx.activity:activity-compose:1.10.0
androidx.activity:activity-ktx:1.10.0
androidx.activity:activity:1.10.0
androidx.annotation:annotation-experimental:1.4.1
androidx.annotation:annotation-jvm:1.8.1
androidx.annotation:annotation:1.8.1
androidx.annotation:annotation-jvm:1.9.1
androidx.annotation:annotation:1.9.1
androidx.appcompat:appcompat-resources:1.7.0
androidx.appcompat:appcompat:1.7.0
androidx.arch.core:core-common:2.2.0
androidx.arch.core:core-runtime:2.2.0
androidx.autofill:autofill:1.0.0
androidx.collection:collection-jvm:1.4.4
androidx.collection:collection-ktx:1.4.4
androidx.collection:collection:1.4.4
androidx.compose.animation:animation-android:1.7.7
androidx.compose.animation:animation-core-android:1.7.7
androidx.compose.animation:animation-core:1.7.7
androidx.compose.animation:animation-graphics-android:1.7.7
androidx.compose.animation:animation-graphics:1.7.7
androidx.compose.animation:animation:1.7.7
androidx.compose.foundation:foundation-android:1.7.7
androidx.compose.foundation:foundation-layout-android:1.7.7
androidx.compose.foundation:foundation-layout:1.7.7
androidx.compose.foundation:foundation:1.7.7
androidx.collection:collection-jvm:1.5.0-beta03
androidx.collection:collection-ktx:1.5.0-beta03
androidx.collection:collection:1.5.0-beta03
androidx.compose.animation:animation-android:1.8.0-beta01
androidx.compose.animation:animation-core-android:1.8.0-beta01
androidx.compose.animation:animation-core:1.8.0-beta01
androidx.compose.animation:animation-graphics-android:1.8.0-beta01
androidx.compose.animation:animation-graphics:1.8.0-beta01
androidx.compose.animation:animation:1.8.0-beta01
androidx.compose.foundation:foundation-android:1.8.0-beta01
androidx.compose.foundation:foundation-layout-android:1.8.0-beta01
androidx.compose.foundation:foundation-layout:1.8.0-beta01
androidx.compose.foundation:foundation:1.8.0-beta01
androidx.compose.material3:material3-android:1.3.1
androidx.compose.material3:material3-window-size-class-android:1.3.1
androidx.compose.material3:material3-window-size-class:1.3.1
androidx.compose.material3:material3:1.3.1
androidx.compose.material:material-icons-core-android:1.7.7
androidx.compose.material:material-icons-core:1.7.7
androidx.compose.material:material-ripple-android:1.7.7
androidx.compose.material:material-ripple:1.7.7
androidx.compose.runtime:runtime-android:1.7.7
androidx.compose.runtime:runtime-saveable-android:1.7.7
androidx.compose.runtime:runtime-saveable:1.7.7
androidx.compose.runtime:runtime:1.7.7
androidx.compose.ui:ui-android:1.7.7
androidx.compose.ui:ui-geometry-android:1.7.7
androidx.compose.ui:ui-geometry:1.7.7
androidx.compose.ui:ui-graphics-android:1.7.7
androidx.compose.ui:ui-graphics:1.7.7
androidx.compose.ui:ui-text-android:1.7.7
androidx.compose.ui:ui-text-google-fonts:1.7.7
androidx.compose.ui:ui-text:1.7.7
androidx.compose.ui:ui-tooling-preview-android:1.7.7
androidx.compose.ui:ui-tooling-preview:1.7.7
androidx.compose.ui:ui-unit-android:1.7.7
androidx.compose.ui:ui-unit:1.7.7
androidx.compose.ui:ui-util-android:1.7.7
androidx.compose.ui:ui-util:1.7.7
androidx.compose.ui:ui:1.7.7
androidx.compose:compose-bom:2025.01.01
androidx.compose.material:material-ripple-android:1.8.0-beta01
androidx.compose.material:material-ripple:1.8.0-beta01
androidx.compose.runtime:runtime-android:1.8.0-beta01
androidx.compose.runtime:runtime-saveable-android:1.8.0-beta01
androidx.compose.runtime:runtime-saveable:1.8.0-beta01
androidx.compose.runtime:runtime:1.8.0-beta01
androidx.compose.ui:ui-android:1.8.0-beta01
androidx.compose.ui:ui-geometry-android:1.8.0-beta01
androidx.compose.ui:ui-geometry:1.8.0-beta01
androidx.compose.ui:ui-graphics-android:1.8.0-beta01
androidx.compose.ui:ui-graphics:1.8.0-beta01
androidx.compose.ui:ui-text-android:1.8.0-beta01
androidx.compose.ui:ui-text-google-fonts:1.8.0-beta01
androidx.compose.ui:ui-text:1.8.0-beta01
androidx.compose.ui:ui-tooling-preview-android:1.8.0-beta01
androidx.compose.ui:ui-tooling-preview:1.8.0-beta01
androidx.compose.ui:ui-unit-android:1.8.0-beta01
androidx.compose.ui:ui-unit:1.8.0-beta01
androidx.compose.ui:ui-util-android:1.8.0-beta01
androidx.compose.ui:ui-util:1.8.0-beta01
androidx.compose.ui:ui:1.8.0-beta01
androidx.compose:compose-bom-beta:2025.01.01
androidx.concurrent:concurrent-futures:1.1.0
androidx.constraintlayout:constraintlayout-compose-android:1.1.0
androidx.constraintlayout:constraintlayout-compose:1.1.0
Expand All @@ -61,8 +61,8 @@ androidx.cursoradapter:cursoradapter:1.0.0
androidx.customview:customview-poolingcontainer:1.0.0
androidx.customview:customview:1.0.0
androidx.drawerlayout:drawerlayout:1.0.0
androidx.emoji2:emoji2-views-helper:1.3.0
androidx.emoji2:emoji2:1.3.0
androidx.emoji2:emoji2-views-helper:1.4.0
androidx.emoji2:emoji2:1.4.0
androidx.exifinterface:exifinterface:1.3.7
androidx.fragment:fragment:1.5.4
androidx.graphics:graphics-path:1.0.1
Expand Down Expand Up @@ -118,3 +118,4 @@ org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.1
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1
org.jetbrains:annotations:23.0.0
org.jspecify:jspecify:1.0.0
6 changes: 1 addition & 5 deletions spark/src/main/kotlin/com/adevinta/spark/components/rating/RatingSmall.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalConfiguration
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.semantics.contentDescription
Expand Down Expand Up @@ -205,10 +204,7 @@ internal enum class RatingSize {
}

@Composable
internal fun firstLocale(): Locale {
LocalConfiguration.current
return LocalContext.current.resources.configuration.locales[0]
}
internal fun firstLocale(): Locale = LocalConfiguration.current.locales[0]

@Composable
@Preview(
Expand Down
5 changes: 5 additions & 0 deletions spark/src/main/kotlin/com/adevinta/spark/tools/modifiers/Layout.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
@file:Suppress("DEPRECATION")

package com.adevinta.spark.tools.modifiers

import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -89,6 +91,9 @@ private class IgnoreParentHorizontalPaddingModifierNode(var horizontalPadding: D
* https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/ui/ui/integration-tests/ui-demos/src/main/java/androidx/compose/ui/demos/autofill/ExplicitAutofillTypesDemo.kt
* TODO-@Soulcramer (03-51-2023): Replace by official implementation on b/176949051
*/
@Deprecated(
"The official impl is now available! Use the new semantics-based API and androidx.compose.ui.autofill.ContentType instead.",
)
@Composable
@ExperimentalComposeUiApi
public fun Autofill(
Expand Down
4 changes: 2 additions & 2 deletions spark/src/main/kotlin/com/adevinta/spark/tools/modifiers/Semantics.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
package com.adevinta.spark.tools.modifiers

import androidx.compose.ui.Modifier
import androidx.compose.ui.semantics.invisibleToUser
import androidx.compose.ui.semantics.hideFromAccessibility
import androidx.compose.ui.semantics.semantics

public fun Modifier.invisibleSemantic(): Modifier =
semantics { invisibleToUser() }
semantics { hideFromAccessibility() }
Loading