Skip to content

Commit

Permalink
RUM-3793: downgrading navigation lib in order to keep tests working
Browse files Browse the repository at this point in the history
  • Loading branch information
@satween
satween committed Dec 24, 2024
1 parent b5ccab9 commit 8ef274c
Show file tree
Hide file tree
Showing 8 changed files with 69 additions and 63 deletions.
4 changes: 2 additions & 2 deletions ...droid/sessionreplay/compose/internal/mappers/semantics/AbstractSemanticsNodeMapperTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith
import org.junit.jupiter.api.extension.Extensions
import org.mockito.Mock
import org.mockito.Mockito.mock
import org.mockito.junit.jupiter.MockitoExtension
import org.mockito.junit.jupiter.MockitoSettings
import org.mockito.kotlin.doReturn
import org.mockito.kotlin.mock
import org.mockito.kotlin.whenever
import org.mockito.quality.Strictness
import kotlin.math.roundToInt
Expand Down Expand Up @@ -169,7 +169,7 @@ internal open class AbstractSemanticsNodeMapperTest {
}

protected fun mockSemanticsNodeWithBound(additionalMock: SemanticsNode.() -> Unit = {}): SemanticsNode {
return mock<SemanticsNode?>().apply {
return mock<SemanticsNode>().apply {
whenever(id) doReturn fakeSemanticsId
whenever(boundsInRoot) doReturn fakeBounds
whenever(layoutInfo) doReturn mockLayoutInfo
Expand Down
82 changes: 41 additions & 41 deletions features/dd-sdk-android-session-replay-compose/transitiveDependencies
View file
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
Dependencies List

androidx.activity:activity-compose:1.8.0 : 1108 Kb
androidx.activity:activity-ktx:1.8.0 : 24 Kb
androidx.activity:activity:1.8.0 : 165 Kb
androidx.annotation:annotation-experimental:1.4.1 : 38 Kb
androidx.activity:activity-compose:1.7.1 : 1082 Kb
androidx.activity:activity-ktx:1.7.1 : 25 Kb
androidx.activity:activity:1.7.1 : 139 Kb
androidx.annotation:annotation-experimental:1.3.0 : 35 Kb
androidx.annotation:annotation-jvm:1.8.2 : 54 Kb
androidx.arch.core:core-common:2.2.0 : 11 Kb
androidx.collection:collection-jvm:1.4.4 : 770 Kb
androidx.compose.animation:animation-android:1.7.3 : 1443 Kb
androidx.compose.animation:animation-core-android:1.7.3 : 1439 Kb
androidx.compose.foundation:foundation-android:1.7.3 : 4 Mb
androidx.compose.foundation:foundation-layout-android:1.7.3 : 630 Kb
androidx.compose.material:material-android:1.7.3 : 2 Mb
androidx.compose.material:material-ripple-android:1.7.3 : 93 Kb
androidx.compose.runtime:runtime-android:1.7.3 : 2 Mb
androidx.compose.runtime:runtime-saveable-android:1.7.3 : 1090 Kb
androidx.compose.ui:ui-android:1.7.3 : 4 Mb
androidx.compose.ui:ui-geometry-android:1.7.3 : 39 Kb
androidx.compose.ui:ui-graphics-android:1.7.3 : 1595 Kb
androidx.compose.ui:ui-text-android:1.7.3 : 820 Kb
androidx.compose.ui:ui-tooling-android:1.7.3 : 229 Kb
androidx.compose.ui:ui-tooling-data-android:1.7.3 : 36 Kb
androidx.compose.ui:ui-tooling-preview-android:1.7.3 : 16 Kb
androidx.compose.ui:ui-unit-android:1.7.3 : 88 Kb
androidx.compose.ui:ui-util-android:1.7.3 : 15 Kb
androidx.core:core-ktx:1.13.1 : 167 Kb
androidx.core:core:1.13.1 : 1240 Kb
androidx.lifecycle:lifecycle-common-jvm:2.8.3 : 55 Kb
androidx.lifecycle:lifecycle-livedata-core:2.8.3 : 29 Kb
androidx.lifecycle:lifecycle-runtime-android:2.8.3 : 80 Kb
androidx.lifecycle:lifecycle-runtime-compose-android:2.8.3 : 57 Kb
androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.3 : 1333 b
androidx.lifecycle:lifecycle-viewmodel-android:2.8.3 : 55 Kb
androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.3 : 22 Kb
androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.3 : 1343 b
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.3 : 36 Kb
androidx.navigation:navigation-common-ktx:2.8.0 : 5 Kb
androidx.navigation:navigation-common:2.8.0 : 277 Kb
androidx.navigation:navigation-compose:2.8.0 : 1189 Kb
androidx.navigation:navigation-runtime-ktx:2.8.0 : 5 Kb
androidx.navigation:navigation-runtime:2.8.0 : 148 Kb
androidx.collection:collection-jvm:1.4.3 : 770 Kb
androidx.compose.animation:animation-android:1.5.4 : 1309 Kb
androidx.compose.animation:animation-core-android:1.5.4 : 1338 Kb
androidx.compose.foundation:foundation-android:1.5.4 : 3 Mb
androidx.compose.foundation:foundation-layout-android:1.5.4 : 525 Kb
androidx.compose.material:material-android:1.5.4 : 2 Mb
androidx.compose.material:material-icons-core-android:1.5.4 : 700 Kb
androidx.compose.material:material-ripple-android:1.5.4 : 73 Kb
androidx.compose.runtime:runtime-android:1.5.4 : 2 Mb
androidx.compose.runtime:runtime-saveable-android:1.5.4 : 1087 Kb
androidx.compose.ui:ui-android:1.5.4 : 4 Mb
androidx.compose.ui:ui-geometry-android:1.5.4 : 36 Kb
androidx.compose.ui:ui-graphics-android:1.5.4 : 1422 Kb
androidx.compose.ui:ui-text-android:1.5.4 : 770 Kb
androidx.compose.ui:ui-tooling-android:1.5.4 : 222 Kb
androidx.compose.ui:ui-tooling-data-android:1.5.4 : 36 Kb
androidx.compose.ui:ui-tooling-preview-android:1.5.4 : 13 Kb
androidx.compose.ui:ui-unit-android:1.5.4 : 64 Kb
androidx.core:core-ktx:1.10.0 : 178 Kb
androidx.core:core:1.10.0 : 1219 Kb
androidx.lifecycle:lifecycle-common-java8:2.6.2 : 261 b
androidx.lifecycle:lifecycle-common:2.6.2 : 51 Kb
androidx.lifecycle:lifecycle-livedata-core:2.6.2 : 11 Kb
androidx.lifecycle:lifecycle-runtime-ktx:2.6.2 : 60 Kb
androidx.lifecycle:lifecycle-runtime:2.6.2 : 21 Kb
androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2 : 21 Kb
androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2 : 4 Kb
androidx.lifecycle:lifecycle-viewmodel-savedstate:2.6.2 : 38 Kb
androidx.lifecycle:lifecycle-viewmodel:2.6.2 : 38 Kb
androidx.navigation:navigation-common-ktx:2.7.7 : 2 Kb
androidx.navigation:navigation-common:2.7.7 : 180 Kb
androidx.navigation:navigation-compose:2.7.7 : 1139 Kb
androidx.navigation:navigation-runtime-ktx:2.7.7 : 2 Kb
androidx.navigation:navigation-runtime:2.7.7 : 126 Kb
androidx.savedstate:savedstate-ktx:1.2.1 : 3 Kb
androidx.savedstate:savedstate:1.2.1 : 19 Kb
androidx.versionedparcelable:versionedparcelable:1.1.1 : 30 Kb
com.google.code.gson:gson:2.10.1 : 276 Kb
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.10 : 959 b
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.10 : 965 b
org.jetbrains.kotlin:kotlin-stdlib:1.9.24 : 1678 Kb
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 : 20 Kb
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 : 1514 Kb
org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 : 20 Kb
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 : 1512 Kb
org.jetbrains:annotations:23.0.0 : 28 Kb

Total transitive dependencies size : 30 Mb
Total transitive dependencies size : 28 Mb

5 changes: 2 additions & 3 deletions gradle/libs.versions.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ androidToolsPlugin = "8.6.1"
androidXAnnotations = "1.8.2"
androidXAppCompat = "1.6.1"
androidXCollection = "1.4.3"
androidXComposeBom = "2024.09.03"
androidXComposeBom = "2023.10.01"
androidXComposeCompilerExtension = "1.5.14"
androidXComposeNavigation = "2.8.0"
androidXComposeNavigation = "2.7.7"
androidXComposeRuntime = "1.5.14"
androidXConstraintLayout = "2.2.0"
androidXCore = "1.15.0"
Expand Down Expand Up @@ -157,7 +157,6 @@ androidXComposeRuntime = { module = "androidx.compose.runtime:runtime" }
androidXComposeUi = { module = "androidx.compose.ui:ui" }
androidXComposeUiTooling = { module = "androidx.compose.ui:ui-tooling" }
androidXComposeMaterial = { module = "androidx.compose.material:material" }
androidXComposeMaterialIconsCore = { module = "androidx.compose.material:material-icons-core" }
material3Android = { group = "androidx.compose.material3", name = "material3", version.ref = "material3Android" }

# DD-TRACE-OT
Expand Down
4 changes: 4 additions & 0 deletions integrations/dd-sdk-android-compose/api/apiSurface
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ fun trackClick(String, Map<String, Any?> = remember { emptyMap() }, com.datadog.
fun TrackInteractionEffect(String, androidx.compose.foundation.interaction.InteractionSource, InteractionType, Map<String, Any?> = emptyMap(), com.datadog.android.api.SdkCore = Datadog.getInstance())
sealed class com.datadog.android.compose.InteractionType
class Swipe<T: Any> : InteractionType
DEPRECATED constructor(androidx.compose.material.SwipeableState<T>, androidx.compose.foundation.gestures.Orientation, Boolean = false)
constructor(androidx.compose.foundation.gestures.AnchoredDraggableState<T>, androidx.compose.foundation.gestures.Orientation, Boolean = false)
val currentValue: T
val targetValue: T
val offset: Float
class Scroll : InteractionType
constructor(androidx.compose.foundation.gestures.ScrollableState, androidx.compose.foundation.gestures.Orientation, Boolean = false)
fun NavigationViewTrackingEffect(androidx.navigation.NavController, Boolean = true, com.datadog.android.rum.tracking.ComponentPredicate<androidx.navigation.NavDestination> = AcceptAllNavDestinations(), com.datadog.android.api.SdkCore = Datadog.getInstance())
3 changes: 2 additions & 1 deletion ...ons/dd-sdk-android-compose/src/main/kotlin/com/datadog/android/compose/InteractionType.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/
@file:OptIn(ExperimentalMaterialApi::class)
// suppressing deprecation for backward compatibility with SwipeableState

package com.datadog.android.compose

Expand All @@ -30,7 +31,7 @@ sealed class InteractionType {
) : InteractionType() {

/**
* Deprecated. Prefer using constructor with AnchoredDraggableState instance
* Deprecated. Prefer using constructor with [AnchoredDraggableState] instance
*
* Swipe interaction type.
*
Expand Down
2 changes: 2 additions & 0 deletions ...e/src/test/kotlin/com/datadog/android/compose/internal/SwipeAndScrollActionTrackerTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
* This product includes software developed at Datadog (https://www.datadoghq.com/).
* Copyright 2016-Present Datadog, Inc.
*/
// suppressing deprecation for backward compatibility with SwipeableState
@file:Suppress("DEPRECATION")

package com.datadog.android.compose.internal

Expand Down
31 changes: 16 additions & 15 deletions integrations/dd-sdk-android-compose/transitiveDependencies
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,22 @@ androidx.activity:activity:1.8.1 : 165 Kb
androidx.annotation:annotation-experimental:1.4.1 : 38 Kb
androidx.annotation:annotation-jvm:1.8.2 : 54 Kb
androidx.arch.core:core-common:2.2.0 : 11 Kb
androidx.collection:collection-jvm:1.4.4 : 770 Kb
androidx.compose.animation:animation-android:1.7.3 : 1443 Kb
androidx.compose.animation:animation-core-android:1.7.3 : 1439 Kb
androidx.compose.foundation:foundation-android:1.7.3 : 4 Mb
androidx.compose.foundation:foundation-layout-android:1.7.3 : 630 Kb
androidx.compose.material:material-android:1.7.3 : 2 Mb
androidx.compose.material:material-ripple-android:1.7.3 : 93 Kb
androidx.compose.runtime:runtime-android:1.7.3 : 2 Mb
androidx.compose.runtime:runtime-saveable-android:1.7.3 : 1090 Kb
androidx.compose.ui:ui-android:1.7.3 : 4 Mb
androidx.compose.ui:ui-geometry-android:1.7.3 : 39 Kb
androidx.compose.ui:ui-graphics-android:1.7.3 : 1595 Kb
androidx.compose.ui:ui-text-android:1.7.3 : 820 Kb
androidx.compose.ui:ui-unit-android:1.7.3 : 88 Kb
androidx.compose.ui:ui-util-android:1.7.3 : 15 Kb
androidx.collection:collection-jvm:1.4.3 : 770 Kb
androidx.compose.animation:animation-android:1.7.0 : 1443 Kb
androidx.compose.animation:animation-core-android:1.7.0 : 1438 Kb
androidx.compose.foundation:foundation-android:1.7.0 : 4 Mb
androidx.compose.foundation:foundation-layout-android:1.7.0 : 631 Kb
androidx.compose.material:material-android:1.5.4 : 2 Mb
androidx.compose.material:material-icons-core-android:1.5.4 : 700 Kb
androidx.compose.material:material-ripple-android:1.5.4 : 73 Kb
androidx.compose.runtime:runtime-android:1.7.0 : 2 Mb
androidx.compose.runtime:runtime-saveable-android:1.7.0 : 1090 Kb
androidx.compose.ui:ui-android:1.7.0 : 4 Mb
androidx.compose.ui:ui-geometry-android:1.7.0 : 39 Kb
androidx.compose.ui:ui-graphics-android:1.7.0 : 1595 Kb
androidx.compose.ui:ui-text-android:1.7.0 : 820 Kb
androidx.compose.ui:ui-unit-android:1.7.0 : 88 Kb
androidx.compose.ui:ui-util-android:1.7.0 : 15 Kb
androidx.core:core-ktx:1.15.0 : 171 Kb
androidx.core:core:1.15.0 : 1304 Kb
androidx.lifecycle:lifecycle-common-jvm:2.8.3 : 55 Kb
Expand Down
1 change: 0 additions & 1 deletion sample/benchmark/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ dependencies {
implementation(libs.bundles.androidXNavigation)
implementation(libs.androidXAppCompat)
implementation(libs.androidXConstraintLayout)
implementation(libs.androidXComposeMaterialIconsCore)
implementation(libs.googleMaterial)
implementation(libs.glideCore)
implementation(libs.timber)
Expand Down

0 comments on commit 8ef274c

Please sign in to comment.