More dependency rake (#995)

app/build.gradle.kts

@@ -483,6 +483,8 @@ dependencies {
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.annotations)
   implementation(libs.androidx.appCompat)
+  implementation(libs.androidx.appCompat.resources)
+  implementation(libs.androidx.collection)
   implementation(libs.androidx.compose.accompanist.adaptive)
   implementation(libs.androidx.compose.accompanist.systemUi)
   implementation(libs.androidx.compose.animation.graphics)
@@ -496,6 +498,7 @@ dependencies {
   implementation(libs.androidx.core)
   implementation(libs.androidx.coreKtx)
   implementation(libs.androidx.customTabs)
+  implementation(libs.androidx.datastore.core)
   implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.datastore.preferences.core)
   implementation(libs.androidx.design)
@@ -508,10 +511,12 @@ dependencies {
   implementation(libs.androidx.preferenceKtx)
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.splashscreen)
+  implementation(libs.androidx.sqlite)
   implementation(libs.androidx.window)
   implementation(libs.apollo.api)
   implementation(libs.apollo.httpcache)
   implementation(libs.apollo.normalizedCache)
+  implementation(libs.apollo.normalizedCache.api)
   implementation(libs.apollo.runtime)
   implementation(libs.circuit.backstack)
   implementation(libs.circuit.codegenAnnotations)
@@ -527,9 +532,11 @@ dependencies {
   implementation(libs.circuitx.overlays)
   implementation(libs.coil.base)
   implementation(libs.coil.compose)
+  implementation(libs.coil.compose.base)
   implementation(libs.coil.default)
   implementation(libs.coil.gif)
   implementation(libs.collapsingToolbar)
+  implementation(libs.errorProneAnnotations)
   implementation(libs.firebase.core)
   implementation(libs.firebase.database)
   implementation(libs.kotlin.coroutines)
@@ -560,9 +567,12 @@ dependencies {
   implementation(libs.sqldelight.paging)
   implementation(libs.sqldelight.primitiveAdapters)
   implementation(libs.sqldelight.runtime)
+  implementation(libs.telephoto.zoomable)
+  implementation(libs.telephoto.zoomableImage)
   implementation(libs.telephoto.zoomableImageCoil)
   implementation(libs.xmlutil.serialization)
   implementation(projects.bookmarks)
+  implementation(projects.bookmarks.db)
   implementation(projects.libraries.appconfig)
   implementation(projects.libraries.auth)
   implementation(projects.libraries.baseUi)
@@ -600,6 +610,8 @@ dependencies {
   debugImplementation(libs.misc.debug.soLoader)
   debugImplementation(libs.misc.debug.telescope)
   debugImplementation(libs.misc.leakCanary)
+  debugImplementation(libs.misc.leakCanary.shark)
+  debugImplementation(libs.misc.leakCanaryObjectWatcherAndroid)
   debugImplementation(libs.okhttp.debug.loggingInterceptor)
   debugImplementation(libs.retrofit.moshi)
   debugImplementation(projects.libraries.retrofitconverters)

bookmarks/build.gradle.kts

@@ -57,4 +57,4 @@ slack {
   features {
     dagger()
   }
-}
+}

gradle/libs.versions.toml

@@ -3,6 +3,8 @@ accompanist = "0.33.0-alpha"
 agp = "8.3.0-alpha06"
 androidx-activity = "1.8.0-rc01"
 androidx-core = "1.12.0"
+androidx-sqlite = "2.4.0-rc01"
+appcompat = "1.7.0-alpha03"
 benchmark = "1.2.0-rc01"
 compose-material3 = "1.2.0-alpha08"
 emoji = "1.2.0-alpha03"
@@ -84,10 +86,13 @@ sqldelight = { id = "app.cash.sqldelight", version.ref = "sqldelight" }
 androidx-annotations = "androidx.annotation:annotation:1.7.0"
 androidx-activity = { module = "androidx.activity:activity", version.ref = "androidx-activity" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity" }
-androidx-appCompat = "androidx.appcompat:appcompat:1.7.0-alpha03"
+androidx-appCompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
+androidx-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "appcompat" }
 
 androidx-benchmark-macro-junit = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark" }
 
+androidx-collection = "androidx.collection:collection:1.3.0-rc01"
+
 androidx-core = { module = "androidx.core:core", version.ref = "androidx-core" }
 androidx-coreKtx = { module = "androidx.core:core-ktx", version.ref = "androidx-core" }
 
@@ -98,6 +103,7 @@ androidx-emojiAppcompat = { module = "androidx.emoji:emoji-appcompat", version.r
 # Amusingly, appcompat depends on fragment 1.0.0, so we have to have this version to force the latest
 androidx-fragment = "androidx.fragment:fragment:1.7.0-alpha05"
 
+androidx-lifecycle = { module = "androidx.lifecycle:lifecycle", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-core = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycle" }
 androidx-lifecycle-viewmodel-savedState = { module = "androidx.lifecycle:lifecycle-viewmodel-savedstate", version.ref = "lifecycle" }
 
@@ -110,11 +116,13 @@ androidx-preferenceKtx = { module = "androidx.preference:preference-ktx", versio
 androidx-lifecycle-extensions = "androidx.lifecycle:lifecycle-extensions:2.2.0"
 androidx-lifecycle-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
 
-androidx-sqlite = "androidx.sqlite:sqlite-framework:2.4.0-rc01"
+androidx-sqlite-framework = { module = "androidx.sqlite:sqlite-framework", version.ref = "androidx-sqlite" }
+androidx-sqlite = { module = "androidx.sqlite:sqlite", version.ref = "androidx-sqlite" }
 
 androidx-compose-animation-graphics = { module = "androidx.compose.animation:animation-graphics", version.ref = "compose" }
 # Here to trigger renovate updates
 androidx-compose-compiler = { module = "androidx.compose.compiler:compiler", version.ref = "compose-compiler" }
+androidx-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 androidx-compose-uiTooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
 androidx-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
@@ -125,6 +133,7 @@ androidx-compose-materialIcons = { module = "androidx.compose.material:material-
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
 androidx-compose-accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
 androidx-compose-accompanist-systemUi = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
+androidx-constraintlayout = "androidx.constraintlayout:constraintlayout:2.2.0-alpha12"
 androidx-paging-compose = "androidx.paging:paging-compose:3.3.0-alpha02"
 androidx-compose-material-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
 androidx-compose-material-material3-windowSizeClass = { module = "androidx.compose.material3:material3-window-size-class", version.ref = "compose-material3" }
@@ -153,6 +162,7 @@ anvil-annotations = { module = "com.squareup.anvil:annotations", version.ref = "
 apollo-api = { module = "com.apollographql.apollo3:apollo-api", version.ref = "apollo" }
 apollo-httpcache = { module = "com.apollographql.apollo3:apollo-http-cache", version.ref = "apollo" }
 apollo-normalizedCache = { module = "com.apollographql.apollo3:apollo-normalized-cache", version.ref = "apollo" }
+apollo-normalizedCache-api = { module = "com.apollographql.apollo3:apollo-normalized-cache-api", version.ref = "apollo" }
 apollo-runtime = { module = "com.apollographql.apollo3:apollo-runtime", version.ref = "apollo" }
 
 autoService-annotations = "com.google.auto.service:auto-service:1.1.1"
@@ -181,17 +191,23 @@ coil-base = { module = "io.coil-kt:coil-base", version.ref = "coil" }
 coil-default = { module = "io.coil-kt:coil", version.ref = "coil" }
 coil-gif = { module = "io.coil-kt:coil-gif", version.ref = "coil" }
 coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coil" }
+coil-compose-base = { module = "io.coil-kt:coil-compose-base", version.ref = "coil" }
 
 corbind = { module = "ru.ldralighieri.corbind:corbind", version.ref = "corbind" }
 dagger-apt-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
 dagger-runtime = { module = "com.google.dagger:dagger", version.ref = "dagger" }
 dagger-spi = { module = "com.google.dagger:dagger-spi", version.ref = "dagger" }
 
+androidx-datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "datastore" }
 androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastore" }
 androidx-datastore-preferences-core = { module = "androidx.datastore:datastore-preferences-core", version.ref = "datastore" }
 
 eithernet = { module = "com.slack.eithernet:eithernet", version.ref = "eithernet" }
 
+errorProneAnnotations = "com.google.errorprone:error_prone_annotations:2.22.0"
+
+javaxInject = "javax.inject:javax.inject:1"
+
 kotlin-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
 kotlin-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "coroutines" }
 kotlin-coroutinesAndroid = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
@@ -211,6 +227,7 @@ markwon-imageCoil = { module = "io.noties.markwon:image-coil", version.ref = "ma
 markwon-linkify = { module = "io.noties.markwon:linkify", version.ref = "markwon" }
 
 misc-leakCanary = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
+misc-leakCanary-shark = { module = "com.squareup.leakcanary:shark", version.ref = "leakcanary" }
 misc-leakCanaryObjectWatcherAndroid = { module = "com.squareup.leakcanary:leakcanary-object-watcher-android", version.ref = "leakcanary" }
 misc-bugsnag = "com.bugsnag:bugsnag-android:5.31.1"
 misc-byteunits = "com.jakewharton.byteunits:byteunits:0.9.1"
@@ -256,6 +273,8 @@ sqldelight-runtime = { module = "app.cash.sqldelight:runtime", version.ref = "sq
 
 sqlite-xerial = { module = "org.xerial:sqlite-jdbc", version.ref = "xerial" }
 
+telephoto-zoomable = { module = "me.saket.telephoto:zoomable", version.ref = "telephoto" }
+telephoto-zoomableImage = { module = "me.saket.telephoto:zoomable-image", version.ref = "telephoto" }
 telephoto-zoomableImageCoil = { module = "me.saket.telephoto:zoomable-image-coil", version.ref = "telephoto" }
 
 tikxml-htmlEscape = { module = "com.tickaroo.tikxml:converter-htmlescape", version.ref = "tikxml" }

libraries/base-ui/build.gradle.kts

@@ -51,7 +51,6 @@ dependencies {
   implementation(libs.androidx.annotations)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.material.material3)
-  implementation(libs.androidx.compose.material.ripple)
   implementation(libs.androidx.compose.materialIcons)
   implementation(libs.androidx.compose.uiTooling)
   implementation(libs.androidx.core)

libraries/compose-extensions/build.gradle.kts

@@ -33,6 +33,7 @@ dependencies {
   api(libs.androidx.window)
   api(libs.kotlin.coroutines)
 
+  implementation(libs.androidx.compose.animation)
   implementation(libs.androidx.compose.googleFonts)
   implementation(libs.androidx.compose.material.material3)
   implementation(projects.libraries.baseUi)

libraries/gemoji/build.gradle.kts

@@ -37,6 +37,7 @@ dependencies {
 
   implementation(libs.androidx.annotations)
   implementation(libs.androidx.sqlite)
+  implementation(libs.androidx.sqlite.framework)
   implementation(libs.kotlin.coroutines)
   implementation(libs.misc.timber)
   implementation(libs.sqldelight.coroutines)

libraries/summarizer/build.gradle.kts

@@ -47,6 +47,7 @@ dependencies {
   api(libs.circuit.codegenAnnotations)
   api(libs.circuit.runtime)
   api(libs.circuit.runtime.presenter)
+  api(libs.circuit.runtime.screen)
   api(libs.circuit.runtime.ui)
   api(libs.okhttp.core)
   api(libs.retrofit.core)
@@ -56,9 +57,11 @@ dependencies {
 
   implementation(libs.androidx.annotations)
   implementation(libs.androidx.compose.accompanist.systemUi)
+  implementation(libs.androidx.compose.animation)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.material.material3)
   implementation(libs.androidx.compose.ui)
+  implementation(libs.androidx.sqlite)
   implementation(libs.kotlin.coroutines)
   implementation(libs.retrofit.moshi)
   implementation(libs.sqldelight.driver.android)

libraries/tooling/spi-visualizer/build.gradle.kts

@@ -8,6 +8,7 @@ dependencies {
   ksp(libs.autoService.ksp)
 
   implementation(libs.dagger.spi)
+  implementation(libs.errorProneAnnotations)
   implementation(libs.javapoet)
   implementation(libs.misc.debug.guava)
 

scripts/rake_dependencies.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -uo pipefail
+
+./gradlew rakeDependencies aggregateMissingIdentifiers -Pslack.gradle.config.enableAnalysisPlugin=true --no-configuration-cache
+
+bold=$(tput bold)
+red=$(tput setaf 1)
+reset=$(tput sgr0)
+
+if [[ -e build/rake/aggregated_missing_identifiers.txt ]] && [[ -s build/rake/aggregated_missing_identifiers.txt ]]; then
+    echo "${red}${bold}Error: Missing identifiers found at $(pwd)/build/rake/aggregated_missing_identifiers.txt. Please add them to libs.versions.toml or create dependency bundles.${reset}"
+    # TODO eventually exit early?
+fi
+
+./gradlew sortDependencies
+./gradlew spotlessApply

service-api/build.gradle.kts

@@ -60,4 +60,3 @@ slack {
     dagger()
   }
 }
-