From 9076d0d47876e29b805615ed20e0b98bbfccbc59 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@google.com>
Date: Thu, 26 Oct 2023 11:12:53 +0200
Subject: [PATCH] Introduce Version Catalog, initially intentionally only for
 Glide (see #2302)

---
 buildSrc/src/main/kotlin/Dependencies.kt |  8 --------
 datacapture/build.gradle.kts             |  2 +-
 gradle/libs.versions.toml                | 11 +++++++++++
 3 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 gradle/libs.versions.toml

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
index a6b3d99113..34711c988f 100644
--- a/buildSrc/src/main/kotlin/Dependencies.kt
+++ b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -41,10 +41,6 @@ object Dependencies {
       "org.opencds.cqf.fhir:cqf-fhir-utility:${Versions.Cql.clinicalReasoning}"
   }
 
-  object Glide {
-    const val glide = "com.github.bumptech.glide:glide:${Versions.Glide.glide}"
-  }
-
   object HapiFhir {
     const val fhirBase = "ca.uhn.hapi.fhir:hapi-fhir-base:${Versions.hapiFhir}"
     const val fhirClient = "ca.uhn.hapi.fhir:hapi-fhir-client:${Versions.hapiFhir}"
@@ -218,10 +214,6 @@ object Dependencies {
       const val clinicalReasoning = "3.0.0-PRE9-SNAPSHOT"
     }
 
-    object Glide {
-      const val glide = "4.14.2"
-    }
-
     object Kotlin {
       const val kotlinCoroutinesCore = "1.7.2"
       const val stdlib = "1.8.20"
diff --git a/datacapture/build.gradle.kts b/datacapture/build.gradle.kts
index 78ba2939d9..0e829e662d 100644
--- a/datacapture/build.gradle.kts
+++ b/datacapture/build.gradle.kts
@@ -86,7 +86,7 @@ dependencies {
   implementation(Dependencies.Androidx.constraintLayout)
   implementation(Dependencies.Androidx.coreKtx)
   implementation(Dependencies.Androidx.fragmentKtx)
-  implementation(Dependencies.Glide.glide)
+  implementation(libs.glide)
   implementation(Dependencies.HapiFhir.guavaCaching)
   implementation(Dependencies.HapiFhir.validation) {
     exclude(module = "commons-logging")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000000..c43133a190
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,11 @@
+# see https://docs.gradle.org/current/userguide/platforms.html
+
+[versions]
+glide = "4.14.2"
+
+[libraries]
+glide = { module = "com.github.bumptech.glide:glide", version.ref = "glide" }
+
+[bundles]
+
+[plugins]