Skip to content

Commit 3363fdc

Browse files
markushimarkushi
authored
Merge 27fa99f into a19335c 
2 parents a19335c + 27fa99f commit 3363fdc

File tree

12 files changed

+1054
-781
lines changed

12 files changed

+1054
-781
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
- Update Android targetSdk to API 36 (Android 16) ([#5016](https://github.com/getsentry/sentry-java/pull/5016))
88

9+
### Fixes
10+
11+
- Fix scroll target detection for Jetpack Compose ([#5017](https://github.com/getsentry/sentry-java/pull/5017))
12+
913
### Internal
1014

1115
- Establish new native exception mechanisms to differentiate events generated by `sentry-native` from `ApplicationExitInfo`. ([#5052](https://github.com/getsentry/sentry-java/pull/5052))

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
99

1010
# AndroidX required by AGP >= 3.6.x
1111
android.useAndroidX=true
12+
android.experimental.lint.version=8.9.0
1213

1314
# Release information
1415
versionName=8.31.0

‎gradle/libs.versions.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,9 @@ androidx-annotation = { module = "androidx.annotation:annotation", version = "1.
8282
androidx-activity-compose = { module = "androidx.activity:activity-compose", version = "1.8.2" }
8383
androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "androidxCompose" }
8484
androidx-compose-foundation-layout = { module = "androidx.compose.foundation:foundation-layout", version.ref = "androidxCompose" }
85-
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.2.1" }
85+
androidx-compose-material3 = { module = "androidx.compose.material3:material3", version = "1.4.0" }
86+
androidx-compose-material-icons-core = { module = "androidx.compose.material:material-icons-core", version="1.7.8" }
87+
androidx-compose-material-icons-extended = { module = "androidx.compose.material:material-icons-extended", version="1.7.8" }
8688
androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "androidxCompose" }
8789
# Note: don't change without testing forwards compatibility
8890
androidx-compose-ui-replay = { module = "androidx.compose.ui:ui", version = "1.5.0" }

‎sentry-android-replay/src/test/java/io/sentry/android/replay/viewhierarchy/ComposeMaskingOptionsTest.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.GenericViewHiera
4343
import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.ImageViewHierarchyNode
4444
import io.sentry.android.replay.viewhierarchy.ViewHierarchyNode.TextViewHierarchyNode
4545
import java.io.File
46+
import java.lang.reflect.InvocationTargetException
4647
import kotlin.test.Test
4748
import kotlin.test.assertEquals
4849
import kotlin.test.assertFalse
@@ -174,9 +175,9 @@ class ComposeMaskingOptionsTest {
174175
@Test
175176
fun `when retrieving the semantics fails, an error is thrown`() {
176177
val node = mock<LayoutNode>()
177-
whenever(node.collapsedSemantics).thenThrow(RuntimeException("Compose Runtime Error"))
178+
whenever(node.semanticsConfiguration).thenThrow(RuntimeException("Compose Runtime Error"))
178179

179-
assertThrows(RuntimeException::class.java) {
180+
assertThrows(InvocationTargetException::class.java) {
180181
ComposeViewHierarchyNode.retrieveSemanticsConfiguration(node)
181182
}
182183
}

‎sentry-compose/src/androidMain/kotlin/io/sentry/compose/gestures/ComposeGestureTargetLocator.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,10 @@ public class ComposeGestureTargetLocator(private val logger: ILogger) : GestureT
8787
"androidx.compose.foundation.CombinedClickableElement" == type
8888
) {
8989
isClickable = true
90-
} else if ("androidx.compose.foundation.ScrollingLayoutElement" == type) {
90+
} else if (
91+
"androidx.compose.foundation.ScrollingLayoutElement" == type ||
92+
"androidx.compose.foundation.ScrollingContainerElement" == type
93+
) {
9194
isScrollable = true
9295
}
9396
}

‎sentry-samples/sentry-samples-android/build.gradle.kts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ dependencies {
142142
implementation(libs.androidx.compose.foundation)
143143
implementation(libs.androidx.compose.foundation.layout)
144144
implementation(libs.androidx.compose.material3)
145+
implementation(libs.androidx.compose.material.icons.core)
146+
implementation(libs.androidx.compose.material.icons.extended)
145147
implementation(libs.androidx.navigation.compose)
146148
implementation(libs.androidx.recyclerview)
147149
implementation(libs.androidx.browser)

0 commit comments

Comments
 (0)