From 7b6925a6cdcb36b77aba84e8be350e72beb506ac Mon Sep 17 00:00:00 2001 From: Nick Butcher Date: Thu, 5 Nov 2020 09:58:45 +0000 Subject: [PATCH 1/5] Update to snapshot 6953474. --- .../dev/chrisbanes/accompanist/buildsrc/dependencies.kt | 2 +- coil/api/coil.api | 5 +++-- .../java/dev/chrisbanes/accompanist/coil/CoilTest.kt | 2 +- glide/api/glide.api | 3 ++- .../java/dev/chrisbanes/accompanist/glide/GlideTest.kt | 2 +- imageloading-core/api/imageloading-core.api | 7 +++++++ .../dev/chrisbanes/accompanist/imageloading/ImageLoad.kt | 9 +++++---- picasso/api/picasso.api | 2 +- .../dev/chrisbanes/accompanist/picasso/PicassoTest.kt | 2 +- .../accompanist/sample/coil/CoilBasicSample.kt | 2 +- .../chrisbanes/accompanist/sample/coil/CoilGridSample.kt | 2 +- .../accompanist/sample/coil/CoilLazyColumnSample.kt | 2 +- .../accompanist/sample/glide/GlideBasicSample.kt | 2 +- .../accompanist/sample/glide/GlideGridSample.kt | 2 +- .../accompanist/sample/glide/GlideLazyColumnSample.kt | 2 +- .../accompanist/sample/insets/EdgeToEdgeLazyColumn.kt | 2 +- .../accompanist/sample/insets/InsetsBasicSample.kt | 2 +- .../accompanist/sample/picasso/PicassoBasicSample.kt | 2 +- .../accompanist/sample/picasso/PicassoGridSample.kt | 2 +- .../sample/picasso/PicassoLazyColumnSample.kt | 2 +- 20 files changed, 33 insertions(+), 23 deletions(-) diff --git a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt index ca1c19aa3..2c8c5f592 100644 --- a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt +++ b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt @@ -57,7 +57,7 @@ object Libs { } object Compose { - const val snapshot = "6943980" + const val snapshot = "6953474" const val version = "1.0.0-SNAPSHOT" @JvmStatic diff --git a/coil/api/coil.api b/coil/api/coil.api index 4c449631e..9d60269f1 100644 --- a/coil/api/coil.api +++ b/coil/api/coil.api @@ -1,7 +1,7 @@ public final class dev/chrisbanes/accompanist/coil/CoilImage { - public static final fun CoilImage (Lcoil/request/ImageRequest;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun CoilImage (Lcoil/request/ImageRequest;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;III)V public static final fun CoilImage (Lcoil/request/ImageRequest;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V - public static final fun CoilImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun CoilImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;III)V public static final fun CoilImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun CoilImageWithCrossfade (Lcoil/request/ImageRequest;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;ILcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V public static final fun CoilImageWithCrossfade (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;ILcoil/ImageLoader;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V @@ -12,6 +12,7 @@ public final class dev/chrisbanes/accompanist/coil/CoilImage { } public final class dev/chrisbanes/accompanist/coil/CoilImageConstants { + public static final field $stable I public static final field INSTANCE Ldev/chrisbanes/accompanist/coil/CoilImageConstants; public final fun defaultImageLoader (Landroidx/compose/runtime/Composer;I)Lcoil/ImageLoader; } diff --git a/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt b/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt index 8e3a221cb..e06167631 100644 --- a/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt +++ b/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt @@ -17,8 +17,8 @@ package dev.chrisbanes.accompanist.coil import androidx.compose.foundation.Image -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.preferredSize +import androidx.compose.material.Text import androidx.compose.runtime.Providers import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier diff --git a/glide/api/glide.api b/glide/api/glide.api index afed00c7e..ca5b343e3 100644 --- a/glide/api/glide.api +++ b/glide/api/glide.api @@ -1,10 +1,11 @@ public final class dev/chrisbanes/accompanist/glide/GlideImage { - public static final fun GlideImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcom/bumptech/glide/RequestManager;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun GlideImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLkotlin/jvm/functions/Function2;Lcom/bumptech/glide/RequestManager;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;III)V public static final fun GlideImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Lkotlin/jvm/functions/Function2;Lcom/bumptech/glide/RequestManager;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun getAmbientRequestManager ()Landroidx/compose/runtime/ProvidableAmbient; } public final class dev/chrisbanes/accompanist/glide/GlideImageConstants { + public static final field $stable I public static final field INSTANCE Ldev/chrisbanes/accompanist/glide/GlideImageConstants; public final fun defaultRequestManager (Landroidx/compose/runtime/Composer;I)Lcom/bumptech/glide/RequestManager; } diff --git a/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt b/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt index 8f1553bf4..02f4565b6 100644 --- a/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt +++ b/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt @@ -18,8 +18,8 @@ package dev.chrisbanes.accompanist.glide import android.graphics.drawable.Drawable import androidx.compose.foundation.Image -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.preferredSize +import androidx.compose.material.Text import androidx.compose.runtime.Providers import androidx.compose.runtime.collectAsState import androidx.compose.runtime.onCommit diff --git a/imageloading-core/api/imageloading-core.api b/imageloading-core/api/imageloading-core.api index e4c982690..e88cd5d5d 100644 --- a/imageloading-core/api/imageloading-core.api +++ b/imageloading-core/api/imageloading-core.api @@ -1,4 +1,5 @@ public final class dev/chrisbanes/accompanist/imageloading/AndroidDrawablePainter : androidx/compose/ui/graphics/painter/Painter { + public static final field $stable I public fun (Landroid/graphics/drawable/Drawable;)V public fun getIntrinsicSize-NH-jbRc ()J } @@ -22,13 +23,16 @@ public final class dev/chrisbanes/accompanist/imageloading/ImageLoad { } public abstract class dev/chrisbanes/accompanist/imageloading/ImageLoadState { + public static final field $stable I } public final class dev/chrisbanes/accompanist/imageloading/ImageLoadState$Empty : dev/chrisbanes/accompanist/imageloading/ImageLoadState { + public static final field $stable I public static final field INSTANCE Ldev/chrisbanes/accompanist/imageloading/ImageLoadState$Empty; } public final class dev/chrisbanes/accompanist/imageloading/ImageLoadState$Error : dev/chrisbanes/accompanist/imageloading/ImageLoadState { + public static final field $stable I public fun (Landroidx/compose/ui/graphics/painter/Painter;Ljava/lang/Throwable;)V public synthetic fun (Landroidx/compose/ui/graphics/painter/Painter;Ljava/lang/Throwable;ILkotlin/jvm/internal/DefaultConstructorMarker;)V public final fun component1 ()Landroidx/compose/ui/graphics/painter/Painter; @@ -43,10 +47,12 @@ public final class dev/chrisbanes/accompanist/imageloading/ImageLoadState$Error } public final class dev/chrisbanes/accompanist/imageloading/ImageLoadState$Loading : dev/chrisbanes/accompanist/imageloading/ImageLoadState { + public static final field $stable I public static final field INSTANCE Ldev/chrisbanes/accompanist/imageloading/ImageLoadState$Loading; } public final class dev/chrisbanes/accompanist/imageloading/ImageLoadState$Success : dev/chrisbanes/accompanist/imageloading/ImageLoadState { + public static final field $stable I public fun (Landroidx/compose/ui/graphics/painter/Painter;Ldev/chrisbanes/accompanist/imageloading/DataSource;)V public final fun component1 ()Landroidx/compose/ui/graphics/painter/Painter; public final fun component2 ()Ldev/chrisbanes/accompanist/imageloading/DataSource; @@ -60,6 +66,7 @@ public final class dev/chrisbanes/accompanist/imageloading/ImageLoadState$Succes } public final class dev/chrisbanes/accompanist/imageloading/ImageLoadingColorMatrix : android/graphics/ColorMatrix { + public static final field $stable I public fun ()V public fun (FFF)V public synthetic fun (FFFILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/imageloading-core/src/main/java/dev/chrisbanes/accompanist/imageloading/ImageLoad.kt b/imageloading-core/src/main/java/dev/chrisbanes/accompanist/imageloading/ImageLoad.kt index ce5b4431b..3c4e4d068 100644 --- a/imageloading-core/src/main/java/dev/chrisbanes/accompanist/imageloading/ImageLoad.kt +++ b/imageloading-core/src/main/java/dev/chrisbanes/accompanist/imageloading/ImageLoad.kt @@ -28,7 +28,6 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.referentialEqualityPolicy import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.compose.runtime.stateFor import androidx.compose.ui.Modifier import androidx.compose.ui.layout.WithConstraints import androidx.compose.ui.unit.IntSize @@ -68,12 +67,14 @@ fun ImageLoad( onRequestCompleted: (ImageLoadState) -> Unit = EmptyRequestCompleteLambda, content: @Composable (imageLoadState: ImageLoadState) -> Unit ) { - var state by stateFor(requestKey) { ImageLoadState.Empty } + var state by remember(requestKey) { + mutableStateOf(ImageLoadState.Empty) + } - // This may look a little weird, but allows the launchInComposition callback to always + // This may look a little weird, but allows the LaunchedEffect callback to always // invoke the last provided [onRequestCompleted]. // - // If a composition happens *after* launchInComposition has launched, the given + // If a composition happens *after* LaunchedEffect has launched, the given // [onRequestCompleted] might have changed. If the actor lambda below directly referenced // [onRequestCompleted] it would have captured access to the initial onRequestCompleted // value, not the latest. diff --git a/picasso/api/picasso.api b/picasso/api/picasso.api index f1e02ffba..7f35dbe5d 100644 --- a/picasso/api/picasso.api +++ b/picasso/api/picasso.api @@ -1,5 +1,5 @@ public final class dev/chrisbanes/accompanist/picasso/PicassoImage { - public static final fun PicassoImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLcom/squareup/picasso/Picasso;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;II)V + public static final fun PicassoImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Landroidx/compose/ui/Alignment;Landroidx/compose/ui/layout/ContentScale;Landroidx/compose/ui/graphics/ColorFilter;ZLcom/squareup/picasso/Picasso;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function2;Landroidx/compose/runtime/Composer;III)V public static final fun PicassoImage (Ljava/lang/Object;Landroidx/compose/ui/Modifier;Lcom/squareup/picasso/Picasso;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function3;Landroidx/compose/runtime/Composer;II)V public static final fun getAmbientPicasso ()Landroidx/compose/runtime/ProvidableAmbient; } diff --git a/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt b/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt index 63928797c..9d5c111c2 100644 --- a/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt +++ b/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt @@ -17,8 +17,8 @@ package dev.chrisbanes.accompanist.picasso import androidx.compose.foundation.Image -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.preferredSize +import androidx.compose.material.Text import androidx.compose.runtime.Providers import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilBasicSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilBasicSample.kt index d9a6bf54a..9b26ba157 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilBasicSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilBasicSample.kt @@ -19,7 +19,6 @@ package dev.chrisbanes.accompanist.sample.coil import android.content.Context import android.os.Build.VERSION.SDK_INT import androidx.compose.foundation.ScrollableColumn -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.FlowRow @@ -30,6 +29,7 @@ import androidx.compose.foundation.layout.preferredSize import androidx.compose.foundation.layout.preferredWidth import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilGridSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilGridSample.kt index 2f4ee2a5d..1bdc8d651 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilGridSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilGridSample.kt @@ -17,12 +17,12 @@ package dev.chrisbanes.accompanist.sample.coil import androidx.compose.foundation.ScrollableColumn -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.preferredSize import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilLazyColumnSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilLazyColumnSample.kt index 26a4ceb52..5123da050 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilLazyColumnSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/coil/CoilLazyColumnSample.kt @@ -16,7 +16,6 @@ package dev.chrisbanes.accompanist.sample.coil -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -26,6 +25,7 @@ import androidx.compose.foundation.layout.preferredWidth import androidx.compose.foundation.lazy.LazyColumnFor import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideBasicSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideBasicSample.kt index f59d35f36..6c8356940 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideBasicSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideBasicSample.kt @@ -17,7 +17,6 @@ package dev.chrisbanes.accompanist.sample.glide import androidx.compose.foundation.ScrollableColumn -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.FlowRow @@ -28,6 +27,7 @@ import androidx.compose.foundation.layout.preferredSize import androidx.compose.foundation.layout.preferredWidth import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideGridSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideGridSample.kt index b2a16201a..aef421705 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideGridSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideGridSample.kt @@ -17,12 +17,12 @@ package dev.chrisbanes.accompanist.sample.glide import androidx.compose.foundation.ScrollableColumn -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.preferredSize import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideLazyColumnSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideLazyColumnSample.kt index b694bde95..538f3340a 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideLazyColumnSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/glide/GlideLazyColumnSample.kt @@ -16,7 +16,6 @@ package dev.chrisbanes.accompanist.sample.glide -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -26,6 +25,7 @@ import androidx.compose.foundation.layout.preferredWidth import androidx.compose.foundation.lazy.LazyColumnFor import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/EdgeToEdgeLazyColumn.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/EdgeToEdgeLazyColumn.kt index c4881ece5..663b35245 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/EdgeToEdgeLazyColumn.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/EdgeToEdgeLazyColumn.kt @@ -18,7 +18,6 @@ package dev.chrisbanes.accompanist.sample.insets import android.os.Bundle import androidx.activity.ComponentActivity -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.RowScope @@ -34,6 +33,7 @@ import androidx.compose.material.FloatingActionButton import androidx.compose.material.Icon import androidx.compose.material.MaterialTheme import androidx.compose.material.Surface +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.contentColorFor import androidx.compose.material.icons.Icons diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/InsetsBasicSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/InsetsBasicSample.kt index 63caa392a..7f56e1fb5 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/InsetsBasicSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/insets/InsetsBasicSample.kt @@ -18,7 +18,6 @@ package dev.chrisbanes.accompanist.sample.insets import android.os.Bundle import androidx.activity.ComponentActivity -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth @@ -26,6 +25,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.material.FloatingActionButton import androidx.compose.material.Icon import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Face diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoBasicSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoBasicSample.kt index f66b4d53b..5feff3599 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoBasicSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoBasicSample.kt @@ -17,7 +17,6 @@ package dev.chrisbanes.accompanist.sample.picasso import androidx.compose.foundation.ScrollableColumn -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.FlowRow @@ -28,6 +27,7 @@ import androidx.compose.foundation.layout.preferredSize import androidx.compose.foundation.layout.preferredWidth import androidx.compose.material.CircularProgressIndicator import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoGridSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoGridSample.kt index b62d0aca8..795689e33 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoGridSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoGridSample.kt @@ -17,12 +17,12 @@ package dev.chrisbanes.accompanist.sample.picasso import androidx.compose.foundation.ScrollableColumn -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.preferredSize import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoLazyColumnSample.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoLazyColumnSample.kt index 0f3e4c851..b392de5cc 100644 --- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoLazyColumnSample.kt +++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/picasso/PicassoLazyColumnSample.kt @@ -16,7 +16,6 @@ package dev.chrisbanes.accompanist.sample.picasso -import androidx.compose.foundation.Text import androidx.compose.foundation.layout.ExperimentalLayout import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -26,6 +25,7 @@ import androidx.compose.foundation.layout.preferredWidth import androidx.compose.foundation.lazy.LazyColumnFor import androidx.compose.material.MaterialTheme import androidx.compose.material.Scaffold +import androidx.compose.material.Text import androidx.compose.material.TopAppBar import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment From 4cffa4f7d9b2661969dae755b28063dd3817d2d5 Mon Sep 17 00:00:00 2001 From: Nick Butcher Date: Thu, 5 Nov 2020 10:25:46 +0000 Subject: [PATCH 2/5] Fix test dependencies. --- coil/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/coil/build.gradle b/coil/build.gradle index 020f071ea..2a2cfb000 100644 --- a/coil/build.gradle +++ b/coil/build.gradle @@ -82,6 +82,7 @@ dependencies { implementation Libs.AndroidX.coreKtx implementation Libs.AndroidX.Compose.runtime + implementation Libs.AndroidX.Compose.material implementation Libs.AndroidX.Compose.foundation implementation Libs.Kotlin.stdlib From 6a356dc254383e339a0718f4d4fb777a61a0119b Mon Sep 17 00:00:00 2001 From: Nick Butcher Date: Thu, 5 Nov 2020 12:11:07 +0000 Subject: [PATCH 3/5] Update tests. --- .../chrisbanes/accompanist/coil/CoilTest.kt | 31 ++++++++----- glide/build.gradle | 1 + .../chrisbanes/accompanist/glide/GlideTest.kt | 31 ++++++++----- picasso/build.gradle | 1 + .../accompanist/picasso/PicassoTest.kt | 43 +++++++++++++------ 5 files changed, 73 insertions(+), 34 deletions(-) diff --git a/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt b/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt index e06167631..a0f9b2c76 100644 --- a/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt +++ b/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt @@ -23,6 +23,7 @@ import androidx.compose.runtime.Providers import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asAndroidBitmap import androidx.compose.ui.graphics.painter.ColorPainter import androidx.compose.ui.platform.ContextAmbient import androidx.compose.ui.platform.testTag @@ -32,7 +33,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertPixels import androidx.compose.ui.test.assertWidthIsAtLeast import androidx.compose.ui.test.assertWidthIsEqualTo -import androidx.compose.ui.test.captureToBitmap +import androidx.compose.ui.test.captureToImage import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText @@ -165,7 +166,7 @@ class CoilTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun basicLoad_drawable() { val latch = CountDownLatch(1) @@ -180,11 +181,13 @@ class CoilTest { // Wait for the onRequestCompleted to release the latch latch.await(5, TimeUnit.SECONDS) + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(CoilTestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } @@ -259,7 +262,7 @@ class CoilTest { @OptIn(ExperimentalCoroutinesApi::class) @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun basicLoad_switchData() { val loadCompleteSignal = Channel(Channel.UNLIMITED) val data = MutableStateFlow(server.url("/red")) @@ -277,11 +280,13 @@ class CoilTest { loadCompleteSignal.awaitNext(5, TimeUnit.SECONDS) // Assert that the content is completely Red + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(CoilTestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } // Now switch the data URI to the blue drawable @@ -291,11 +296,13 @@ class CoilTest { loadCompleteSignal.awaitNext(5, TimeUnit.SECONDS) // Assert that the content is completely Blue + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(CoilTestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Blue } // Close the signal channel @@ -436,7 +443,7 @@ class CoilTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun content_custom() { val latch = CountDownLatch(1) @@ -455,9 +462,11 @@ class CoilTest { latch.await(5, TimeUnit.SECONDS) // Assert that the whole layout is drawn cyan + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(CoilTestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Cyan } } @@ -505,7 +514,7 @@ class CoilTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun error_slot() { val latch = CountDownLatch(1) @@ -525,9 +534,11 @@ class CoilTest { latch.await(5, TimeUnit.SECONDS) // Assert that the whole layout is drawn red + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(CoilTestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } } diff --git a/glide/build.gradle b/glide/build.gradle index 609d35194..f5970d1d0 100644 --- a/glide/build.gradle +++ b/glide/build.gradle @@ -81,6 +81,7 @@ dependencies { implementation Libs.AndroidX.coreKtx implementation Libs.AndroidX.Compose.runtime + implementation Libs.AndroidX.Compose.material implementation Libs.AndroidX.Compose.foundation implementation Libs.Kotlin.stdlib diff --git a/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt b/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt index 02f4565b6..67fca4710 100644 --- a/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt +++ b/glide/src/androidTest/java/dev/chrisbanes/accompanist/glide/GlideTest.kt @@ -25,6 +25,7 @@ import androidx.compose.runtime.collectAsState import androidx.compose.runtime.onCommit import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asAndroidBitmap import androidx.compose.ui.graphics.painter.ColorPainter import androidx.compose.ui.platform.ViewAmbient import androidx.compose.ui.platform.testTag @@ -34,7 +35,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertPixels import androidx.compose.ui.test.assertWidthIsAtLeast import androidx.compose.ui.test.assertWidthIsEqualTo -import androidx.compose.ui.test.captureToBitmap +import androidx.compose.ui.test.captureToImage import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText @@ -160,7 +161,7 @@ class GlideTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun basicLoad_drawable() { val latch = CountDownLatch(1) @@ -175,17 +176,19 @@ class GlideTest { // Wait for the onRequestCompleted to release the latch latch.await(5, TimeUnit.SECONDS) + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(GlideTestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } @OptIn(ExperimentalCoroutinesApi::class) @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun basicLoad_switchData() { val loadCompleteSignal = Channel(Channel.UNLIMITED) val data = MutableStateFlow(server.url("/red")) @@ -203,11 +206,13 @@ class GlideTest { loadCompleteSignal.awaitNext(5, TimeUnit.SECONDS) // Assert that the content is completely Red + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(GlideTestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } // Now switch the data URI to the blue drawable @@ -217,11 +222,13 @@ class GlideTest { loadCompleteSignal.awaitNext(5, TimeUnit.SECONDS) // Assert that the content is completely Blue + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(GlideTestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Blue } // Close the signal channel @@ -417,7 +424,7 @@ class GlideTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun content_custom() { val latch = CountDownLatch(1) @@ -436,9 +443,11 @@ class GlideTest { latch.await(5, TimeUnit.SECONDS) // Assert that the whole layout is drawn cyan + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(GlideTestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Cyan } } @@ -478,7 +487,7 @@ class GlideTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun error_slot() { val latch = CountDownLatch(1) @@ -498,9 +507,11 @@ class GlideTest { latch.await(5, TimeUnit.SECONDS) // Assert that the whole layout is drawn red + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(GlideTestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } } diff --git a/picasso/build.gradle b/picasso/build.gradle index 692905733..089831217 100644 --- a/picasso/build.gradle +++ b/picasso/build.gradle @@ -85,6 +85,7 @@ dependencies { implementation Libs.AndroidX.coreKtx implementation Libs.AndroidX.Compose.runtime + implementation Libs.AndroidX.Compose.material implementation Libs.AndroidX.Compose.foundation implementation Libs.Kotlin.stdlib diff --git a/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt b/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt index 9d5c111c2..c0e9c3ead 100644 --- a/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt +++ b/picasso/src/androidTest/java/dev/chrisbanes/accompanist/picasso/PicassoTest.kt @@ -23,6 +23,7 @@ import androidx.compose.runtime.Providers import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.asAndroidBitmap import androidx.compose.ui.graphics.painter.ColorPainter import androidx.compose.ui.platform.testTag import androidx.compose.ui.test.assertHeightIsAtLeast @@ -31,7 +32,7 @@ import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.assertPixels import androidx.compose.ui.test.assertWidthIsAtLeast import androidx.compose.ui.test.assertWidthIsEqualTo -import androidx.compose.ui.test.captureToBitmap +import androidx.compose.ui.test.captureToImage import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithTag import androidx.compose.ui.test.onNodeWithText @@ -105,7 +106,7 @@ class PicassoTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun basicLoad_drawable() { val latch = CountDownLatch(1) @@ -120,17 +121,19 @@ class PicassoTest { // Wait for the onRequestCompleted to release the latch latch.await(5, TimeUnit.SECONDS) + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(TestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } @OptIn(ExperimentalCoroutinesApi::class) @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun basicLoad_switchData() { val loadCompleteSignal = Channel(Channel.UNLIMITED) val data = MutableStateFlow(server.url("/red")) @@ -148,11 +151,13 @@ class PicassoTest { loadCompleteSignal.awaitNext(5, TimeUnit.SECONDS) // Assert that the content is completely Red + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(TestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } // Now switch the data URI to the blue drawable @@ -162,11 +167,13 @@ class PicassoTest { loadCompleteSignal.awaitNext(5, TimeUnit.SECONDS) // Assert that the content is completely Blue + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(TestTags.Image) .assertWidthIsEqualTo(128.dp) .assertHeightIsEqualTo(128.dp) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Blue } // Close the signal channel @@ -225,7 +232,7 @@ class PicassoTest { .assertIsDisplayed() } - @SdkSuppress(minSdkVersion = 26) // captureToBitmap + @SdkSuppress(minSdkVersion = 26) // captureToImage @Test fun customPicasso_param() { val latch = CountDownLatch(1) @@ -252,13 +259,15 @@ class PicassoTest { latch.await(5, TimeUnit.SECONDS) // Assert that the layout is displayed and that we're showing the red image + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(TestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } - @SdkSuppress(minSdkVersion = 26) // captureToBitmap + @SdkSuppress(minSdkVersion = 26) // captureToImage @Test fun customPicasso_ambient() { val latch = CountDownLatch(1) @@ -286,9 +295,11 @@ class PicassoTest { latch.await(5, TimeUnit.SECONDS) // Assert that the layout is displayed and that we're showing the red image + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(TestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } @@ -379,7 +390,7 @@ class PicassoTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun content_custom() { val latch = CountDownLatch(1) @@ -398,9 +409,11 @@ class PicassoTest { latch.await(5, TimeUnit.SECONDS) // Assert that the whole layout is drawn cyan + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(TestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Cyan } } @@ -444,7 +457,7 @@ class PicassoTest { } @Test - @SdkSuppress(minSdkVersion = 26) // captureToBitmap is SDK 26+ + @SdkSuppress(minSdkVersion = 26) // captureToImage is SDK 26+ fun error_slot() { val latch = CountDownLatch(1) @@ -464,9 +477,11 @@ class PicassoTest { latch.await(5, TimeUnit.SECONDS) // Assert that the whole layout is drawn red + @Suppress("DEPRECATION") composeTestRule.onNodeWithTag(TestTags.Image) .assertIsDisplayed() - .captureToBitmap() + .captureToImage() + .asAndroidBitmap() .assertPixels { Color.Red } } } From 3888bd82a4b3df25a42bdfc94e4bf69c999483e1 Mon Sep 17 00:00:00 2001 From: Nick Butcher Date: Thu, 5 Nov 2020 12:13:59 +0000 Subject: [PATCH 4/5] Make material test dependency. --- coil/build.gradle | 2 +- glide/build.gradle | 2 +- picasso/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coil/build.gradle b/coil/build.gradle index 2a2cfb000..68f660526 100644 --- a/coil/build.gradle +++ b/coil/build.gradle @@ -82,7 +82,6 @@ dependencies { implementation Libs.AndroidX.coreKtx implementation Libs.AndroidX.Compose.runtime - implementation Libs.AndroidX.Compose.material implementation Libs.AndroidX.Compose.foundation implementation Libs.Kotlin.stdlib @@ -101,6 +100,7 @@ dependencies { androidTestImplementation Libs.AndroidX.Compose.test androidTestImplementation Libs.AndroidX.Compose.ui + androidTestImplementation Libs.AndroidX.Compose.material androidTestImplementation Libs.AndroidX.Test.rules androidTestImplementation Libs.AndroidX.Test.runner } diff --git a/glide/build.gradle b/glide/build.gradle index f5970d1d0..e1e7bec6f 100644 --- a/glide/build.gradle +++ b/glide/build.gradle @@ -81,7 +81,6 @@ dependencies { implementation Libs.AndroidX.coreKtx implementation Libs.AndroidX.Compose.runtime - implementation Libs.AndroidX.Compose.material implementation Libs.AndroidX.Compose.foundation implementation Libs.Kotlin.stdlib @@ -98,6 +97,7 @@ dependencies { androidTestImplementation Libs.AndroidX.Compose.test androidTestImplementation Libs.AndroidX.Compose.ui + androidTestImplementation Libs.AndroidX.Compose.material androidTestImplementation Libs.AndroidX.Test.rules androidTestImplementation Libs.AndroidX.Test.runner } diff --git a/picasso/build.gradle b/picasso/build.gradle index 089831217..838dde1ac 100644 --- a/picasso/build.gradle +++ b/picasso/build.gradle @@ -85,7 +85,6 @@ dependencies { implementation Libs.AndroidX.coreKtx implementation Libs.AndroidX.Compose.runtime - implementation Libs.AndroidX.Compose.material implementation Libs.AndroidX.Compose.foundation implementation Libs.Kotlin.stdlib @@ -102,6 +101,7 @@ dependencies { androidTestImplementation Libs.AndroidX.Compose.test androidTestImplementation Libs.AndroidX.Compose.ui + androidTestImplementation Libs.AndroidX.Compose.material androidTestImplementation Libs.AndroidX.Test.rules androidTestImplementation Libs.AndroidX.Test.runner } From 81bdd631aee9ed597072eca787b7adb065215fb2 Mon Sep 17 00:00:00 2001 From: Nick Butcher Date: Thu, 5 Nov 2020 14:15:55 +0000 Subject: [PATCH 5/5] Exclude packaging META-INF files in Insets. --- insets/build.gradle | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/insets/build.gradle b/insets/build.gradle index d24b963fa..82b5d5e2d 100644 --- a/insets/build.gradle +++ b/insets/build.gradle @@ -56,6 +56,13 @@ android { checkReleaseBuilds false } + packagingOptions { + // Some of the META-INF files conflict with coroutines-test. Exclude them to enable + // our test APK to build (has no effect on our AARs) + excludes += "/META-INF/AL2.0" + excludes += "/META-INF/LGPL2.1" + } + testOptions { unitTests { includeAndroidResources = true