Merge remote-tracking branch 'origin/rick/wrapInLeakCanary' into rick…

…/wrapInLeakCanary * origin/rick/wrapInLeakCanary: wrap Activity and Compose rules in LeakCanary checks on both sides fixes #657 # Conflicts: # workflow-ui/container-android/src/androidTest/java/com/squareup/workflow1/ui/backstack/test/BackstackContainerTest.kt # workflow-ui/core-android/src/androidTest/java/com/squareup/workflow1/ui/WorkflowViewStubLifecycleTest.kt
square · Feb 3, 2022 · 6a94bf3 · 6a94bf3
2 parents 558adc3 + 72ba8c7
commit 6a94bf3
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/...s/src/androidTest/java/com/squareup/sample/compose/inlinerendering/InlineRenderingTest.kt b/...s/src/androidTest/java/com/squareup/sample/compose/inlinerendering/InlineRenderingTest.kt
@@ -13,6 +13,7 @@ import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
+import com.squareup.workflow1.ui.internal.test.wrapInLeakCanary
 
 @RunWith(AndroidJUnit4::class)
 @OptIn(WorkflowUiExperimentalApi::class)