Merge fcb448d into e5bbb00

romtsn · web-flow · commit 9a990f42fe60 · 2023-03-01T12:00:50.000Z
diff --git a/sentry-compose/build.gradle.kts b/sentry-compose/build.gradle.kts
@@ -38,10 +38,9 @@ kotlin {
     sourceSets {
         val commonMain by getting {
             dependencies {
-                api(compose.runtime)
-                api(compose.ui)
+                compileOnly(compose.runtime)
+                compileOnly(compose.ui)
 
-                implementation(Config.Libs.kotlinStdLib)
                 api(projects.sentryComposeHelper)
             }
         }
@@ -50,7 +49,7 @@ kotlin {
                 api(projects.sentry)
                 api(projects.sentryAndroidNavigation)
 
-                api(Config.Libs.composeNavigation)
+                compileOnly(Config.Libs.composeNavigation)
                 implementation(Config.Libs.lifecycleCommonJava8)
             }
         }
@@ -59,6 +58,7 @@ kotlin {
                 implementation(Config.TestLibs.kotlinTestJunit)
                 implementation(Config.TestLibs.mockitoKotlin)
                 implementation(Config.TestLibs.mockitoInline)
+                implementation(Config.Libs.composeNavigation)
             }
         }
     }
diff --git a/sentry-compose/proguard-rules.pro b/sentry-compose/proguard-rules.pro
@@ -4,6 +4,13 @@
 -keep class io.sentry.compose.gestures.ComposeGestureTargetLocator { <init>(...); }
 -keepnames interface androidx.compose.ui.node.Owner
 
+# R8 will warn about missing classes if people don't have androidx.compose-navigation on their
+# classpath, but this is fine, these classes are used in an internal class which is only used when
+# someone is using withSentryObservableEffect extension function (which, in turn, cannot be used
+# without having androidx.compose-navigation on the classpath)
+-dontwarn androidx.navigation.NavController$OnDestinationChangedListener
+-dontwarn androidx.navigation.NavController
+
 # To ensure that stack traces is unambiguous
 # https://developer.android.com/studio/build/shrink-code#decode-stack-trace
 -keepattributes LineNumberTable,SourceFile
diff --git a/sentry/src/main/java/io/sentry/SentryOptions.java b/sentry/src/main/java/io/sentry/SentryOptions.java
@@ -1660,7 +1660,7 @@ public void setProfilesSampler(final @Nullable ProfilesSamplerCallback profilesS
 
   /**
    * Sets the profilesSampleRate. Can be anything between 0.0 and 1.0 or null (default), to disable
-   * it. It’s dependent on the {{@link SentryOptions#setTracesSampleRate(Double)} } If a transaction
+   * it. It's dependent on the {{@link SentryOptions#setTracesSampleRate(Double)} } If a transaction
    * is sampled, then a profile could be sampled with a probability given by profilesSampleRate.
    *
    * @param profilesSampleRate the sample rate

Original file line number	Diff line number	Diff line change
`@@ -38,10 +38,9 @@ kotlin {`
`38`	`38`	`sourceSets {`
`39`	`39`	`val commonMain by getting {`
`40`	`40`	`dependencies {`
`41`		`- api(compose.runtime)`
`42`		`- api(compose.ui)`
	`41`	`+ compileOnly(compose.runtime)`
	`42`	`+ compileOnly(compose.ui)`
`43`	`43`
`44`		`- implementation(Config.Libs.kotlinStdLib)`
`45`	`44`	`api(projects.sentryComposeHelper)`
`46`	`45`	`}`
`47`	`46`	`}`
`@@ -50,7 +49,7 @@ kotlin {`
`50`	`49`	`api(projects.sentry)`
`51`	`50`	`api(projects.sentryAndroidNavigation)`
`52`	`51`
`53`		`- api(Config.Libs.composeNavigation)`
	`52`	`+ compileOnly(Config.Libs.composeNavigation)`
`54`	`53`	`implementation(Config.Libs.lifecycleCommonJava8)`
`55`	`54`	`}`
`56`	`55`	`}`
`@@ -59,6 +58,7 @@ kotlin {`
`59`	`58`	`implementation(Config.TestLibs.kotlinTestJunit)`
`60`	`59`	`implementation(Config.TestLibs.mockitoKotlin)`
`61`	`60`	`implementation(Config.TestLibs.mockitoInline)`
	`61`	`+ implementation(Config.Libs.composeNavigation)`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1660,7 +1660,7 @@ public void setProfilesSampler(final @Nullable ProfilesSamplerCallback profilesS`
`1660`	`1660`
`1661`	`1661`	`/**`
`1662`	`1662`	`* Sets the profilesSampleRate. Can be anything between 0.0 and 1.0 or null (default), to disable`
`1663`		`- * it. It’s dependent on the {{@link SentryOptions#setTracesSampleRate(Double)} } If a transaction`
	`1663`	`+ * it. It's dependent on the {{@link SentryOptions#setTracesSampleRate(Double)} } If a transaction`
`1664`	`1664`	`* is sampled, then a profile could be sampled with a probability given by profilesSampleRate.`
`1665`	`1665`	`*`
`1666`	`1666`	`* @param profilesSampleRate the sample rate`