Resolved Merge conflicts

openMF · May 10, 2024 · 3934a10 · 3934a10
1 parent 1719c17
commit 3934a10
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,4 +1,5 @@
 [versions]
+accompanistDrawablepainter = "0.35.0-alpha"
 accompanistSwiperefresh = "0.25.1"
 accompanistPermission = "0.34.0"
 adapterRxjava = "2.9.0"
@@ -118,6 +119,7 @@ truthVersion = '1.1.5'
 
 [libraries]
 # AndroidX Libraries
+accompanist-drawablepainter = { module = "com.google.accompanist:accompanist-drawablepainter", version.ref = "accompanistDrawablepainter" }
 accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanistSwiperefresh" }
 accompanist-permission = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanistPermission" }
 android-desugarJdkLibs = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "androidDesugarJdkLibs" }

diff --git a/mifosng-android/build.gradle.kts b/mifosng-android/build.gradle.kts
@@ -222,6 +222,7 @@ dependencies {
     androidTestImplementation(libs.mockito.android)
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.androidx.core.testing)
+    testImplementation(libs.kotlinx.coroutines.test)
 
     //Android-Jobs
     implementation(libs.android.job)
@@ -262,11 +263,6 @@ dependencies {
     // ViewModel utilities for Compose
     implementation(libs.androidx.lifecycle.viewModelCompose)
     implementation(libs.androidx.hilt.navigation.compose)
-    implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0")
-    implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
-
-    implementation("com.google.accompanist:accompanist-drawablepainter:0.35.0-alpha")
-
-    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1")
 
+    implementation(libs.accompanist.drawablepainter)
 }