Merge #175

175: Update all dependencies r=msfjarvis a=msfjarvis

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

app/build.gradle.kts

@@ -3,7 +3,7 @@ plugins {
   kotlin("android")
   kotlin("kapt")
   id("dagger.hilt.android.plugin")
-  id("org.jetbrains.compose") version "0.4.0-build173"
+  id("org.jetbrains.compose") version "0.4.0-build177"
   id("shot")
   `versioning-plugin`
   `lobsters-plugin`
@@ -42,8 +42,8 @@ dependencies {
   implementation(Dependencies.AndroidX.Lifecycle.runtimeKtx)
   implementation(Dependencies.AndroidX.Lifecycle.viewmodelKtx)
   implementation(Dependencies.Kotlin.Coroutines.android)
-  implementation(Dependencies.ThirdParty.accompanist)
-  implementation(Dependencies.ThirdParty.composeFlowLayout)
+  implementation(Dependencies.ThirdParty.accompanistCoil)
+  implementation(Dependencies.ThirdParty.accompanistFlow)
   implementation(Dependencies.ThirdParty.Moshi.lib)
   implementation(Dependencies.ThirdParty.pullToRefresh)
   implementation(Dependencies.ThirdParty.Retrofit.moshi)

app/src/main/java/dev/msfjarvis/lobsters/ui/posts/LobstersItem.kt

@@ -28,8 +28,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import coil.transform.CircleCropTransformation
-import com.star_zero.compose.flowlayout.FlowLayout
-import dev.chrisbanes.accompanist.coil.CoilImage
+import com.google.accompanist.coil.CoilImage
+import com.google.accompanist.flowlayout.FlowRow
 import dev.msfjarvis.lobsters.R
 import dev.msfjarvis.lobsters.data.api.LobstersApi
 import dev.msfjarvis.lobsters.data.local.SavedPost
@@ -213,9 +213,9 @@ fun TagRow(
   Box(
     modifier = Modifier.then(modifier),
   ) {
-    FlowLayout(
-      horizontalSpacing = 8.dp,
-      verticalSpacing = 8.dp,
+    FlowRow(
+      mainAxisSpacing = 8.dp,
+      crossAxisSpacing = 8.dp,
     ) {
       tags.forEach { tag ->
         Text(

buildSrc/src/main/java/Dependencies.kt

@@ -16,7 +16,7 @@ object Plugins {
 }
 
 object Dependencies {
-  const val COMPOSE_VERSION = "1.0.0-beta02"
+  const val COMPOSE_VERSION = "1.0.0-beta03"
 
   object Kotlin {
 
@@ -31,14 +31,14 @@ object Dependencies {
 
   object AndroidX {
 
-    const val appCompat = "androidx.appcompat:appcompat:1.3.0-beta01"
+    const val appCompat = "androidx.appcompat:appcompat:1.3.0-rc01"
     const val browser = "androidx.browser:browser:1.3.0"
     const val coreLibraryDesugaring = "com.android.tools:desugar_jdk_libs:1.0.10"
     const val datastore = "androidx.datastore:datastore-preferences:1.0.0-alpha08"
 
     object Compose {
 
-      const val activity = "androidx.activity:activity-compose:1.3.0-alpha04"
+      const val activity = "androidx.activity:activity-compose:1.3.0-alpha05"
       const val compiler = "androidx.compose.compiler:compiler:$COMPOSE_VERSION"
       const val foundation = "androidx.compose.foundation:foundation:$COMPOSE_VERSION"
       const val foundationLayout = "androidx.compose.foundation:foundation-layout:$COMPOSE_VERSION"
@@ -59,7 +59,7 @@ object Dependencies {
 
     object Lifecycle {
 
-      private const val version = "2.3.0"
+      private const val version = "2.4.0-alpha01"
       const val runtimeKtx = "androidx.lifecycle:lifecycle-runtime-ktx:$version"
       const val viewmodelKtx = "androidx.lifecycle:lifecycle-viewmodel-ktx:$version"
     }
@@ -67,8 +67,9 @@ object Dependencies {
 
   object ThirdParty {
 
-    const val accompanist = "dev.chrisbanes.accompanist:accompanist-coil:0.6.2"
-    const val composeFlowLayout = "com.star-zero:compose-flowlayout:0.0.1"
+    private const val accompanistVersion = "0.7.0"
+    const val accompanistCoil = "com.google.accompanist:accompanist-coil:$accompanistVersion"
+    const val accompanistFlow = "com.google.accompanist:accompanist-flowlayout:$accompanistVersion"
     const val kamel = "com.alialbaali.kamel:kamel-image:0.2.0"
     const val pullToRefresh = "com.puculek.pulltorefresh:pull-to-refresh-compose:1.0.1"
 

common/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
   kotlin("multiplatform")
   id("com.android.library")
-  id("org.jetbrains.compose") version "0.4.0-build173"
+  id("org.jetbrains.compose") version "0.4.0-build177"
   `lobsters-plugin`
 }
 

desktop/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.compose.compose
 
 plugins {
   kotlin("jvm")
-  id("org.jetbrains.compose") version "0.4.0-build175"
+  id("org.jetbrains.compose") version "0.4.0-build177"
   `lobsters-plugin`
 }