From 2dfef026f0991635cc5a9281837514ffe1901bd6 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Thu, 11 Jul 2024 00:25:30 +0530 Subject: [PATCH] TP-12345 | Version Bump `navi-*` to `tag:latest` (#11764) --- android/app/build.gradle | 1 - android/application-platform/navi-ap/build.gradle | 1 + android/gradle/libs.versions.toml | 15 ++++++++++----- android/navi-analytics/build.gradle | 3 +++ android/navi-base/build.gradle | 1 + android/navi-bbps/build.gradle | 2 -- android/navi-coin/build.gradle | 3 +-- android/navi-common/build.gradle | 4 ++++ android/navi-design/build.gradle | 3 ++- android/navi-gold/build.gradle | 2 -- android/navi-hl/build.gradle | 1 - android/navi-pay/build.gradle | 2 -- android/navi-payment/build.gradle | 2 -- android/navi-rr/build.gradle | 1 - android/navi-widgets/build.gradle | 4 +++- 15 files changed, 25 insertions(+), 20 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 4c262f35e9..6740d46284 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -322,7 +322,6 @@ dependencies { implementation libs.otaliastudios.cameraview implementation libs.otpless implementation libs.raamcosta.composeDestinations.animation.core - implementation libs.retrofit.converter.scalars implementation libs.truecaller debugImplementation libs.androidx.compose.ui.test.junit4 diff --git a/android/application-platform/navi-ap/build.gradle b/android/application-platform/navi-ap/build.gradle index 37369e2d6a..b9511a96e7 100644 --- a/android/application-platform/navi-ap/build.gradle +++ b/android/application-platform/navi-ap/build.gradle @@ -69,6 +69,7 @@ dependencies { implementation libs.androidx.lifecycle.runtime.compose implementation libs.dagger.hiltAndroid implementation libs.jayway.jsonPath + implementation libs.mvel2 implementation libs.raamcosta.composeDestinations.animation.core androidTestImplementation libs.androidx.test.espresso.core diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index ef425a81a5..5c844a0e69 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -96,11 +96,12 @@ moengage-android-sdk = "12.6.02" moengage-inapp = "6.5.0" moengage-push-amp-plus = "6.2.1" moengage-rich-notification = "4.3.2" +mvel2 = "2.4.15.Final" navi-adverse = "1.0.1" -navi-alfred = "1.9.0" -navi-guarddog = "3.1.0" -navi-pulse = "1.4.0" -navi-uitron = "1.18.0" +navi-alfred = "1.10.0" +navi-guarddog = "3.3.0" +navi-pulse = "1.5.0" +navi-uitron = "1.19.0" navigation = "2.5.3" okhttp-bom = "4.12.0" otaliastudios-cameraview = "2.7.2" @@ -201,6 +202,7 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = "androidx-gridlayout" } androidx-hilt-compiler = { module = "androidx.hilt:hilt-compiler", version.ref = "androidx-hilt" } +androidx-hilt-navigation-compose = { module = "androidx.hilt:hilt-navigation-compose", version.ref = "androidx-hilt" } androidx-hilt-work = { module = "androidx.hilt:hilt-work", version.ref = "androidx-hilt" } androidx-legacy-support-v4 = { module = "androidx.legacy:legacy-support-v4", version.ref = "androidx-legacy-support-v4" } @@ -335,7 +337,8 @@ kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutine kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutines" } kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinxCoroutinesTest" } -lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" } +airbnb-lottie = { module = "com.airbnb.android:lottie", version.ref = "lottie" } +airbnb-lottieCompose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottie" } masayukiSuda-easingInterpolator = { module = "com.github.MasayukiSuda:EasingInterpolator", version.ref = "masayukiSuda-easingInterpolator" } @@ -348,6 +351,8 @@ moengage-inapp = { module = "com.moengage:inapp", version.ref = "moengage-inapp" moengage-push-amp-plus = { module = "com.moengage:push-amp-plus", version.ref = "moengage-push-amp-plus" } moengage-rich-notification = { module = "com.moengage:rich-notification", version.ref = "moengage-rich-notification" } +mvel2 = { module = "org.mvel:mvel2", version.ref = "mvel2" } + navi-adverse = { module = "com.navi.android:adverse", version.ref = "navi-adverse" } navi-alfred = { module = "com.navi.android:alfred", version.ref = "navi-alfred" } navi-guarddog = { module = "com.navi.android:guarddog", version.ref = "navi-guarddog" } diff --git a/android/navi-analytics/build.gradle b/android/navi-analytics/build.gradle index 0551e3fe95..a2b9997a30 100644 --- a/android/navi-analytics/build.gradle +++ b/android/navi-analytics/build.gradle @@ -62,6 +62,9 @@ dependencies { api libs.moengage.android.sdk api libs.moengage.push.amp.plus api libs.navi.alfred + api libs.retrofit.converter.gson + api libs.retrofit.converter.scalars + api libs.retrofit.retrofit implementation project(":navi-base") implementation libs.androidx.core.ktx diff --git a/android/navi-base/build.gradle b/android/navi-base/build.gradle index 3bb5c71b5e..98b9ad3425 100644 --- a/android/navi-base/build.gradle +++ b/android/navi-base/build.gradle @@ -69,6 +69,7 @@ dependencies { api libs.android.play.appUpdateKtx api libs.android.play.featureDeliveryKtx api libs.android.play.reviewKtx + api libs.androidx.hilt.navigation.compose api libs.firebase.analytics api libs.firebase.firestore api libs.gson diff --git a/android/navi-bbps/build.gradle b/android/navi-bbps/build.gradle index f2246c6bc8..49651886b5 100644 --- a/android/navi-bbps/build.gradle +++ b/android/navi-bbps/build.gradle @@ -64,8 +64,6 @@ android { dependencies { implementation project(":navi-payment") implementation project(":navi-rr") - implementation libs.accompanist.pager - implementation libs.accompanist.pagerIndicators implementation libs.accompanist.permissions implementation libs.accompanist.systemuicontroller implementation libs.android.material diff --git a/android/navi-coin/build.gradle b/android/navi-coin/build.gradle index 4344afb476..f4a2df8479 100644 --- a/android/navi-coin/build.gradle +++ b/android/navi-coin/build.gradle @@ -61,9 +61,8 @@ android { } dependencies { - api libs.lottie - api project(":navi-rr") + implementation libs.accompanist.permissions implementation libs.accompanist.systemuicontroller implementation libs.android.material diff --git a/android/navi-common/build.gradle b/android/navi-common/build.gradle index d2591a57ad..8fdfcebec2 100644 --- a/android/navi-common/build.gradle +++ b/android/navi-common/build.gradle @@ -110,10 +110,13 @@ dependencies { implementation libs.androidx.preference.ktx implementation libs.androidx.navigation.fragment.ktx implementation libs.androidx.navigation.ui.ktx + implementation libs.androidx.work.runtimeKtx implementation libs.dagger.hiltAndroid implementation libs.dagger.hiltAndroidTesting implementation libs.juspay.googlePayClientApi + implementation libs.mvel2 implementation libs.pierfrancescosoffritti.androidyoutubeplayer + implementation libs.raamcosta.composeDestinations.animation.core debugApi libs.chucker.library @@ -130,6 +133,7 @@ dependencies { kapt libs.dagger.hiltCompiler ksp libs.androidx.room.compiler + ksp libs.raamcosta.composeDestinations.ksp api "com.facebook.react:react-android" api("com.facebook.react:hermes-engine:+") { diff --git a/android/navi-design/build.gradle b/android/navi-design/build.gradle index 090364a632..5792d3c0ee 100644 --- a/android/navi-design/build.gradle +++ b/android/navi-design/build.gradle @@ -59,6 +59,8 @@ android { dependencies { api project(":navi-base") api platform(libs.androidx.compose.bom) + api libs.airbnb.lottie + api libs.airbnb.lottieCompose api libs.androidx.compose.foundation api libs.androidx.compose.material api libs.androidx.compose.material3 @@ -67,7 +69,6 @@ dependencies { api libs.coil.compose api libs.facebook.shimmer api libs.glide.glide - api libs.lottie implementation libs.accompanist.systemuicontroller implementation libs.android.material diff --git a/android/navi-gold/build.gradle b/android/navi-gold/build.gradle index 07f32bb6d4..fccad1327b 100644 --- a/android/navi-gold/build.gradle +++ b/android/navi-gold/build.gradle @@ -78,8 +78,6 @@ dependencies { implementation libs.androidx.multidex implementation libs.dagger.hiltAndroid implementation libs.philjay.mpAndroidChart - implementation libs.retrofit.converter.gson - implementation libs.retrofit.retrofit kapt libs.dagger.hiltCompiler } diff --git a/android/navi-hl/build.gradle b/android/navi-hl/build.gradle index d20ee152f9..9f99fa034a 100644 --- a/android/navi-hl/build.gradle +++ b/android/navi-hl/build.gradle @@ -70,7 +70,6 @@ dependencies { implementation libs.androidx.legacy.support.v4 implementation libs.androidx.multidex implementation libs.dagger.hiltAndroid - implementation libs.retrofit.converter.gson kapt libs.dagger.hiltCompiler } diff --git a/android/navi-pay/build.gradle b/android/navi-pay/build.gradle index 16ec43f3d7..64e8b5ed76 100644 --- a/android/navi-pay/build.gradle +++ b/android/navi-pay/build.gradle @@ -64,8 +64,6 @@ android { dependencies { implementation project(":navi-common") implementation project(":navi-rr") - implementation libs.accompanist.pager - implementation libs.accompanist.pagerIndicators implementation libs.accompanist.permissions implementation libs.accompanist.systemuicontroller implementation libs.android.material diff --git a/android/navi-payment/build.gradle b/android/navi-payment/build.gradle index 95ced7559e..838207c920 100644 --- a/android/navi-payment/build.gradle +++ b/android/navi-payment/build.gradle @@ -71,8 +71,6 @@ dependencies { implementation libs.androidx.lifecycle.runtime.ktx implementation libs.androidx.lifecycle.viewmodel.ktx implementation libs.dagger.hiltAndroid - implementation libs.retrofit.converter.gson - implementation libs.retrofit.retrofit implementation libs.accompanist.systemuicontroller implementation libs.raamcosta.composeDestinations.animation.core diff --git a/android/navi-rr/build.gradle b/android/navi-rr/build.gradle index 74a67d8bc7..4137f09ca2 100644 --- a/android/navi-rr/build.gradle +++ b/android/navi-rr/build.gradle @@ -78,7 +78,6 @@ dependencies { implementation libs.androidx.lifecycle.runtime.compose implementation libs.androidx.paging.compose implementation libs.dagger.hiltAndroid - implementation libs.lottie implementation libs.raamcosta.composeDestinations.animation.core androidTestImplementation libs.androidx.arch.core.testing diff --git a/android/navi-widgets/build.gradle b/android/navi-widgets/build.gradle index 94550ef90c..7951cc0e27 100644 --- a/android/navi-widgets/build.gradle +++ b/android/navi-widgets/build.gradle @@ -59,6 +59,9 @@ android { dependencies { api project(":navi-analytics") api project(":navi-design") + api libs.accompanist.pager + api libs.accompanist.pagerIndicators + api libs.androidx.compose.ui.toolingPreview api libs.androidx.compose.ui.util api libs.androidx.paging.runtime.ktx api libs.masayukiSuda.easingInterpolator @@ -78,7 +81,6 @@ dependencies { implementation libs.androidx.work.runtimeKtx implementation libs.dagger.hiltAndroid implementation libs.philjay.mpAndroidChart - implementation libs.retrofit.converter.gson androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation libs.androidx.test.junit