Merge pull request chrisbanes#661 from chrisbanes/cb/agp-4.2.0-alpha04

Update to AGP 4.2.0-alpha04 and Compose SNAPSHOT 6658922
sanghoon9173 · Jul 9, 2020 · 85d3df1 · 85d3df1
2 parents b4a7a30 + 659bfb9
commit 85d3df1
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 66 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -105,6 +105,9 @@ android {
         // Ignore any tests
         ignoreTestSources true
 
+        // TODO: remove this once https://issuetracker.google.com/issues/159733104 is fixed
+        abortOnError false
+
         // Lint doesn't seem to handle Kotlin int types + string format very well
         disable 'StringFormatMatches'
         // Seems to be broken in 4.0.0-alpha09 https://issuetracker.google.com/issues/148172219

diff --git a/build.gradle b/build.gradle
@@ -66,9 +66,9 @@ allprojects {
         maven { url 'https://jitpack.io' }
         maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
 
-        if (Libs.AndroidX.UI.version.endsWith("SNAPSHOT")) {
+        if (Libs.AndroidX.Compose.version.endsWith("SNAPSHOT")) {
             maven {
-                url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.UI.snapshot}/artifacts/ui/repository/"
+                url "https://androidx.dev/snapshots/builds/${Libs.AndroidX.Compose.snapshot}/artifacts/ui/repository/"
             }
         }
 

diff --git a/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt b/buildSrc/src/main/java/app/tivi/buildsrc/dependencies.kt
@@ -21,7 +21,7 @@ object Versions {
 }
 
 object Libs {
-    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha02"
+    const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha04"
 
     const val gradlePlayPublisher = "com.github.triplet.gradle:play-publisher:3.0.0-SNAPSHOT"
 
@@ -53,7 +53,7 @@ object Libs {
     }
 
     object Accompanist {
-        private const val version = "0.1.6.ui-6602655-SNAPSHOT"
+        private const val version = "0.1.7.ui-${AndroidX.Compose.snapshot}-SNAPSHOT"
         const val mdcTheme = "dev.chrisbanes.accompanist:accompanist-mdc-theme:$version"
         const val coil = "dev.chrisbanes.accompanist:accompanist-coil:$version"
     }
@@ -155,25 +155,25 @@ object Libs {
             const val runtimeKtx = "androidx.work:work-runtime-ktx:$version"
         }
 
-        object UI {
-            const val snapshot = "6602655"
+        object Compose {
+            const val snapshot = "6658828"
             const val version = "0.1.0-SNAPSHOT"
 
-            const val core = "androidx.ui:ui-core:$version"
-            const val layout = "androidx.ui:ui-layout:$version"
-            const val material = "androidx.ui:ui-material:$version"
-            const val foundation = "androidx.ui:ui-foundation:$version"
-            const val animation = "androidx.ui:ui-animation:$version"
-            const val tooling = "androidx.ui:ui-tooling:$version"
-            const val livedata = "androidx.ui:ui-livedata:$version"
-            const val iconsExtended = "androidx.ui:ui-material-icons-extended:$version"
-        }
-
-        object Compose {
-            const val version = UI.version
             const val kotlinCompilerVersion = "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
 
             const val runtime = "androidx.compose:compose-runtime:$version"
+            const val foundation = "androidx.compose.foundation:foundation:${version}"
+
+            const val animation = "androidx.compose.animation:animation:${version}"
+            const val material = "androidx.compose.material:material:${version}"
+            const val iconsExtended = "androidx.compose.material:material-icons-extended:${version}"
+
+            const val core = "androidx.ui:ui-core:${version}"
+            const val livedata = "androidx.ui:ui-livedata:${version}"
+            const val layout = "androidx.ui:ui-layout:${version}"
+
+            const val tooling = "androidx.compose.tooling:tooling:${version}"
+            const val test = "androidx.compose.test:test-core:${version}"
         }
 
         object Hilt {

diff --git a/common-ui-compose/build.gradle b/common-ui-compose/build.gradle
@@ -51,13 +51,13 @@ dependencies {
     implementation Libs.AndroidX.Lifecycle.livedata
 
     implementation Libs.AndroidX.Compose.runtime
-    implementation Libs.AndroidX.UI.foundation
-    implementation Libs.AndroidX.UI.core
-    implementation Libs.AndroidX.UI.layout
-    implementation Libs.AndroidX.UI.material
-    implementation Libs.AndroidX.UI.animation
-    implementation Libs.AndroidX.UI.tooling
-    implementation Libs.AndroidX.UI.livedata
+    implementation Libs.AndroidX.Compose.foundation
+    implementation Libs.AndroidX.Compose.core
+    implementation Libs.AndroidX.Compose.layout
+    implementation Libs.AndroidX.Compose.material
+    implementation Libs.AndroidX.Compose.animation
+    implementation Libs.AndroidX.Compose.tooling
+    implementation Libs.AndroidX.Compose.livedata
 
     implementation Libs.Google.material
 

diff --git a/gradle.properties b/gradle.properties
@@ -20,10 +20,6 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 android.enableJetifier=true
 
-# Need to stop Jetifier breaking BouncyCastle
-# https://issuetracker.google.com/issues/142580430
-android.jetifier.blacklist=.*bcprov.*
-
 # Allows AGP to use Gradle workers
 android.enableGradleWorkers=true
 

diff --git a/ui-account/build.gradle b/ui-account/build.gradle
@@ -69,14 +69,14 @@ dependencies {
     implementation Libs.AndroidX.Navigation.fragment
 
     implementation Libs.AndroidX.Compose.runtime
-    implementation Libs.AndroidX.UI.foundation
-    implementation Libs.AndroidX.UI.core
-    implementation Libs.AndroidX.UI.layout
-    implementation Libs.AndroidX.UI.material
-    implementation Libs.AndroidX.UI.animation
-    implementation Libs.AndroidX.UI.tooling
-    implementation Libs.AndroidX.UI.livedata
-    implementation Libs.AndroidX.UI.iconsExtended
+    implementation Libs.AndroidX.Compose.foundation
+    implementation Libs.AndroidX.Compose.core
+    implementation Libs.AndroidX.Compose.layout
+    implementation Libs.AndroidX.Compose.material
+    implementation Libs.AndroidX.Compose.animation
+    implementation Libs.AndroidX.Compose.tooling
+    implementation Libs.AndroidX.Compose.livedata
+    implementation Libs.AndroidX.Compose.iconsExtended
 
     implementation Libs.Accompanist.mdcTheme
     implementation Libs.Accompanist.coil

diff --git a/ui-account/src/main/java/app/tivi/account/AccountUi.kt b/ui-account/src/main/java/app/tivi/account/AccountUi.kt
@@ -103,22 +103,19 @@ fun AccountUi(
                 .padding(horizontal = 16.dp)
         ) {
             if (viewState.authState == TraktAuthState.LOGGED_OUT) {
-                OutlinedButton(
-                    onClick = { actioner(Login) },
-                    text = { Text(text = stringResource(R.string.login)) }
-                )
+                OutlinedButton(onClick = { actioner(Login) }) {
+                    Text(text = stringResource(R.string.login))
+                }
             } else {
-                TextButton(
-                    onClick = { actioner(Login) },
-                    text = { Text(text = stringResource(R.string.refresh_credentials)) }
-                )
+                TextButton(onClick = { actioner(Login) }) {
+                    Text(text = stringResource(R.string.refresh_credentials))
+                }
 
                 Spacer(modifier = Modifier.preferredWidth(8.dp))
 
-                OutlinedButton(
-                    onClick = { actioner(Logout) },
-                    text = { Text(text = stringResource(R.string.logout)) }
-                )
+                OutlinedButton(onClick = { actioner(Logout) }) {
+                    Text(text = stringResource(R.string.logout))
+                }
             }
         }
 

diff --git a/ui-episodedetails/build.gradle b/ui-episodedetails/build.gradle
@@ -74,14 +74,14 @@ dependencies {
     implementation Libs.AndroidX.Fragment.fragmentKtx
 
     implementation Libs.AndroidX.Compose.runtime
-    implementation Libs.AndroidX.UI.foundation
-    implementation Libs.AndroidX.UI.core
-    implementation Libs.AndroidX.UI.layout
-    implementation Libs.AndroidX.UI.material
-    implementation Libs.AndroidX.UI.animation
-    implementation Libs.AndroidX.UI.tooling
-    implementation Libs.AndroidX.UI.livedata
-    implementation Libs.AndroidX.UI.iconsExtended
+    implementation Libs.AndroidX.Compose.foundation
+    implementation Libs.AndroidX.Compose.core
+    implementation Libs.AndroidX.Compose.layout
+    implementation Libs.AndroidX.Compose.material
+    implementation Libs.AndroidX.Compose.animation
+    implementation Libs.AndroidX.Compose.tooling
+    implementation Libs.AndroidX.Compose.livedata
+    implementation Libs.AndroidX.Compose.iconsExtended
 
     implementation Libs.Accompanist.mdcTheme
     implementation Libs.Accompanist.coil

diff --git a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetails.kt b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetails.kt
@@ -19,6 +19,7 @@ package app.tivi.episodedetails
 import android.os.Build
 import android.view.ViewGroup
 import androidx.animation.transitionDefinition
+import androidx.animation.tween
 import androidx.compose.Composable
 import androidx.compose.Providers
 import androidx.compose.Recomposer
@@ -449,7 +450,7 @@ private fun EpisodeWatchSwipeBackground(
             }
 
             transition {
-                color using tween<Color> { duration = 200 }
+                color using tween(durationMillis = 200)
             }
         }
     }

diff --git a/ui-showdetails/build.gradle b/ui-showdetails/build.gradle
@@ -79,14 +79,14 @@ dependencies {
     implementation Libs.Insetter.ktx
 
     implementation Libs.AndroidX.Compose.runtime
-    implementation Libs.AndroidX.UI.foundation
-    implementation Libs.AndroidX.UI.core
-    implementation Libs.AndroidX.UI.layout
-    implementation Libs.AndroidX.UI.material
-    implementation Libs.AndroidX.UI.animation
-    implementation Libs.AndroidX.UI.tooling
-    implementation Libs.AndroidX.UI.livedata
-    implementation Libs.AndroidX.UI.iconsExtended
+    implementation Libs.AndroidX.Compose.foundation
+    implementation Libs.AndroidX.Compose.core
+    implementation Libs.AndroidX.Compose.layout
+    implementation Libs.AndroidX.Compose.material
+    implementation Libs.AndroidX.Compose.animation
+    implementation Libs.AndroidX.Compose.tooling
+    implementation Libs.AndroidX.Compose.livedata
+    implementation Libs.AndroidX.Compose.iconsExtended
 
     implementation Libs.Accompanist.mdcTheme
     implementation Libs.Accompanist.coil