[1.113.*] Pre-release merge (#541)

.github/workflows/ci.yml

@@ -51,7 +51,7 @@ jobs:
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
       - name: Dependency Review
-        uses: actions/dependency-review-action@5bbc3ba658137598168acb2ab73b21c432dd411b # v4
+        uses: actions/dependency-review-action@e58c696e52cac8e62d61cc21fda89565d71505d7 # v4
         with:
           base-ref: refs/heads/main
           head-ref: ${{ github.ref }}

android/build.gradle.kts

@@ -6,8 +6,6 @@
  */
 @file:Suppress("UnstableApiUsage")
 
-import dev.msfjarvis.claw.gradle.addTestDependencies
-
 plugins {
   id("dev.msfjarvis.claw.android-application")
   id("dev.msfjarvis.claw.rename-artifacts")
@@ -73,38 +71,46 @@ dependencies {
   implementation(platform(libs.okhttp.bom))
   implementation(libs.aboutLibraries.m3)
   implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.glance)
   implementation(libs.androidx.compose.glance.m3)
   implementation(libs.androidx.compose.material.icons.extended)
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.compose.material3.window.size)
+  implementation(libs.androidx.compose.runtime)
+  implementation(libs.androidx.compose.ui)
+  implementation(libs.androidx.compose.ui.text)
+  implementation(libs.androidx.compose.ui.util)
   implementation(libs.androidx.core.splashscreen)
   implementation(libs.androidx.lifecycle.compose)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.work.runtime)
-  implementation(libs.coil)
   implementation(libs.copydown)
   implementation(libs.dagger)
-  implementation(libs.jsoup)
+  implementation(libs.eithernet)
+  implementation(libs.javax.inject)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.kotlinx.serialization.core)
+  implementation(libs.kotlinx.serialization.json)
   implementation(libs.material3.pulltorefresh)
   implementation(libs.napier)
+  implementation(libs.okhttp.core)
+  implementation(libs.okhttp.loggingInterceptor)
+  implementation(libs.retrofit)
   implementation(libs.sqldelight.extensions.coroutines)
   implementation(libs.swipe)
   implementation(libs.unfurl)
   implementation(projects.api)
   implementation(projects.common)
   implementation(projects.core)
+  implementation(projects.database.core)
   implementation(projects.database.impl)
   implementation(projects.model)
   implementation(projects.web)
 
   kapt(libs.dagger.compiler)
-
-  testImplementation(libs.kotlinx.coroutines.test)
-  testImplementation(libs.okhttp.mockwebserver)
-  addTestDependencies(project)
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt

@@ -17,6 +17,7 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Inbox
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -54,6 +55,7 @@ fun DatabasePosts(
           stickyHeader(contentType = "month-header") { MonthHeader(label = month) }
           items(items = posts, key = { it.shortId }, contentType = { "LobstersItem" }) { item ->
             LobstersListItem(item = item, refresh = {}, postActions = postActions)
+            HorizontalDivider()
           }
         }
       }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt

@@ -16,6 +16,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -72,6 +73,7 @@ fun NetworkPosts(
               postActions = postActions,
               refresh = { lazyPagingItems.refresh() },
             )
+            HorizontalDivider()
           }
         }
         if (lazyPagingItems.loadState.append == LoadState.Loading) {

api/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * Copyright © 2021-2024 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -18,17 +18,18 @@ android { namespace = "dev.msfjarvis.claw.api" }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
-  api(libs.eithernet)
+  api(libs.dagger)
+  api(libs.javax.inject)
+  api(libs.okhttp.core)
   api(libs.retrofit)
   api(projects.model)
 
-  implementation(libs.dagger)
-  implementation(libs.javax.inject)
+  implementation(libs.eithernet)
   implementation(libs.jsoup)
 
   testImplementation(testFixtures(libs.eithernet))
   testImplementation(libs.kotlinx.coroutines.test)
+  testImplementation(libs.kotlinx.serialization.core)
   testImplementation(libs.kotlinx.serialization.json)
-  testImplementation(libs.retrofit.kotlinxSerializationConverter)
   addTestDependencies(project)
 }

build.gradle.kts

@@ -8,4 +8,5 @@ plugins {
   id("dev.msfjarvis.claw.spotless")
   id("dev.msfjarvis.claw.versions")
   id("dev.msfjarvis.claw.kotlin-common")
+  alias(libs.plugins.dependencyAnalysis)
 }

common/build.gradle.kts

@@ -32,6 +32,9 @@ androidComponents { beforeVariants { (it as HasUnitTestBuilder).enableUnitTest =
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
+  api(libs.androidx.compose.ui)
+  api(libs.dagger)
+  api(libs.javax.inject)
   api(projects.core)
   api(projects.database.core)
   api(projects.model)
@@ -44,12 +47,15 @@ dependencies {
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.compose.runtime)
   implementation(libs.androidx.compose.ui.text)
+  implementation(libs.androidx.core)
+  implementation(libs.coil)
   implementation(libs.coil.compose)
   implementation(libs.compose.richtext.markdown)
   implementation(libs.compose.richtext.material3)
   implementation(libs.compose.richtext.ui)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.kotlinResult)
   implementation(libs.kotlinResult.coroutines)
   implementation(libs.napier)
 

common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt

@@ -77,7 +77,7 @@ fun LobstersCard(
           refresh()
         }
         .background(MaterialTheme.colorScheme.background)
-        .padding(start = 8.dp, bottom = 2.dp)
+        .padding(start = 8.dp)
   ) {
     Row(
       horizontalArrangement = Arrangement.spacedBy(8.dp),

core/build.gradle.kts

@@ -16,15 +16,17 @@ android { namespace = "dev.msfjarvis.claw.core" }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
+  api(libs.dagger)
   api(libs.javax.inject)
   api(libs.kotlinx.coroutines.core)
   api(libs.kotlinx.serialization.json)
   api(libs.okhttp.loggingInterceptor)
+  api(libs.napier)
+  api(libs.okhttp.core)
+  api(libs.retrofit)
 
   implementation(platform(libs.okhttp.bom))
   implementation(platform(libs.sentry.bom))
-  implementation(libs.dagger)
-  implementation(libs.napier)
-  implementation(libs.okhttp.core)
+  implementation(libs.kotlinx.serialization.core)
   implementation(libs.retrofit.kotlinxSerializationConverter)
 }

database/impl/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * Copyright © 2021-2024 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -18,6 +18,8 @@ android { namespace = "dev.msfjarvis.claw.database" }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
+  api(libs.dagger)
+  api(libs.javax.inject)
   api(projects.database.core)
   implementation(libs.napier)
   implementation(libs.dagger)

gradle/libs.versions.toml

@@ -39,7 +39,9 @@ androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-text = { module = "androidx.compose.ui:ui-text" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
+androidx-compose-ui-unit = { module = "androidx.compose.ui:ui-unit" }
 androidx-compose-ui-util = { module = "androidx.compose.ui:ui-util" }
+androidx-core = "androidx.core:core:1.13.0"
 androidx-core-splashscreen = "androidx.core:core-splashscreen:1.2.0-alpha01"
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "lifecycle" }
 androidx-lifecycle-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
@@ -48,11 +50,11 @@ androidx-lint = "androidx.lint:lint-gradle:1.0.0-alpha01"
 androidx-navigation-compose = "androidx.navigation:navigation-compose:2.8.0-alpha07"
 androidx-paging-compose = "androidx.paging:paging-compose:3.3.0-beta01"
 androidx-profileinstaller = "androidx.profileinstaller:profileinstaller:1.4.0-alpha01"
-androidx-test-core = "androidx.test:core:1.6.0-alpha05"
-androidx-test-espresso-core = "androidx.test.espresso:espresso-core:3.6.0-alpha03"
-androidx-test-ext-junit = "androidx.test.ext:junit:1.2.0-alpha03"
-androidx-test-rules = "androidx.test:rules:1.6.0-alpha03"
-androidx-test-runner = "androidx.test:runner:1.6.0-alpha06"
+androidx-test-core = "androidx.test:core:1.6.0-alpha06"
+androidx-test-espresso-core = "androidx.test.espresso:espresso-core:3.6.0-alpha04"
+androidx-test-ext-junit = "androidx.test.ext:junit:1.2.0-alpha04"
+androidx-test-rules = "androidx.test:rules:1.6.0-alpha04"
+androidx-test-runner = "androidx.test:runner:1.6.0-alpha07"
 androidx-test-uiautomator = "androidx.test.uiautomator:uiautomator:2.3.0"
 androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "workmanager" }
 build-agp = { module = "com.android.tools.build:gradle", version.ref = "agp" }
@@ -76,8 +78,10 @@ jsoup = "org.jsoup:jsoup:1.17.2"
 junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit" }
 junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit" }
 junit-legacy = "junit:junit:4.13.2"
+konvert-annotations = { module = "io.mcarle:konvert-annotations", version.ref = "konvert" }
 konvert-api = { module = "io.mcarle:konvert-api", version.ref = "konvert" }
 konvert-processor = { module = "io.mcarle:konvert", version.ref = "konvert" }
+kotlinResult = { module = "com.michael-bull.kotlin-result:kotlin-result", version.ref = "kotlinResult" }
 kotlinResult-coroutines = { module = "com.michael-bull.kotlin-result:kotlin-result-coroutines", version.ref = "kotlinResult" }
 kotlinx-collections-immutable = "org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.7"
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
@@ -113,6 +117,7 @@ android-lint = { id = "com.android.lint", version.ref = "agp" }
 android-test = { id = "com.android.test", version.ref = "agp" }
 anvil = "com.squareup.anvil:2.5.0-beta07"
 baselineprofile = { id = "androidx.baselineprofile", version.ref = "benchmark" }
+dependencyAnalysis = "com.autonomousapps.dependency-analysis:1.31.0"
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 ksp = "com.google.devtools.ksp:1.9.23-1.0.20"
 licensee = "app.cash.licensee:1.11.0"

model/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * Copyright © 2021-2024 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -12,9 +12,10 @@ plugins {
 }
 
 dependencies {
-  implementation(libs.kotlinx.serialization.core)
+  compileOnly(libs.konvert.annotations)
+  api(projects.database.core)
   implementation(libs.konvert.api)
-  implementation(projects.database.core)
+  implementation(libs.kotlinx.serialization.core)
 
   ksp(libs.konvert.processor)
 }

web/build.gradle.kts

@@ -21,11 +21,14 @@ android {
 }
 
 dependencies {
-  implementation(projects.core)
+  api(libs.androidx.compose.runtime)
+  api(libs.androidx.compose.ui)
+  api(libs.kotlinx.coroutines.core)
+  api(projects.core)
+
   implementation(platform(libs.androidx.compose.bom))
-  implementation(libs.androidx.compose.material3)
-  implementation(libs.androidx.compose.ui.util)
-  implementation(libs.androidx.lifecycle.runtime)
   implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.compose.foundation)
+  implementation(libs.androidx.compose.ui.unit)
   implementation(libs.kotlinx.collections.immutable)
 }