diff --git a/android/app/build.gradle b/android/app/build.gradle index 9c260d8ce5..f1cbfffb8d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -73,7 +73,6 @@ android { ignoreAssetsPattern '!yolov5n_224x224_Lite.tflite' } buildFeatures { - buildConfig true compose true dataBinding true } @@ -180,7 +179,6 @@ android { buildConfigField 'String', 'SSL_PINNING_KEY', formatString('sha256/nUU7NjGrGo/mxijjsX+MHerUbpIHBidF8LAYOEPFWA8=') buildConfigField 'String', 'XIAOMI_PUSH_APP_ID', formatString('2882303761521925585') buildConfigField 'String', 'XIAOMI_PUSH_APP_KEY', formatString('5692192517585') - buildConfigField 'String', 'YOUTUBE_KEY', formatString('AIzaSyDlbxag2dCc-a9ac8JTfH3nnVw41pdI-1U') manifestPlaceholders = [ FACEBOOK_APP_ID: "238258890564574", TRUECALLER_KEY : "yicxl1xh6jidagslpi0h9d-uklfeinnx4a6mb6rdgyi" @@ -201,7 +199,6 @@ android { && project.hasProperty('SSL_PINNING_KEY') && project.hasProperty('XIAOMI_PUSH_APP_ID') && project.hasProperty('XIAOMI_PUSH_APP_KEY') - && project.hasProperty('YOUTUBE_KEY') && project.hasProperty('FACEBOOK_APP_ID') && project.hasProperty('TRUECALLER_KEY') && project.hasProperty('CODEPUSH_DEPLOYMENT_KEY') @@ -217,7 +214,6 @@ android { buildConfigField 'String', 'SSL_PINNING_KEY', formatString("$SSL_PINNING_KEY") buildConfigField 'String', 'XIAOMI_PUSH_APP_ID', formatString("$XIAOMI_PUSH_APP_ID") buildConfigField 'String', 'XIAOMI_PUSH_APP_KEY', formatString("$XIAOMI_PUSH_APP_KEY") - buildConfigField 'String', 'YOUTUBE_KEY', formatString("$YOUTUBE_KEY") manifestPlaceholders = [ FACEBOOK_APP_ID: "$FACEBOOK_APP_ID", TRUECALLER_KEY : "$TRUECALLER_KEY" @@ -345,32 +341,23 @@ dependencies { androidTestImplementation libs.androidx.test.rules androidTestImplementation libs.androidx.test.runner androidTestImplementation libs.coil.test - androidTestImplementation libs.dagger.hiltAndroidTesting androidTestImplementation libs.hamcrest testImplementation libs.androidx.arch.core.testing - testImplementation libs.dagger.hiltAndroidTesting testImplementation libs.junit testImplementation libs.mockk testImplementation libs.coil.test - kapt libs.dagger.hiltCompiler - - kaptAndroidTest libs.dagger.hiltCompiler - - kaptTest libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler ksp libs.androidx.room.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp + implementation("com.facebook.react:hermes-engine:+") { exclude group: 'com.facebook.fbjni' } } -kapt { - correctErrorTypes true -} - apply from: project(':react-native-config').projectDir.getPath() + '/dotenv.gradle' apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project) apply from: "../../node_modules/react-native-code-push/android/codepush.gradle" diff --git a/android/app/exec.gradle b/android/app/exec.gradle index ea8e3586d4..d00f88d747 100644 --- a/android/app/exec.gradle +++ b/android/app/exec.gradle @@ -1,47 +1,31 @@ -/* - * - * * Copyright © 2024 by Navi Technologies Limited - * * All rights reserved. Strictly confidential - * - */ - - -tasks.register('cleanNavi',Exec) -tasks.register('buildNavi',Exec) - - -tasks.named('cleanNavi') { +tasks.register('cleanNavi', Exec) { group = 'Build' description = 'Cleans the project' doFirst { - println("CleanNavi configuring") + println("Configuring CleanNavi") } - workingDir = rootProject.projectDir + workingDir = rootProject.projectDir executable = './gradlew' - args 'clean', - '--no-configuration-cache', - '--info' + args = ['clean', '--no-configuration-cache'] doLast { println("CleanNavi execution completed") } } -tasks.named('buildNavi') { +tasks.register('buildNavi', Exec) { group = 'Build' - description = 'Assembles and installs the QaDebug' + description = 'Assembles and installs the QaDebug build' doFirst { - println("BuildNavi configuring") + println("Configuring BuildNavi") } - workingDir = rootProject.projectDir + workingDir = rootProject.projectDir executable = './gradlew' - args ':app:assembleQaDebug', - 'app:installQaDebug', - '--info' + args = [':app:assembleQaDebug', 'app:installQaDebug'] doLast { println("BuildNavi execution completed") diff --git a/android/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt b/android/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt index d4ad03b287..84f3d81487 100644 --- a/android/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt +++ b/android/app/src/main/java/com/naviapp/common/navigator/NaviDeepLinkNavigator.kt @@ -57,7 +57,6 @@ import com.navi.chat.utils.SOURCE import com.navi.chat.utils.TIMESTAMP import com.navi.chat.utils.TRACKING_UUID import com.navi.coin.navigator.NaviCoinDeepLinkNavigator -import com.navi.common.BuildConfig import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper import com.navi.common.model.ModuleNameV2 import com.navi.common.model.UserDetail @@ -80,6 +79,7 @@ import com.navi.gold.ui.IconTitleDescBottomSheet import com.navi.homeloan.dashboard.activity.NewHLDashboardActivity import com.navi.homeloan.interest_reset.activity.InterestResetActivity import com.navi.homeloan.tranche.activity.TrancheDisbursalActivity +import com.navi.insurance.BuildConfig import com.navi.insurance.navigator.NaviInsuranceDeeplinkNavigator import com.navi.insurance.util.VIDEO_ID_EXTRA import com.navi.naviwidgets.R as WidgetsR diff --git a/android/application-platform/app/build.gradle b/android/application-platform/app/build.gradle index ff0c57dd76..0f88e2557a 100644 --- a/android/application-platform/app/build.gradle +++ b/android/application-platform/app/build.gradle @@ -4,7 +4,7 @@ plugins { alias libs.plugins.google.services alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt + alias libs.plugins.ksp } android { @@ -26,7 +26,6 @@ android { buildFeatures { compose true - dataBinding true } buildTypes { release { @@ -61,7 +60,6 @@ dependencies { implementation libs.androidx.compose.ui.toolingPreview implementation libs.androidx.compose.ui.ui implementation libs.androidx.core.ktx - implementation libs.androidx.hilt.compiler implementation libs.androidx.lifecycle.runtime.ktx implementation libs.androidx.multidex implementation libs.dagger.hiltAndroid @@ -76,5 +74,6 @@ dependencies { testImplementation libs.junit - kapt libs.dagger.hiltAndroidCompiler + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler } diff --git a/android/application-platform/navi-ap/build.gradle b/android/application-platform/navi-ap/build.gradle index 66575f9f07..971590399c 100644 --- a/android/application-platform/navi-ap/build.gradle +++ b/android/application-platform/navi-ap/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -20,7 +19,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true } @@ -65,7 +63,6 @@ dependencies { implementation libs.android.material implementation libs.androidx.appcompat implementation libs.androidx.core.ktx - implementation libs.androidx.hilt.compiler implementation libs.androidx.lifecycle.runtime.compose implementation libs.dagger.hiltAndroid implementation libs.jayway.jsonPath @@ -81,8 +78,7 @@ dependencies { testImplementation libs.kotlinx.coroutines.test testImplementation libs.mockk - kapt libs.dagger.hiltAndroidCompiler - kapt libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml index 01e0d5c2c1..40bea12d9f 100644 --- a/android/gradle/libs.versions.toml +++ b/android/gradle/libs.versions.toml @@ -32,7 +32,7 @@ androidx-coreSplashscreen = "1.0.1" androidx-datastorePreferences = "1.1.1" androidx-fragment = "1.5.2" androidx-gridlayout = "1.0.0" -androidx-hilt = "1.0.0" +androidx-hilt = "1.2.0" androidx-legacy-support-v4 = "1.0.0" androidx-lifecycle = "2.6.2" androidx-media3 = "1.4.1" @@ -73,7 +73,7 @@ google-services = "4.4.2" gson = "2.11.0" guava = "33.3.1-android" hamcrest = "2.2" -hilt = "2.48" +hilt = "2.52" hms = "2.9.0" hyperion = "0.9.38" hyperionSimpleItem = "0.6.0" @@ -98,12 +98,12 @@ 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.6.1" -navi-alfred = "1.15.3" -navi-elex = "1.1.0" -navi-guarddog = "3.7.0" -navi-pulse = "1.9.0" -navi-uitron = "1.27.1" +navi-adverse = "1.7.0" +navi-alfred = "1.16.0" +navi-elex = "1.2.0" +navi-guarddog = "3.8.0" +navi-pulse = "1.10.0" +navi-uitron = "1.28.0" navigation = "2.5.3" okhttp-bom = "4.12.0" otaliastudios-cameraview = "2.7.2" @@ -200,7 +200,6 @@ androidx-gridlayout = { module = "androidx.gridlayout:gridlayout", version.ref = 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" } @@ -264,8 +263,6 @@ coil-test = { module = "io.coil-kt:coil-test", version.ref = "coil" } coil-video = { module = "io.coil-kt:coil-video", version.ref = "coil" } dagger-hiltAndroid = { module = "com.google.dagger:hilt-android", version.ref = "hilt" } -dagger-hiltAndroidCompiler = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" } -dagger-hiltAndroidTesting = { module = "com.google.dagger:hilt-android-testing", version.ref = "hilt" } dagger-hiltCompiler = { module = "com.google.dagger:hilt-compiler", version.ref = "hilt" } delight-advancedWebView = { module = "com.github.delight-im:Android-AdvancedWebView", version.ref = "delight-advancedWebView" } diff --git a/android/navi-amc/build.gradle b/android/navi-amc/build.gradle index 651ad3fc53..b1248562e3 100644 --- a/android/navi-amc/build.gradle +++ b/android/navi-amc/build.gradle @@ -4,6 +4,7 @@ plugins { alias libs.plugins.kotlin.android alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize + alias libs.plugins.ksp alias libs.plugins.navigation } @@ -21,7 +22,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true viewBinding true @@ -77,18 +77,9 @@ dependencies { androidTestImplementation libs.androidx.test.espresso.core androidTestImplementation libs.androidx.test.junit - androidTestImplementation libs.dagger.hiltAndroidTesting - testImplementation libs.dagger.hiltAndroidTesting testImplementation libs.junit - kapt libs.dagger.hiltCompiler - - kaptAndroidTest libs.dagger.hiltCompiler - - kaptTest libs.dagger.hiltCompiler -} - -kapt { - correctErrorTypes true + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler } diff --git a/android/navi-analytics/build.gradle b/android/navi-analytics/build.gradle index dd87e6d742..0a25ec6eed 100644 --- a/android/navi-analytics/build.gradle +++ b/android/navi-analytics/build.gradle @@ -16,9 +16,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - buildFeatures { - buildConfig true - } buildTypes { release { minifyEnabled false diff --git a/android/navi-base/build.gradle b/android/navi-base/build.gradle index 09714dd92f..f0deb31916 100644 --- a/android/navi-base/build.gradle +++ b/android/navi-base/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -24,9 +23,6 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - buildFeatures { - buildConfig true - } buildTypes { release { minifyEnabled false @@ -106,8 +102,7 @@ dependencies { testImplementation libs.kotlinx.coroutines.test testImplementation libs.mockk - kapt libs.androidx.hilt.compiler - kapt libs.dagger.hiltAndroidCompiler - + ksp libs.androidx.hilt.compiler ksp libs.androidx.room.compiler + ksp libs.dagger.hiltCompiler } diff --git a/android/navi-bbps/build.gradle b/android/navi-bbps/build.gradle index f14b124a65..61923065a1 100644 --- a/android/navi-bbps/build.gradle +++ b/android/navi-bbps/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -20,7 +19,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true viewBinding true @@ -84,9 +82,8 @@ dependencies { testImplementation libs.kotlinx.coroutines.test testImplementation libs.mockk - kapt libs.androidx.hilt.compiler - kapt libs.dagger.hiltAndroidCompiler - + ksp libs.androidx.hilt.compiler ksp libs.androidx.room.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/navi-chat/build.gradle b/android/navi-chat/build.gradle index c29d0aee87..fd012fe4b4 100644 --- a/android/navi-chat/build.gradle +++ b/android/navi-chat/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -20,7 +19,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true } @@ -79,7 +77,7 @@ dependencies { testImplementation libs.junit - kapt libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler ksp libs.androidx.room.compiler + ksp libs.dagger.hiltCompiler } diff --git a/android/navi-coin/build.gradle b/android/navi-coin/build.gradle index ad137ed914..b5e181f5f1 100644 --- a/android/navi-coin/build.gradle +++ b/android/navi-coin/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -21,7 +20,6 @@ android { } buildFeatures { - buildConfig true compose true } buildTypes { @@ -83,7 +81,7 @@ dependencies { testImplementation libs.kotlinx.coroutines.test testImplementation libs.mockk - kapt libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/navi-common/build.gradle b/android/navi-common/build.gradle index 55182e6e3e..76eec81a92 100644 --- a/android/navi-common/build.gradle +++ b/android/navi-common/build.gradle @@ -16,13 +16,11 @@ android { minSdk 23 targetSdk 34 - buildConfigField 'String', 'YOUTUBE_KEY', formatString('AIzaSyDlbxag2dCc-a9ac8JTfH3nnVw41pdI-1U') consumerProguardFiles "consumer-rules.pro" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildFeatures { - buildConfig true compose true dataBinding true } @@ -112,7 +110,6 @@ dependencies { 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 @@ -130,9 +127,9 @@ dependencies { testImplementation libs.junit testImplementation libs.mockk - kapt libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler ksp libs.androidx.room.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp api "com.facebook.react:react-android" diff --git a/android/navi-common/src/main/java/com/navi/common/network/BaseHttpClient.kt b/android/navi-common/src/main/java/com/navi/common/network/BaseHttpClient.kt index dc1ec77f73..180ae8fd76 100644 --- a/android/navi-common/src/main/java/com/navi/common/network/BaseHttpClient.kt +++ b/android/navi-common/src/main/java/com/navi/common/network/BaseHttpClient.kt @@ -9,7 +9,6 @@ package com.navi.common.network import android.content.Context import android.os.Build -import com.navi.alfred.AlfredManager import com.navi.analytics.utils.NaviAnalyticsHelper import com.navi.base.security.interceptor.EncryptionHashInterceptor import com.navi.base.sharedpref.CommonPrefConstants.ROUTING_KEY @@ -97,7 +96,6 @@ abstract class BaseHttpClient( protected val headerInterceptor: Interceptor get() = Interceptor { chain -> var request = chain.request() - val startTime = System.currentTimeMillis() val builder = request.headers.newBuilder().apply { add("Content-Type", "application/json") @@ -152,22 +150,6 @@ abstract class BaseHttpClient( .addHeader("content-type", "application/json") .build() } - val endTime = System.currentTimeMillis() - val byteSent = request.body?.contentLength() ?: 0L - val byteReceived = - try { - response.peekBody(Long.MAX_VALUE).bytes().size.toLong() - } catch (e: Exception) { - 0L - } - AlfredManager.saveApiLog( - byteReceived = byteReceived, - byteSent = byteSent, - request, - response, - startTime, - endTime - ) response } diff --git a/android/navi-cycs/build.gradle b/android/navi-cycs/build.gradle index 0b1bef2b43..d87f05a7bd 100644 --- a/android/navi-cycs/build.gradle +++ b/android/navi-cycs/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -20,9 +19,7 @@ android { } buildFeatures { - buildConfig true compose true - dataBinding true } buildTypes { release { @@ -69,8 +66,7 @@ dependencies { implementation libs.dagger.hiltAndroid implementation libs.raamcosta.composeDestinations.animation.core - kapt libs.androidx.hilt.compiler - kapt libs.dagger.hiltAndroidCompiler - + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/navi-gold/build.gradle b/android/navi-gold/build.gradle index 7cdf6df7a5..dbc61eb017 100644 --- a/android/navi-gold/build.gradle +++ b/android/navi-gold/build.gradle @@ -2,8 +2,8 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize + alias libs.plugins.ksp alias libs.plugins.navigation } @@ -21,7 +21,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true viewBinding true @@ -79,9 +78,6 @@ dependencies { implementation libs.dagger.hiltAndroid implementation libs.philjay.mpAndroidChart - kapt libs.dagger.hiltCompiler -} - -kapt { - correctErrorTypes true + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler } diff --git a/android/navi-hl/build.gradle b/android/navi-hl/build.gradle index f7031007a1..1e53b92f52 100644 --- a/android/navi-hl/build.gradle +++ b/android/navi-hl/build.gradle @@ -4,6 +4,7 @@ plugins { alias libs.plugins.kotlin.android alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize + alias libs.plugins.ksp alias libs.plugins.navigation } @@ -21,7 +22,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true viewBinding true @@ -71,9 +71,6 @@ dependencies { implementation libs.androidx.multidex implementation libs.dagger.hiltAndroid - kapt libs.dagger.hiltCompiler -} - -kapt { - correctErrorTypes true + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler } diff --git a/android/navi-insurance/build.gradle b/android/navi-insurance/build.gradle index 7df27abfcb..5916af8d6a 100644 --- a/android/navi-insurance/build.gradle +++ b/android/navi-insurance/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -21,7 +20,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true } @@ -54,15 +52,20 @@ android { dimension "app" buildConfigField 'String', 'GI_RAZORPAY_KEY', formatString('rzp_test_vBmFshr0H06Hoe') buildConfigField 'String', 'GOOGLE_MAPS_KEY', formatString('AIzaSyD-7-YhOAzX4VJfVLsHUz8KEn-1MGJq46o') + buildConfigField 'String', 'YOUTUBE_KEY', formatString('AIzaSyDlbxag2dCc-a9ac8JTfH3nnVw41pdI-1U') manifestPlaceholders = [ GOOGLE_MAPS_KEY: "AIzaSyD-7-YhOAzX4VJfVLsHUz8KEn-1MGJq46o" ] } prod { dimension "app" - if (project.hasProperty('GI_RAZORPAY_KEY') && project.hasProperty('GOOGLE_MAPS_KEY')) { + if (project.hasProperty('GI_RAZORPAY_KEY') + && project.hasProperty('GOOGLE_MAPS_KEY') + && project.hasProperty('YOUTUBE_KEY') + ) { buildConfigField 'String', 'GI_RAZORPAY_KEY', formatString("$GI_RAZORPAY_KEY") buildConfigField 'String', 'GOOGLE_MAPS_KEY', formatString("$GOOGLE_MAPS_KEY") + buildConfigField 'String', 'YOUTUBE_KEY', formatString("$YOUTUBE_KEY") manifestPlaceholders = [ GOOGLE_MAPS_KEY: "$GOOGLE_MAPS_KEY" ] @@ -95,7 +98,6 @@ dependencies { implementation libs.androidx.security.crypto.ktx implementation libs.androidx.work.runtimeKtx implementation libs.dagger.hiltAndroid - implementation libs.dagger.hiltAndroidTesting implementation libs.payu.checkoutPro implementation libs.payu.nativeOtpAssist implementation libs.raamcosta.composeDestinations.animation.core @@ -108,7 +110,7 @@ dependencies { testImplementation libs.junit testImplementation libs.mockk - kapt libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/common/util/NavigationHandler.kt b/android/navi-insurance/src/main/java/com/navi/insurance/common/util/NavigationHandler.kt index 749b46df43..c0acaba87e 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/common/util/NavigationHandler.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/common/util/NavigationHandler.kt @@ -14,9 +14,9 @@ import androidx.fragment.app.commit import com.navi.base.model.CtaData import com.navi.base.model.LineItem import com.navi.base.utils.orFalse -import com.navi.common.BuildConfig import com.navi.common.utils.Constants import com.navi.common.video.NaviYoutubeActivity +import com.navi.insurance.BuildConfig import com.navi.insurance.common.GiBaseActivity import com.navi.insurance.common.models.NewScreenActionData import com.navi.insurance.navigator.NaviInsuranceDeeplinkNavigator diff --git a/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt b/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt index 62d0adbcdc..847366ab4a 100644 --- a/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt +++ b/android/navi-insurance/src/main/java/com/navi/insurance/navigator/NaviInsuranceDeeplinkNavigator.kt @@ -19,7 +19,6 @@ import com.navi.base.model.CtaType import com.navi.base.utils.BaseUtils import com.navi.base.utils.orFalse import com.navi.base.utils.orZero -import com.navi.common.BuildConfig import com.navi.common.callback.RequestToCallbackHandler import com.navi.common.firebaseremoteconfig.FirebaseRemoteConfigHelper import com.navi.common.model.ModuleName @@ -31,6 +30,7 @@ import com.navi.common.utils.imageUrlToFile import com.navi.common.utils.imageUrlToUri import com.navi.common.video.NaviYoutubeActivity import com.navi.common.video.YoutubeVideoPlayer +import com.navi.insurance.BuildConfig import com.navi.insurance.R import com.navi.insurance.analytics.InsuranceAnalyticsConstants.AUTOPAY_SETUP_BACK_BOTTOM_SHEET import com.navi.insurance.analytics.InsuranceAnalyticsConstants.AUTOPAY_SETUP_BOTTOMSHEET diff --git a/android/navi-pay/build.gradle b/android/navi-pay/build.gradle index 5c06f39487..d376fd12b0 100644 --- a/android/navi-pay/build.gradle +++ b/android/navi-pay/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -20,7 +19,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true viewBinding true @@ -109,20 +107,14 @@ dependencies { testImplementation libs.junit testImplementation libs.kotlinx.coroutines.test testImplementation libs.mockk - testImplementation libs.dagger.hiltAndroidTesting - androidTestImplementation libs.dagger.hiltAndroidTesting androidTestImplementation libs.androidx.test.runner androidTestImplementation libs.kotlinx.coroutines.test androidTestImplementation libs.turbine androidTestImplementation libs.mockk.android - kaptTest libs.dagger.hiltAndroidCompiler - kaptAndroidTest libs.dagger.hiltAndroidCompiler - - kapt libs.androidx.hilt.compiler - kapt libs.dagger.hiltAndroidCompiler - + ksp libs.androidx.hilt.compiler ksp libs.androidx.room.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/db/dao/OrderDao.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/db/dao/OrderDao.kt index 085f82f312..1e3f557f5c 100644 --- a/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/db/dao/OrderDao.kt +++ b/android/navi-pay/src/main/kotlin/com/navi/pay/tstore/list/db/dao/OrderDao.kt @@ -31,7 +31,7 @@ interface OrderDao { ) suspend fun getOrderEntity(orderId: String): OrderEntity? - @Update suspend fun updateOrderEntity(orderEntity: OrderEntity?) + @Update suspend fun updateOrderEntity(orderEntity: OrderEntity) @Query( "SELECT " + diff --git a/android/navi-payment/build.gradle b/android/navi-payment/build.gradle index 09f5f44e8e..8a7712f191 100644 --- a/android/navi-payment/build.gradle +++ b/android/navi-payment/build.gradle @@ -2,7 +2,6 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize alias libs.plugins.ksp } @@ -21,7 +20,6 @@ android { buildFeatures { aidl true - buildConfig true compose true dataBinding true } @@ -91,7 +89,7 @@ dependencies { testImplementation libs.junit - kapt libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/navi-rr/build.gradle b/android/navi-rr/build.gradle index bedcd41eec..bce53a4d4e 100644 --- a/android/navi-rr/build.gradle +++ b/android/navi-rr/build.gradle @@ -21,7 +21,6 @@ android { } buildFeatures { - buildConfig true compose true dataBinding true } @@ -89,7 +88,7 @@ dependencies { testImplementation libs.kotlinx.coroutines.test testImplementation libs.mockk - kapt libs.dagger.hiltCompiler - + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler ksp libs.raamcosta.composeDestinations.ksp } diff --git a/android/navi-vkyc/build.gradle b/android/navi-vkyc/build.gradle index 7a8b8a63c4..b6a098b73d 100644 --- a/android/navi-vkyc/build.gradle +++ b/android/navi-vkyc/build.gradle @@ -2,8 +2,8 @@ plugins { alias libs.plugins.android.library alias libs.plugins.hilt.android alias libs.plugins.kotlin.android - alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize + alias libs.plugins.ksp } android { @@ -59,7 +59,6 @@ dependencies { implementation libs.androidx.core.ktx implementation libs.androidx.fragment.ktx implementation libs.dagger.hiltAndroid - implementation libs.dagger.hiltAndroidTesting implementation libs.hms.androidSdk implementation libs.hms.videoView @@ -68,5 +67,6 @@ dependencies { testImplementation libs.junit - kapt libs.dagger.hiltCompiler + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler } diff --git a/android/navi-widgets/build.gradle b/android/navi-widgets/build.gradle index bb53dfd898..39e5cdec69 100644 --- a/android/navi-widgets/build.gradle +++ b/android/navi-widgets/build.gradle @@ -4,6 +4,7 @@ plugins { alias libs.plugins.kotlin.android alias libs.plugins.kotlin.kapt alias libs.plugins.kotlin.parcelize + alias libs.plugins.ksp } android { @@ -77,7 +78,6 @@ dependencies { implementation libs.androidx.appcompat implementation libs.androidx.core.ktx implementation libs.androidx.gridlayout - implementation libs.androidx.hilt.work implementation libs.androidx.legacy.support.v4 implementation libs.androidx.work.runtimeKtx implementation libs.dagger.hiltAndroid @@ -89,6 +89,6 @@ dependencies { testImplementation libs.mockk testImplementation libs.junit - kapt libs.androidx.hilt.compiler - kapt libs.dagger.hiltCompiler + ksp libs.androidx.hilt.compiler + ksp libs.dagger.hiltCompiler }