[Crane] Update to SNAPSHOT 6891475

Author: Manuel Vivo

Crane/app/build.gradle

@@ -72,13 +72,8 @@ android {
     }
 
     buildFeatures {
-        // 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
 
-        // compose true
         // Disable unused AGP features
         buildConfig false
         aidl false
@@ -93,10 +88,6 @@ android {
 }
 
 dependencies {
-    // Temporary workaround (see above)
-    // TODO: remove this once we upgrade to an AGP version which uses the new artifact details
-    kotlinCompilerPlugin Libs.AndroidX.Compose.compiler
-
     implementation Libs.Kotlin.stdlib
     implementation Libs.googleMaps
 

Crane/app/src/main/java/androidx/compose/samples/crane/base/BaseUserInput.kt

@@ -17,11 +17,11 @@
 package androidx.compose.samples.crane.base
 
 import androidx.annotation.DrawableRes
+import androidx.compose.foundation.AmbientContentColor
 import androidx.compose.foundation.BaseTextField
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Icon
 import androidx.compose.foundation.Text
-import androidx.compose.foundation.contentColor
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
@@ -63,7 +63,7 @@ fun CraneUserInput(
     modifier: Modifier = Modifier,
     caption: String? = null,
     @DrawableRes vectorImageId: Int? = null,
-    tint: Color = contentColor()
+    tint: Color = AmbientContentColor.current
 ) {
     CraneBaseUserInput(
         modifier = modifier,
@@ -111,7 +111,7 @@ private fun CraneBaseUserInput(
     @DrawableRes vectorImageId: Int? = null,
     showCaption: () -> Boolean = { true },
     tintIcon: () -> Boolean,
-    tint: Color = contentColor(),
+    tint: Color = AmbientContentColor.current,
     children: @Composable () -> Unit
 ) {
     Surface(modifier = modifier, color = MaterialTheme.colors.primaryVariant) {

Crane/app/src/main/java/androidx/compose/samples/crane/home/LandingScreen.kt

@@ -20,7 +20,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.launchInComposition
+import androidx.compose.runtime.LaunchedTask
 import androidx.compose.samples.crane.R
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -32,7 +32,7 @@ private const val SplashWaitTime: Long = 2000
 @Composable
 fun LandingScreen(modifier: Modifier = Modifier, onTimeout: () -> Unit) {
     Box(modifier = modifier.fillMaxSize(), alignment = Alignment.Center) {
-        launchInComposition {
+        LaunchedTask {
             delay(SplashWaitTime)
             onTimeout()
         }

Crane/build.gradle

@@ -56,13 +56,7 @@ subprojects {
         }
     }
 
-    // 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 ->
+    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
         kotlinOptions {
             // Treat all Kotlin warnings as errors
             allWarningsAsErrors = true
@@ -73,30 +67,5 @@ subprojects {
             freeCompilerArgs += '-Xopt-in=kotlin.RequiresOptIn'
             freeCompilerArgs += '-Xallow-jvm-ir-dependencies'
         }
-
-        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
-            }
-        }
-    }
-
-    // Crane uses Compose alpha03 and Android Gradle Plugin 4.2.0-alpha13 which are incompatible
-    // TODO: Remove this workaround when updating to >alpha04
-    configurations.configureEach {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            def group = details.requested.group
-            def module = details.requested.module.name
-            def version = details.requested.version
-
-            if (group == 'androidx.compose.compiler' && module == 'compiler') {
-                details.useTarget("androidx.compose:compose-compiler:$version")
-            }
-        }
     }
 }

Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt

@@ -26,7 +26,7 @@ object Libs {
     const val googleMaps = "com.google.android.libraries.maps:maps:3.1.0-beta"
 
     object Accompanist {
-        private const val version = "0.2.3.compose-6860046-SNAPSHOT"
+        private const val version = "0.3.1.compose-6891475-SNAPSHOT"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
 
@@ -41,10 +41,9 @@ object Libs {
         const val appcompat = "androidx.appcompat:appcompat:1.3.0-alpha02"
 
         object Compose {
-            const val snapshot = "6860046"
+            const val snapshot = "6891475"
             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 runtimeLivedata = "androidx.compose.runtime:runtime-livedata:$version"
             const val material = "androidx.compose.material:material:$version"