Fixed Gradle Errors

openMF · Sep 9, 2024 · ea65ba1 · ea65ba1
1 parent bc90699
commit ea65ba1
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 66 deletions.
diff --git a/androidApp/build.gradle b/androidApp/build.gradle
@@ -56,11 +56,11 @@ dependencies {
     androidTestImplementation libs.testng
     androidTestImplementation libs.androidx.monitor
     androidTestImplementation libs.runner
-    androidTestImplementation libs.junit.junit
+    androidTestImplementation libs.junit
     androidTestImplementation libs.runner
     androidTestImplementation libs.androidx.monitor
     debugImplementation(libs.compose.ui.tooling)
-    implementation (libs.androidx.navigation.compose.v276)
+    implementation (libs.androidx.navigation.compose)
     implementation (libs.androidx.biometric)
 }
 repositories {

diff --git a/compose/build.gradle b/compose/build.gradle
@@ -36,28 +36,32 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.2"
     }
+    packagingOptions {
+        exclude 'META-INF/com.google.dagger_dagger.version'
+    }
+
 }
 
 dependencies {
 
     implementation libs.androidx.core.ktx.v1131
-    implementation libs.kotlin.bom.v180
-    implementation libs.appcompat
+    implementation platform(libs.kotlin.bom)
+    implementation libs.androidx.appcompat
     implementation libs.material
     implementation project(':shared')
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
-    androidTestImplementation libs.espresso.core
+    androidTestImplementation libs.androidx.espresso.core
     implementation(libs.lifecycle.runtime.ktx)
-    implementation(libs.androidx.activity.compose.v182)
-    implementation(libs.compose.bom)
-    implementation(libs.androidx.ui)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.compose.bom))
+    implementation(libs.compose.ui)
     implementation(libs.androidx.ui.graphics)
-    implementation(libs.androidx.ui.tooling.preview)
-    implementation(libs.androidx.material3)
+    implementation(libs.compose.ui.tooling.preview)
+    implementation(libs.compose.material3)
     implementation libs.androidx.material.icons.extended
     implementation libs.androidx.lifecycle.runtime.compose
-    debugImplementation libs.androidx.ui.tooling
+    debugImplementation libs.compose.ui.tooling
     debugImplementation libs.androidx.ui.test.manifest
 
     // Hilt Implementation

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,114 +1,72 @@
 [versions]
-activityComposeVersion = "1.8.2"
 agp = "8.3.0"
 androidMavenGradlePlugin = "2.1"
-androidxNavigationCompose = "2.7.6"
-cmpPreference = "1.0.0"
 coreKtxVersion = "1.13.1"
 espressoCoreVersion = "3.6.0-alpha01"
 gradle = "8.3.1"
-gradleBintrayPlugin = "1.7.3"
 hiltCompiler = "2.48.1"
 hiltNavigationComposeVersion = "1.2.0"
 kotlin = "2.0.0"
 compose = "1.5.4"
 compose-material3 = "1.1.2"
 androidx-activityCompose = "1.8.0"
-kotlinBom = "1.8.0"
 kotlinStdlibJdk8 = "1.7.20"
-kvault = "1.12.0"
 lifecycleViewmodelKtx = "2.8.1"
 compose-plugin = "1.6.10"
 multiplatformSettings = "1.0.0"
 navigationCompose = "2.7.7"
 navigationComposeVersion = "2.7.0-alpha07"
 dagger-hilt = "2.48.1"
-fragmentKtx = "1.8.2"
 biometricKtx = "1.1.0"
 devToolsKsp = "2.0.10-1.0.24"
-coreKtx = "1.12.0"
-appcompat = "1.4.1"
 material = "1.6.0"
 junit = "4.13.2"
 extJunit = "1.1.5"
-espressoCore = "3.5.1"
 lifecycleRuntimeKtx = "2.7.0"
-activityCompose = "1.8.2"
 composeBom = "2023.03.00"
-composeUi = "1.6.8"
-material3 = "1.6.8"
 hiltAndroid = "2.48.1"
-hiltNavigationCompose = "1.0.0"
-runner = "1.6.0-alpha04"
-sonner = "0.3.8"
 uiToolingPreviewAndroid = "1.6.8"
 uiAndroid = "1.6.8"
 appcompatVersion = "1.7.0"
 testng = "6.9.6"
 monitor = "1.6.1"
 runnerVersion = "1.5.2"
-junitVersion = "4.12"
 
 [libraries]
 android-maven-gradle-plugin = { module = "com.github.dcendents:android-maven-gradle-plugin", version.ref = "androidMavenGradlePlugin" }
-androidx-activity-compose-v182 = { module = "androidx.activity:activity-compose", version.ref = "activityComposeVersion" }
+androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
 androidx-biometric = { module = "androidx.biometric:biometric", version.ref = "biometricKtx" }
 androidx-core-ktx-v1131 = { module = "androidx.core:core-ktx", version.ref = "coreKtxVersion" }
-androidx-espresso-core-v360alpha01 = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCoreVersion" }
+androidx-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espressoCoreVersion" }
 androidx-hilt-navigation-compose-v120 = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "hiltNavigationComposeVersion" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
-androidx-material3 = { module = "androidx.compose.material3:material3" }
+compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
 androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "navigationCompose" }
-androidx-navigation-compose-v276 = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigationCompose" }
-androidx-runner = { module = "androidx.test:runner", version.ref = "runner" }
-androidx-ui = { module = "androidx.compose.ui:ui" }
+compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 androidx-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }
 androidx-ui-test-manifest = { module = "androidx.compose.ui:ui-test-manifest" }
-androidx-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
-androidx-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
-cmp-preference = { module = "network.chaintech:cmp-preference", version.ref = "cmpPreference" }
+compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
+compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
 gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
-gradle-bintray-plugin = { module = "com.jfrog.bintray.gradle:gradle-bintray-plugin", version.ref = "gradleBintrayPlugin" }
 hilt-compiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hiltCompiler" }
-kotlin-bom-v180 = { module = "org.jetbrains.kotlin:kotlin-bom", version.ref = "kotlinBom" }
-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlinStdlibJdk8" }
 kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
-androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
-compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose" }
-compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "compose-material3" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel", version.ref = "lifecycleViewmodelKtx" }
-kvault = { module = "com.liftric:kvault", version.ref = "kvault" }
 multiplatform-settings-no-arg = { module = "com.russhwolf:multiplatform-settings-no-arg", version.ref = "multiplatformSettings" }
-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigationComposeVersion" }
-androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
-androidx-biometric-ktx = { group = "androidx.biometric", name = "biometric-ktx", version.ref = "biometricKtx" }
-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
 kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompatVersion" }
+navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigationComposeVersion" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
 ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "extJunit" }
-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
 lifecycle-runtime-ktx = { group = "androidx.lifecycle", name = "lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
 compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "composeBom" }
-compose-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics", version.ref = "composeUi" }
-material-icons-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "material3" }
-lifecycle-runtime-compose = { group = "androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "lifecycleRuntimeKtx" }
-sonner = { module = "io.github.dokar3:sonner", version.ref = "sonner" }
-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest", version.ref = "composeUi" }
 hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hiltAndroid" }
-hilt-navigation-compose = { group = "androidx.hilt", name = "hilt-navigation-compose", version.ref = "hiltNavigationCompose" }
 androidx-ui-tooling-preview-android = { group = "androidx.compose.ui", name = "ui-tooling-preview-android", version.ref = "uiToolingPreviewAndroid" }
 androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "uiAndroid" }
-androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompatVersion" }
 testng = { group = "org.testng", name = "testng", version.ref = "testng" }
 androidx-monitor = { group = "androidx.test", name = "monitor", version.ref = "monitor" }
 runner = { group = "androidx.test", name = "runner", version.ref = "runnerVersion" }
-junit-junit = { group = "junit", name = "junit", version.ref = "junitVersion" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }

diff --git a/mifos-passcode/build.gradle b/mifos-passcode/build.gradle
@@ -61,14 +61,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation libs.appcompat
+    implementation libs.androidx.appcompat
     implementation libs.material
 
     testImplementation libs.junit
-    androidTestImplementation libs.androidx.runner
-    androidTestImplementation libs.androidx.espresso.core.v360alpha01
+    androidTestImplementation libs.runner
+    androidTestImplementation libs.androidx.espresso.core
     implementation libs.androidx.core.ktx.v1131
-    implementation libs.kotlin.stdlib.jdk8
+    implementation platform(libs.kotlin.bom)
 }
 
 tasks.withType(Javadoc) {

diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts
@@ -47,6 +47,7 @@ kotlin {
             implementation (libs.androidx.biometric)
         }
     }
+    tasks.register("testClasses")
 }
 
 android {

diff --git a/shared/shared.podspec b/shared/shared.podspec
@@ -50,5 +50,5 @@ Pod::Spec.new do |spec|
             SCRIPT
         }
     ]
-    spec.resources = ['build/compose/cocoapods/compose-resources']
+    spec.resources = ['build\compose\cocoapods\compose-resources']
 end