diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt index 924f8c49728..4653debb3f4 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackEntryMapper.kt @@ -1,6 +1,7 @@ package io.sentry.compose.navigation3 import androidx.compose.runtime.snapshots.Snapshot +import io.sentry.compose.navigation3.internal.backstack.BackStackObserver import org.jetbrains.annotations.ApiStatus /** Info about a given back stack entry, suitable for display in Sentry. */ diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/SentryNavEffect.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/SentryNavEffect.kt index 41e2bda95cb..a00dfafeb9c 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/SentryNavEffect.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/SentryNavEffect.kt @@ -9,9 +9,11 @@ import androidx.lifecycle.compose.LocalLifecycleOwner import io.sentry.IScopes import io.sentry.ScopesAdapter import io.sentry.SentryOptions -import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator -import io.sentry.compose.navigation3.lifecycle.NavRootInfo -import io.sentry.compose.navigation3.lifecycle.findActivity +import io.sentry.compose.navigation3.internal.backstack.CoordinatedBackStackObserver +import io.sentry.compose.navigation3.internal.backstack.defaultNavLeaseCoordinator +import io.sentry.compose.navigation3.internal.lifecycle.NavLeaseCoordinator +import io.sentry.compose.navigation3.internal.lifecycle.NavRootInfo +import io.sentry.compose.navigation3.internal.lifecycle.findActivity import org.jetbrains.annotations.ApiStatus /** diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackConverter.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt similarity index 97% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackConverter.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt index 4bd0bd24e57..4e9966bad3a 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackConverter.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverter.kt @@ -1,9 +1,12 @@ -package io.sentry.compose.navigation3 +package io.sentry.compose.navigation3.internal.backstack import io.sentry.ILogger import io.sentry.SentryLevel.WARNING -import io.sentry.compose.navigation3.ArgumentDropReason.Companion.ARGUMENT_DROP_REASON_KEY -import io.sentry.compose.navigation3.NormalizedSentryBackStackEntry.Companion.UNKNOWN_ENTRY_NAME +import io.sentry.compose.navigation3.BackStackEntryMapper +import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper +import io.sentry.compose.navigation3.SentryBackStackEntry +import io.sentry.compose.navigation3.internal.backstack.ArgumentDropReason.Companion.ARGUMENT_DROP_REASON_KEY +import io.sentry.compose.navigation3.internal.backstack.NormalizedSentryBackStackEntry.Companion.UNKNOWN_ENTRY_NAME import io.sentry.util.ExceptionUtils import java.util.IdentityHashMap diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackObserver.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackObserver.kt similarity index 92% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackObserver.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackObserver.kt index d3e92777ce3..1ff3911032e 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/BackStackObserver.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackObserver.kt @@ -1,19 +1,24 @@ -package io.sentry.compose.navigation3 +package io.sentry.compose.navigation3.internal.backstack import io.sentry.Breadcrumb import io.sentry.Hint import io.sentry.SentryIntegrationPackageStorage import io.sentry.SentryLevel.INFO import io.sentry.SentryOptions -import io.sentry.compose.navigation3.BackStackConverter.RetentionPolicy -import io.sentry.compose.navigation3.PreparedChange.BackStackHasNewTop -import io.sentry.compose.navigation3.PreparedChange.BackStackHasSameTop -import io.sentry.compose.navigation3.PreparedChange.BackStackIsEmpty -import io.sentry.compose.navigation3.lifecycle.INavScope -import io.sentry.compose.navigation3.lifecycle.INavScopes -import io.sentry.compose.navigation3.lifecycle.NAVIGATION_CONTEXT_KEY -import io.sentry.compose.navigation3.lifecycle.NAVIGATION_OP -import io.sentry.compose.navigation3.lifecycle.NavTransactionRequest +import io.sentry.compose.navigation3.BackStackKey +import io.sentry.compose.navigation3.BuildConfig +import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper +import io.sentry.compose.navigation3.SentryNavEffect +import io.sentry.compose.navigation3.SentryNavOptions +import io.sentry.compose.navigation3.internal.backstack.BackStackConverter.RetentionPolicy +import io.sentry.compose.navigation3.internal.backstack.PreparedChange.BackStackHasNewTop +import io.sentry.compose.navigation3.internal.backstack.PreparedChange.BackStackHasSameTop +import io.sentry.compose.navigation3.internal.backstack.PreparedChange.BackStackIsEmpty +import io.sentry.compose.navigation3.internal.lifecycle.INavScope +import io.sentry.compose.navigation3.internal.lifecycle.INavScopes +import io.sentry.compose.navigation3.internal.lifecycle.NAVIGATION_CONTEXT_KEY +import io.sentry.compose.navigation3.internal.lifecycle.NAVIGATION_OP +import io.sentry.compose.navigation3.internal.lifecycle.NavTransactionRequest import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion import java.lang.ref.WeakReference diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserver.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/CoordinatedBackStackObserver.kt similarity index 86% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserver.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/CoordinatedBackStackObserver.kt index a01e658e938..7479a1981cf 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserver.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/backstack/CoordinatedBackStackObserver.kt @@ -1,11 +1,13 @@ -package io.sentry.compose.navigation3 +package io.sentry.compose.navigation3.internal.backstack import androidx.lifecycle.LifecycleEventObserver import io.sentry.IScope import io.sentry.IScopes -import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator -import io.sentry.compose.navigation3.lifecycle.NavRootInfo -import io.sentry.compose.navigation3.lifecycle.NavScopes +import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper +import io.sentry.compose.navigation3.SentryNavOptions +import io.sentry.compose.navigation3.internal.lifecycle.NavLeaseCoordinator +import io.sentry.compose.navigation3.internal.lifecycle.NavRootInfo +import io.sentry.compose.navigation3.internal.lifecycle.NavScopes /** * A [BackStackObserver] whose updates to a shared mutable [IScope] are coordinated with those of diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavActivityWatcher.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavActivityWatcher.kt similarity index 98% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavActivityWatcher.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavActivityWatcher.kt index 3c949384f57..2dc1ba5a0d4 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavActivityWatcher.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavActivityWatcher.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import android.app.Activity import android.app.Application diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinator.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavLeaseCoordinator.kt similarity index 99% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinator.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavLeaseCoordinator.kt index 2049b07ecce..650c276fb1d 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinator.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavLeaseCoordinator.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import android.app.Activity import androidx.lifecycle.Lifecycle diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavRootInfo.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavRootInfo.kt similarity index 95% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavRootInfo.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavRootInfo.kt index 01f64bef0d4..10b1fb4e731 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavRootInfo.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavRootInfo.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import android.app.Activity import android.content.Context diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopes.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopes.kt similarity index 99% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopes.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopes.kt index b8115cacafe..d7b1e46554d 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopes.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopes.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import androidx.lifecycle.Lifecycle import io.sentry.Breadcrumb diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavTransactionRequest.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavTransactionRequest.kt similarity index 98% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavTransactionRequest.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavTransactionRequest.kt index 343518b6542..ffe39e13d56 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/NavTransactionRequest.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavTransactionRequest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import io.sentry.IScope import io.sentry.IScopes diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/README.md b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/README.md similarity index 99% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/README.md rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/README.md index 9670faa20f8..c7fe450590d 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/README.md +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/README.md @@ -1,4 +1,4 @@ -# `io.sentry.compose.navigation3.lifecycle` +# `io.sentry.compose.navigation3.internal.lifecycle` Package contains code for coordinating multiple `SentryNavEffect`s and their access to a shared `IScope`, so that overlapping effects (e.g., during Activity or Fragment transitions) don't clobber one another's screen names, nav context, or nav transactions. diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavData.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavData.kt similarity index 98% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavData.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavData.kt index affa1caff61..34801621011 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavData.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavData.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import io.sentry.IScope import io.sentry.PropagationContext diff --git a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavTransaction.kt b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavTransaction.kt similarity index 99% rename from sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavTransaction.kt rename to sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavTransaction.kt index d8ec37f45e3..67b42e7410a 100644 --- a/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavTransaction.kt +++ b/sentry-android-navigation3/src/main/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavTransaction.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import io.sentry.IScope import io.sentry.IScopes diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectLifecycleIntegrationTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectLifecycleIntegrationTest.kt index dc50114f250..a0ca7269f85 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectLifecycleIntegrationTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectLifecycleIntegrationTest.kt @@ -40,8 +40,8 @@ import io.sentry.android.core.ActivityLifecycleIntegration import io.sentry.android.core.BuildInfoProvider import io.sentry.android.core.SentryAndroidOptions import io.sentry.android.core.performance.AppStartMetrics -import io.sentry.compose.navigation3.lifecycle.NAVIGATION_CONTEXT_KEY -import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator +import io.sentry.compose.navigation3.internal.lifecycle.NAVIGATION_CONTEXT_KEY +import io.sentry.compose.navigation3.internal.lifecycle.NavLeaseCoordinator import org.junit.After import org.junit.Test import org.junit.runner.RunWith @@ -56,7 +56,7 @@ import org.robolectric.annotation.Config * Drives real Activities and Fragments through Robolectric so that each `SentryNavEffect` observes * the lifecycle events, and the composition timing, that Android produces when screens hand off to * one another. Lets us test the multi-[SentryNavEffect] policy implemented by our - * `io.sentry.compose.navigation3.lifecycle` package. + * `io.sentry.compose.navigation3.internal.lifecycle` package. * * Activity transitions are driven through [ActivityController]s in the order the framework uses * (e.g., the outgoing Activity pauses before the incoming one is created, and stops after the diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectTest.kt index dd4c3b29392..850802400a4 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/SentryNavEffectTest.kt @@ -33,7 +33,7 @@ import io.sentry.SentryOptions import io.sentry.SentryTracer import io.sentry.TransactionContext import io.sentry.TransactionOptions -import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator +import io.sentry.compose.navigation3.internal.lifecycle.NavLeaseCoordinator import org.junit.Rule import org.junit.Test import org.junit.rules.TestWatcher diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/BackStackConverterTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverterTest.kt similarity index 97% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/BackStackConverterTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverterTest.kt index cb31be75fc7..40f1430ccb4 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/BackStackConverterTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackConverterTest.kt @@ -1,11 +1,14 @@ -package io.sentry.compose.navigation3 +package io.sentry.compose.navigation3.internal.backstack import com.google.common.truth.Truth.assertThat import io.sentry.ILogger import io.sentry.SentryLevel.WARNING -import io.sentry.compose.navigation3.ArgumentDropReason.Companion.ARGUMENT_DROP_REASON_KEY -import io.sentry.compose.navigation3.BackStackConverter.RetentionPolicy -import io.sentry.compose.navigation3.NormalizedSentryBackStackEntry.Companion.UNKNOWN_ENTRY_NAME +import io.sentry.compose.navigation3.BackStackEntryMapper +import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper +import io.sentry.compose.navigation3.SentryBackStackEntry +import io.sentry.compose.navigation3.internal.backstack.ArgumentDropReason.Companion.ARGUMENT_DROP_REASON_KEY +import io.sentry.compose.navigation3.internal.backstack.BackStackConverter.RetentionPolicy +import io.sentry.compose.navigation3.internal.backstack.NormalizedSentryBackStackEntry.Companion.UNKNOWN_ENTRY_NAME import java.util.AbstractCollection import org.junit.Test import org.mockito.kotlin.clearInvocations diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/BackStackObserverTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackObserverTest.kt similarity index 97% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/BackStackObserverTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackObserverTest.kt index df7c9512532..f68eac8ccfa 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/BackStackObserverTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/BackStackObserverTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3 +package io.sentry.compose.navigation3.internal.backstack import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner @@ -18,11 +18,15 @@ import io.sentry.SentryOptions import io.sentry.SentryTracer import io.sentry.TransactionContext import io.sentry.TransactionOptions -import io.sentry.compose.navigation3.ArgumentDropReason.Companion.ARGUMENT_DROP_REASON_KEY -import io.sentry.compose.navigation3.lifecycle.NAVIGATION_CONTEXT_KEY -import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator -import io.sentry.compose.navigation3.lifecycle.NavRootInfo -import io.sentry.compose.navigation3.lifecycle.NavScopes +import io.sentry.compose.navigation3.BackStackEntryMapper +import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper +import io.sentry.compose.navigation3.SentryBackStackEntry +import io.sentry.compose.navigation3.SentryNavOptions +import io.sentry.compose.navigation3.internal.backstack.ArgumentDropReason.Companion.ARGUMENT_DROP_REASON_KEY +import io.sentry.compose.navigation3.internal.lifecycle.NAVIGATION_CONTEXT_KEY +import io.sentry.compose.navigation3.internal.lifecycle.NavLeaseCoordinator +import io.sentry.compose.navigation3.internal.lifecycle.NavRootInfo +import io.sentry.compose.navigation3.internal.lifecycle.NavScopes import io.sentry.protocol.App import io.sentry.protocol.TransactionNameSource import org.junit.Test diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserverTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/CoordinatedBackStackObserverTest.kt similarity index 97% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserverTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/CoordinatedBackStackObserverTest.kt index d36d46d814b..600e3b5e0d7 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/CoordinatedBackStackObserverTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/backstack/CoordinatedBackStackObserverTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3 +package io.sentry.compose.navigation3.internal.backstack import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner @@ -16,10 +16,14 @@ import io.sentry.SentryTracer import io.sentry.SpanContext import io.sentry.TransactionContext import io.sentry.TransactionOptions -import io.sentry.compose.navigation3.lifecycle.INavStatePublisher -import io.sentry.compose.navigation3.lifecycle.NAVIGATION_CONTEXT_KEY -import io.sentry.compose.navigation3.lifecycle.NavLeaseCoordinator -import io.sentry.compose.navigation3.lifecycle.NavRootInfo +import io.sentry.compose.navigation3.BackStackEntryMapper +import io.sentry.compose.navigation3.ForwardingBackStackEntryMapper +import io.sentry.compose.navigation3.SentryBackStackEntry +import io.sentry.compose.navigation3.SentryNavOptions +import io.sentry.compose.navigation3.internal.lifecycle.INavStatePublisher +import io.sentry.compose.navigation3.internal.lifecycle.NAVIGATION_CONTEXT_KEY +import io.sentry.compose.navigation3.internal.lifecycle.NavLeaseCoordinator +import io.sentry.compose.navigation3.internal.lifecycle.NavRootInfo import io.sentry.protocol.TransactionNameSource import org.junit.Test import org.mockito.kotlin.any diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/FindActivityTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/FindActivityTest.kt similarity index 96% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/FindActivityTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/FindActivityTest.kt index 1c8853155d1..bfe1ee44449 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/FindActivityTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/FindActivityTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import android.app.Activity import android.content.Context diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinatorTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavLeaseCoordinatorTest.kt similarity index 99% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinatorTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavLeaseCoordinatorTest.kt index c30e88fd792..26cfb63b31f 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavLeaseCoordinatorTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavLeaseCoordinatorTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import android.app.Activity import android.app.Application diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopeTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopeTest.kt similarity index 99% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopeTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopeTest.kt index d294a7ae01e..e51f3f59150 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopeTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopeTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopesIntegrationTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopesIntegrationTest.kt similarity index 98% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopesIntegrationTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopesIntegrationTest.kt index b77500c7ef5..9b58196336b 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopesIntegrationTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopesIntegrationTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopesTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopesTest.kt similarity index 99% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopesTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopesTest.kt index be5e1141210..a8ce7b0f80b 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavScopesTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavScopesTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleOwner diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavTransactionRequestTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavTransactionRequestTest.kt similarity index 99% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavTransactionRequestTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavTransactionRequestTest.kt index f7155b67878..6e2f5419cd2 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/NavTransactionRequestTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/NavTransactionRequestTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import com.google.common.truth.Truth.assertThat import io.sentry.IScopes diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavDataTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavDataTest.kt similarity index 99% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavDataTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavDataTest.kt index a5b74ff4a2c..4fb69c7e853 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavDataTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavDataTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import com.google.common.truth.Truth.assertThat import io.sentry.Scope diff --git a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavTransactionTest.kt b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavTransactionTest.kt similarity index 99% rename from sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavTransactionTest.kt rename to sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavTransactionTest.kt index a1363ffdc25..9b9191e366c 100644 --- a/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/lifecycle/StagedNavTransactionTest.kt +++ b/sentry-android-navigation3/src/test/kotlin/io/sentry/compose/navigation3/internal/lifecycle/StagedNavTransactionTest.kt @@ -1,4 +1,4 @@ -package io.sentry.compose.navigation3.lifecycle +package io.sentry.compose.navigation3.internal.lifecycle import com.google.common.truth.Truth.assertThat import io.sentry.ILogger