Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Clean up
  • Loading branch information
romtsn committed Sep 30, 2024
commit 337677d346bf6958125d2edb7da240f3293d0c2e
4 changes: 4 additions & 0 deletions buildSrc/src/main/java/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,12 @@ object Config {
val composeActivity = "androidx.activity:activity-compose:1.4.0"
val composeFoundation = "androidx.compose.foundation:foundation:$composeVersion"
val composeUi = "androidx.compose.ui:ui:$composeVersion"

// Note: don't change without testing forwards compatibility
val composeUiReplay = "androidx.compose.ui:ui:1.5.0"
val composeFoundationLayout = "androidx.compose.foundation:foundation-layout:$composeVersion"
val composeMaterial = "androidx.compose.material3:material3:1.0.0-alpha13"
val composeCoil = "io.coil-kt:coil-compose:2.6.0"

val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"

Expand Down
2 changes: 1 addition & 1 deletion sentry-android-replay/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ kotlin {
dependencies {
api(projects.sentry)

compileOnly("androidx.compose.ui:ui:1.5.0")
compileOnly(Config.Libs.composeUiReplay)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))

// tests
Expand Down
2 changes: 1 addition & 1 deletion sentry-samples/sentry-samples-android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,12 @@ dependencies {
implementation(Config.Libs.retrofit2)
implementation(Config.Libs.retrofit2Gson)

implementation("io.coil-kt:coil-compose:2.6.0")
implementation(Config.Libs.composeActivity)
implementation(Config.Libs.composeFoundation)
implementation(Config.Libs.composeFoundationLayout)
implementation(Config.Libs.composeNavigation)
implementation(Config.Libs.composeMaterial)
implementation(Config.Libs.composeCoil)

debugImplementation(Config.Libs.leakCanary)
}
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ fun Github(
)
AsyncImage(
model = "https://i.imgur.com/tie6A3J.jpeg",
contentDescription = "IMG",
contentDescription = null,
modifier = Modifier.padding(vertical = 16.dp)
)
TextField(
Expand Down
9 changes: 0 additions & 9 deletions sentry/api/sentry.api
Original file line number Diff line number Diff line change
Expand Up @@ -1671,14 +1671,6 @@ public final class io/sentry/PropagationContext {
public fun traceContext ()Lio/sentry/TraceContext;
}

public final class io/sentry/ReplayApi {
public fun <init> (Lio/sentry/ReplayController;)V
public fun getReplayId ()Lio/sentry/protocol/SentryId;
public fun isRecording ()Z
public fun pause ()V
public fun resume ()V
}

public abstract interface class io/sentry/ReplayBreadcrumbConverter {
public abstract fun convert (Lio/sentry/Breadcrumb;)Lio/sentry/rrweb/RRWebEvent;
}
Expand Down Expand Up @@ -1901,7 +1893,6 @@ public final class io/sentry/Sentry {
public static fun pushScope ()V
public static fun removeExtra (Ljava/lang/String;)V
public static fun removeTag (Ljava/lang/String;)V
public static fun replay ()Lio/sentry/ReplayApi;
public static fun reportFullDisplayed ()V
public static fun reportFullyDisplayed ()V
public static fun setCurrentHub (Lio/sentry/IHub;)V
Expand Down
33 changes: 0 additions & 33 deletions sentry/src/main/java/io/sentry/ReplayApi.java

This file was deleted.

7 changes: 0 additions & 7 deletions sentry/src/main/java/io/sentry/Sentry.java
Original file line number Diff line number Diff line change
Expand Up @@ -985,13 +985,6 @@ public static MetricsApi metrics() {
return getCurrentHub().metrics();
}

/** the replay API for the current hub */
@NotNull
@ApiStatus.Experimental
public static ReplayApi replay() {
return new ReplayApi(getCurrentHub().getOptions().getReplayController());
}

/**
* Configuration options callback
*
Expand Down