From 40f9b83dba095d6eca1815bd39331dce24885bf0 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 15 Aug 2023 15:17:49 -0500
Subject: [PATCH] Remove bundles from version catalog

---
 app/build.gradle.kts      | 19 +++++++++++++++----
 gradle/libs.versions.toml | 25 -------------------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0c5cba122..aceb65aec 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -199,9 +199,16 @@ dependencies {
     implementation(libs.androidx.room)
     kapt(libs.androidx.room.compiler)
     implementation(libs.androidx.appcompat)
-    implementation(libs.bundles.markwon)
+    implementation(libs.markwon)
+    implementation(libs.markwon.editor)
+    implementation(libs.markwon.linkify)
+    implementation(libs.markwon.strikethrough)
+    implementation(libs.markwon.tables)
+    implementation(libs.markwon.tasklist)
 
-    debugImplementation(libs.bundles.flipper)
+    debugImplementation(libs.facebook.flipper)
+    debugImplementation(libs.facebook.flipper.network)
+    debugImplementation(libs.facebook.soloader)
     debugImplementation(libs.leakcanary)
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation(libs.kotlin.reflect)
@@ -232,7 +239,8 @@ dependencies {
     implementation(libs.colorpicker)
     implementation(libs.appauth)
     implementation(libs.osmdroid)
-    implementation(libs.bundles.retrofit)
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.moshi)
     implementation(libs.androidx.recyclerview)
 
     implementation(platform(libs.androidx.compose))
@@ -246,7 +254,10 @@ dependencies {
     implementation(libs.androidx.lifecycle.viewmodel.compose)
     implementation("androidx.compose.ui:ui-viewbinding")
     implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation(libs.bundles.coil)
+    implementation(libs.coil.compose)
+    implementation(libs.coil.video)
+    implementation(libs.coil.svg)
+    implementation(libs.coil.gif)
 
     implementation(libs.accompanist.flowlayout)
     implementation(libs.accompanist.permissions)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8c4b23d20..a4a67782b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -160,29 +160,4 @@ shortcut-badger = { module = "me.leolin:ShortcutBadger", version.ref = "shortcut
 timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" }
 xpp3 = { module = "org.ogce:xpp3", version.ref = "xpp3" }
 
-[bundles]
-coil = [
-    "coil-compose",
-    "coil-video",
-    "coil-svg",
-    "coil-gif",
-]
-flipper = [
-    "facebook-flipper",
-    "facebook-flipper-network",
-    "facebook-soloader",
-]
-markwon = [
-    "markwon",
-    "markwon-editor",
-    "markwon-linkify",
-    "markwon-strikethrough",
-    "markwon-tables",
-    "markwon-tasklist",
-]
-retrofit = [
-    "retrofit",
-    "retrofit-moshi",
-]
-
 [plugins]