From c77d4847af00b292714578f09a0235a1433e4c27 Mon Sep 17 00:00:00 2001
From: Nick Butcher <nickbutcher@google.com>
Date: Fri, 11 Sep 2020 12:37:39 +0100
Subject: [PATCH 1/7] Update to SNAPSHOT 6824694

---
 .../chrisbanes/accompanist/buildsrc/dependencies.kt    | 10 +++++-----
 gradle/wrapper/gradle-wrapper.properties               |  2 +-
 2 files changed, 6 insertions(+), 6 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 d4bd7ea21..a13352975 100644
--- a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
+++ b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
@@ -17,11 +17,11 @@
 package dev.chrisbanes.accompanist.buildsrc
 
 object Versions {
-    const val ktlint = "0.37.2"
+    const val ktlint = "0.38.1"
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha09"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha10"
 
     const val gradleMavenPublishPlugin = "com.vanniktech:gradle-maven-publish-plugin:0.12.0"
 
@@ -51,9 +51,9 @@ object Libs {
         }
 
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-alpha02"
-            
+            const val snapshot = "6824694"
+            const val version = "1.0.0-SNAPSHOT"
+
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"
             const val layout = "androidx.compose.foundation:foundation-layout:${version}"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9952b4b85..dd3ed3cc2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -18,4 +18,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip

From 2ce29370cc3a80723d6f881a4e769ef48d155efd Mon Sep 17 00:00:00 2001
From: Nick Butcher <nickbutcher@google.com>
Date: Fri, 11 Sep 2020 12:48:17 +0100
Subject: [PATCH 2/7] Fix sample formatting

---
 .../accompanist/sample/SampleApplication.kt   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt b/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt
index 8ac02df2d..7025ebfe5 100644
--- a/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt
+++ b/sample/src/main/java/dev/chrisbanes/accompanist/sample/SampleApplication.kt
@@ -28,16 +28,18 @@ class SampleApplication : Application() {
     override fun onCreate() {
         super.onCreate()
 
-        Coil.setImageLoader(object : ImageLoaderFactory {
-            override fun newImageLoader(): ImageLoader {
-                val coilOkHttpClient = OkHttpClient.Builder()
-                    .cache(CoilUtils.createDefaultCache(this@SampleApplication))
-                    .build()
+        Coil.setImageLoader(
+            object : ImageLoaderFactory {
+                override fun newImageLoader(): ImageLoader {
+                    val coilOkHttpClient = OkHttpClient.Builder()
+                        .cache(CoilUtils.createDefaultCache(this@SampleApplication))
+                        .build()
 
-                return ImageLoader.Builder(this@SampleApplication)
-                    .okHttpClient(coilOkHttpClient)
-                    .build()
+                    return ImageLoader.Builder(this@SampleApplication)
+                        .okHttpClient(coilOkHttpClient)
+                        .build()
+                }
             }
-        })
+        )
     }
 }

From 4fd6c9a9772ba7b05eadaaa2f4e7657ba1ecd7ba Mon Sep 17 00:00:00 2001
From: Nick Butcher <nickbutcher@google.com>
Date: Fri, 11 Sep 2020 13:00:17 +0100
Subject: [PATCH 3/7] Update sample

---
 .idea/codeStyles/Project.xml                   | 18 ++++++++++++++++++
 .../accompanist/sample/coil/CoilBasicSample.kt |  6 +++---
 .../sample/coil/CoilLazyColumnSample.kt        |  2 +-
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41ae2..0d156937b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
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 9380a2a18..34f12ef24 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
@@ -95,7 +95,7 @@ private fun Sample() {
                     data = randomSampleImageUrl(),
                     loading = {
                         Stack(Modifier.fillMaxSize()) {
-                            CircularProgressIndicator(Modifier.gravity(Alignment.Center))
+                            CircularProgressIndicator(Modifier.align(Alignment.Center))
                         }
                     },
                     modifier = Modifier.preferredSize(128.dp)
@@ -121,7 +121,7 @@ private fun Sample() {
                     data = randomSampleImageUrl(),
                     loading = {
                         Stack(Modifier.fillMaxSize()) {
-                            CircularProgressIndicator(Modifier.gravity(Alignment.Center))
+                            CircularProgressIndicator(Modifier.align(Alignment.Center))
                         }
                     },
                     modifier = Modifier.preferredSize(128.dp)
@@ -132,7 +132,7 @@ private fun Sample() {
                     data = randomSampleImageUrl(),
                     loading = {
                         Stack(Modifier.fillMaxSize()) {
-                            CircularProgressIndicator(Modifier.gravity(Alignment.Center))
+                            CircularProgressIndicator(Modifier.align(Alignment.Center))
                         }
                     }
                 )
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 2df073064..2a946c8cd 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
@@ -82,7 +82,7 @@ private fun Sample() {
                 Text(
                     text = "Text",
                     style = MaterialTheme.typography.subtitle2,
-                    modifier = Modifier.weight(1f).gravity(Alignment.CenterVertically)
+                    modifier = Modifier.weight(1f).align(Alignment.CenterVertically)
                 )
             }
         }

From 72bf0d8fdcd3108494bc195aa0d618c8439fe7ea Mon Sep 17 00:00:00 2001
From: Nick Butcher <nickbutcher@google.com>
Date: Fri, 11 Sep 2020 14:25:54 +0100
Subject: [PATCH 4/7] Update tests

---
 .../chrisbanes/accompanist/coil/CoilTest.kt   | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 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 5b9bccfc6..ff60cc6b6 100644
--- a/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt
+++ b/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt
@@ -41,7 +41,6 @@ import androidx.ui.test.captureToBitmap
 import androidx.ui.test.createComposeRule
 import androidx.ui.test.onNodeWithTag
 import androidx.ui.test.onNodeWithText
-import androidx.ui.test.runOnIdle
 import coil.request.CachePolicy
 import coil.request.ImageRequest
 import com.google.common.truth.Truth.assertThat
@@ -85,7 +84,7 @@ class CoilTest {
         // Wait for the Coil request listener to release the latch
         latch.await(5, TimeUnit.SECONDS)
 
-        runOnIdle {
+        composeTestRule.runOnIdle {
             // And assert that we got a single successful result
             assertThat(results).hasSize(1)
             assertThat(results[0]).isInstanceOf(SuccessResult::class.java)
@@ -107,7 +106,7 @@ class CoilTest {
         // Wait for the onRequestCompleted to release the latch
         latch.await(5, TimeUnit.SECONDS)
 
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image, false)
             .assertIsDisplayed()
             .assertWidthIsEqualTo(128.dp)
             .assertHeightIsEqualTo(128.dp)
@@ -129,7 +128,7 @@ class CoilTest {
         // Wait for the onRequestCompleted to release the latch
         latch.await(5, TimeUnit.SECONDS)
 
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertWidthIsEqualTo(128.dp)
             .assertHeightIsEqualTo(128.dp)
             .assertIsDisplayed()
@@ -159,7 +158,7 @@ class CoilTest {
         }
 
         // Assert that the content is completely Red
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertWidthIsEqualTo(128.dp)
             .assertHeightIsEqualTo(128.dp)
             .assertIsDisplayed()
@@ -173,7 +172,7 @@ class CoilTest {
         runBlocking { loadCompleteSignal.receive() }
 
         // Assert that the content is completely Blue
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertWidthIsEqualTo(128.dp)
             .assertHeightIsEqualTo(128.dp)
             .assertIsDisplayed()
@@ -232,7 +231,7 @@ class CoilTest {
         // Wait for the onRequestCompleted to release the latch
         latch.await(5, TimeUnit.SECONDS)
 
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertWidthIsAtLeast(1.dp)
             .assertHeightIsAtLeast(1.dp)
             .assertIsDisplayed()
@@ -259,7 +258,7 @@ class CoilTest {
         latch.await(5, TimeUnit.SECONDS)
 
         // Assert that the whole layout is drawn cyan
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertIsDisplayed()
             .captureToBitmap()
             .assertPixels { Color.Cyan }
@@ -281,7 +280,7 @@ class CoilTest {
         latch.await(5, TimeUnit.SECONDS)
 
         // Assert that the layout is in the tree and has the correct size
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertIsDisplayed()
             .assertWidthIsEqualTo(128.dp)
             .assertHeightIsEqualTo(128.dp)
@@ -312,7 +311,7 @@ class CoilTest {
             }
 
             // Assert that the loading component is displayed
-            onNodeWithText("Loading").assertIsDisplayed()
+            composeTestRule.onNodeWithText("Loading").assertIsDisplayed()
 
             // Now resume the dispatcher to start the Coil request
             dispatcher.resumeDispatcher()
@@ -322,7 +321,7 @@ class CoilTest {
         loadLatch.await(5, TimeUnit.SECONDS)
 
         // And assert that the loading component no longer exists
-        onNodeWithText("Loading").assertDoesNotExist()
+        composeTestRule.onNodeWithText("Loading").assertDoesNotExist()
     }
 
     @Test
@@ -346,7 +345,7 @@ class CoilTest {
         latch.await(5, TimeUnit.SECONDS)
 
         // Assert that the whole layout is drawn red
-        onNodeWithTag(CoilTestTags.Image)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertIsDisplayed()
             .captureToBitmap()
             .assertPixels { Color.Red }

From 7aad2c54618ff1de7968d4bdb6b834850e9b0532 Mon Sep 17 00:00:00 2001
From: Nick Butcher <nickbutcher@google.com>
Date: Fri, 11 Sep 2020 16:39:06 +0100
Subject: [PATCH 5/7] Update version name.

---
 .idea/codeStyles/Project.xml                   | 18 ------------------
 .../chrisbanes/accompanist/coil/CoilTest.kt    |  2 +-
 gradle.properties                              |  2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0d156937b..681f41ae2 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,23 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
-    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
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 ff60cc6b6..e9d513810 100644
--- a/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt
+++ b/coil/src/androidTest/java/dev/chrisbanes/accompanist/coil/CoilTest.kt
@@ -106,7 +106,7 @@ class CoilTest {
         // Wait for the onRequestCompleted to release the latch
         latch.await(5, TimeUnit.SECONDS)
 
-        composeTestRule.onNodeWithTag(CoilTestTags.Image, false)
+        composeTestRule.onNodeWithTag(CoilTestTags.Image)
             .assertIsDisplayed()
             .assertWidthIsEqualTo(128.dp)
             .assertHeightIsEqualTo(128.dp)
diff --git a/gradle.properties b/gradle.properties
index d422a1e31..fe07a9198 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ android.useAndroidX=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 GROUP=dev.chrisbanes.accompanist
-VERSION_NAME=0.2.1
+VERSION_NAME=0.2.2.ui-6824694-SNAPSHOT
 
 POM_DESCRIPTION=A collection of utilities for Jetpack Compose
 

From 49a3bf439fe05c7d53b4968f5876c85957274d3e Mon Sep 17 00:00:00 2001
From: Chris <chris@banes.me>
Date: Wed, 16 Sep 2020 18:38:14 +0100
Subject: [PATCH 6/7] Update to Compose 1.0.0-alpha03

---
 .../java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 e698b4f02..3f7b31175 100644
--- a/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
+++ b/buildSrc/src/main/java/dev/chrisbanes/accompanist/buildsrc/dependencies.kt
@@ -57,8 +57,8 @@ object Libs {
         }
 
         object Compose {
-            const val snapshot = "6824694"
-            const val version = "1.0.0-SNAPSHOT"
+            const val snapshot = ""
+            const val version = "1.0.0-alpha03"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"

From e93b6ae97398b26e351967b721f9e1dedfad6865 Mon Sep 17 00:00:00 2001
From: Chris <chris@banes.me>
Date: Wed, 16 Sep 2020 18:38:53 +0100
Subject: [PATCH 7/7] Bump version to v0.2.2

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index fe07a9198..86cc19afe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ android.useAndroidX=true
 systemProp.org.gradle.internal.publish.checksums.insecure=true
 
 GROUP=dev.chrisbanes.accompanist
-VERSION_NAME=0.2.2.ui-6824694-SNAPSHOT
+VERSION_NAME=0.2.2
 
 POM_DESCRIPTION=A collection of utilities for Jetpack Compose