[Jetcaster] Update to SNAPSHOT 6860046 (android#192)

* Update to SNAPSHOT 6860046
* Remove explicit runtime dependency
* Remove commented out Modifier.align
* Try forcing downgrade of R8

Author: chrisbanes

Jetcaster/app/build.gradle

@@ -84,7 +84,13 @@ android {
     }
 
     buildFeatures {
-        compose true
+        // We turn off the Compose feature for now, due to using Compose SNAPSHOTs where the
+        // Compose compiler artifact has changed artifact group/name.
+        // Instead we add the compiler manually below in the dependencies {}. Also see
+        // the root build.gradle for info on how to apply the plugin.
+        // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
+
+        // compose true
     }
 
     composeOptions {
@@ -104,6 +110,8 @@ dependencies {
 
     implementation Libs.AndroidX.Lifecycle.viewmodel
 
+    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
+
     implementation Libs.AndroidX.Compose.foundation
     implementation Libs.AndroidX.Compose.material
     implementation Libs.AndroidX.Compose.materialIconsExtended

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt

@@ -20,11 +20,10 @@ import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope.align
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.Stack
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxSize
@@ -282,7 +281,6 @@ fun HomeCategoryTabIndicator(
     Spacer(
         modifier.padding(horizontal = 24.dp)
             .preferredHeight(4.dp)
-            .align(Alignment.CenterHorizontally)
             .background(color, RoundedCornerShape(topLeftPercent = 100, topRightPercent = 100))
     )
 }
@@ -323,7 +321,7 @@ private fun FollowedPodcastCarouselItem(
     Column(
         modifier.padding(horizontal = 12.dp, vertical = 8.dp)
     ) {
-        Stack(
+        Box(
             Modifier
                 .weight(1f)
                 .align(Alignment.CenterHorizontally)

Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt

@@ -21,12 +21,12 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.Text
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.contentColor
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ConstraintLayout
 import androidx.compose.foundation.layout.Dimension
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.Stack
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -69,7 +69,7 @@ import com.example.jetcaster.ui.theme.JetcasterTheme
 import com.example.jetcaster.ui.theme.Keyline1
 import com.example.jetcaster.util.ToggleFollowPodcastIconButton
 import com.example.jetcaster.util.viewModelProviderFactoryOf
-import dev.chrisbanes.accompanist.coil.CoilImageWithCrossfade
+import dev.chrisbanes.accompanist.coil.CoilImage
 import java.time.format.DateTimeFormatter
 import java.time.format.FormatStyle
 
@@ -142,8 +142,9 @@ fun EpisodeListItem(
 
         if (podcast.imageUrl != null) {
             // If we have an image Url, we can show it using [CoilImage]
-            CoilImageWithCrossfade(
+            CoilImage(
                 data = podcast.imageUrl,
+                fadeIn = true,
                 contentScale = ContentScale.Crop,
                 loading = { /* TODO do something better here */ },
                 modifier = Modifier.preferredSize(56.dp)
@@ -306,15 +307,16 @@ private fun TopPodcastRowItem(
     modifier: Modifier = Modifier
 ) {
     Column(modifier) {
-        Stack(
+        Box(
             Modifier
                 .fillMaxWidth()
                 .aspectRatio(1f)
                 .align(Alignment.CenterHorizontally)
         ) {
             if (podcastImageUrl != null) {
-                CoilImageWithCrossfade(
+                CoilImage(
                     data = podcastImageUrl,
+                    fadeIn = true,
                     contentScale = ContentScale.Crop,
                     loading = { /* TODO do something better here */ },
                     modifier = Modifier.fillMaxSize().clip(MaterialTheme.shapes.medium)

Jetcaster/app/src/main/java/com/example/jetcaster/util/ItemSwitcher.kt

@@ -20,7 +20,7 @@ import androidx.compose.animation.asDisposableClock
 import androidx.compose.animation.core.TransitionDefinition
 import androidx.compose.animation.core.TransitionState
 import androidx.compose.animation.core.createAnimation
-import androidx.compose.foundation.layout.Stack
+import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.invalidate
 import androidx.compose.runtime.key
@@ -93,7 +93,7 @@ fun <T> ItemSwitcher(
             }
         }
     }
-    Stack(modifier) {
+    Box(modifier) {
         state.invalidate = invalidate
         state.items.forEach { (item, transition) ->
             key(item) {

Jetcaster/app/src/main/java/com/example/jetcaster/util/Pager.kt

@@ -20,9 +20,8 @@ import androidx.compose.animation.AnimatedFloatModel
 import androidx.compose.animation.core.AnimationClockObservable
 import androidx.compose.animation.core.AnimationEndReason
 import androidx.compose.animation.core.fling
-import androidx.compose.foundation.Box
-import androidx.compose.foundation.ContentGravity
 import androidx.compose.foundation.gestures.draggable
+import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.getValue
@@ -31,6 +30,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.runtime.structuralEqualityPolicy
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Layout
 import androidx.compose.ui.Measurable
 import androidx.compose.ui.Modifier
@@ -143,7 +143,7 @@ fun Pager(
                 val pageData = PageData(page)
                 val scope = PagerScope(state, page)
                 key(pageData) {
-                    Box(gravity = ContentGravity.Center, modifier = pageData) {
+                    Box(alignment = Alignment.Center, modifier = pageData) {
                         scope.pageContent()
                     }
                 }

Jetcaster/build.gradle

@@ -16,7 +16,6 @@
 
 import com.example.jetcaster.buildsrc.Libs
 import com.example.jetcaster.buildsrc.Versions
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
     repositories {
@@ -25,6 +24,10 @@ buildscript {
     }
 
     dependencies {
+        // Downgrade R8 due to b/169095082
+        // TODO remove this
+        classpath 'com.android.tools:r8:2.1.66'
+
         classpath Libs.androidGradlePlugin
         classpath Libs.Kotlin.gradlePlugin
     }
@@ -61,7 +64,13 @@ subprojects {
         }
     }
 
-    tasks.withType(KotlinCompile).all {
+    // Create a configuration which allows us to intercept the JARs, and add them to
+    // Kotlin Compiler freeCompilerArgs. This is needed because we can't currently use the
+    // built-in `compose` feature in AGP, since it depends on the old Compose Compiler artifacts.
+    // TODO: Remove this once AGP uses the new Compose Compiler artifact name
+    def compilerPluginConfig = project.configurations.create("kotlinCompilerPlugin")
+
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { compile ->
         kotlinOptions {
             // Treat all Kotlin warnings as errors
             allWarningsAsErrors = true
@@ -78,5 +87,16 @@ subprojects {
             // Set JVM target to 1.8
             jvmTarget = "1.8"
         }
+
+        compile.dependsOn(compilerPluginConfig)
+        compile.doFirst {
+            if (!compilerPluginConfig.isEmpty()) {
+                // Add the compiler plugin JARs using the -Xplugin flag
+                compile.kotlinOptions.freeCompilerArgs +=
+                        "-Xplugin=${compilerPluginConfig.files.first()}"
+                // Need to turn on the IR compiler too
+                compile.kotlinOptions.useIR = true
+            }
+        }
     }
 }

Jetcaster/buildSrc/src/main/java/com/example/jetcaster/buildsrc/dependencies.kt

@@ -17,19 +17,19 @@
 package com.example.jetcaster.buildsrc
 
 object Versions {
-    const val ktlint = "0.38.1"
+    const val ktlint = "0.39.0"
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha11"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha12"
     const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
 
     const val junit = "junit:junit:4.13"
 
     const val material = "com.google.android.material:material:1.1.0"
 
     object Accompanist {
-        private const val version = "0.2.2"
+        private const val version = "0.2.3.compose-6860046-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
@@ -61,8 +61,10 @@ object Libs {
         const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha02"
 
         object Compose {
-            const val snapshot = ""
-            const val version = "1.0.0-alpha03"
+            const val snapshot = "6860046"
+            const val version = "1.0.0-SNAPSHOT"
+
+            const val compiler = "androidx.compose.compiler:compiler:$version"
 
             const val runtime = "androidx.compose.runtime:runtime:$version"
             const val foundation = "androidx.compose.foundation:foundation:${version}"