NTP-9789 | Migrating to Kotlin 2.0.21 (#13460)

Co-authored-by: Shivam Goyal <shivam.goyal@navi.com> Co-authored-by: soumya-ranjan_navi <soumya.ranjan@navi.com>
2024-11-09 17:22:46 +05:30
parent 826ffc4a60
commit 05522d7092
27 changed files with 51 additions and 82 deletions
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,26 +1,27 @@
 /build
-/local.properties
 /captures
+/local.properties
+.cxx
 .DS_Store
 .externalNativeBuild
 .gradle
-.cxx
-.idea/
 .gradle/
+.idea/
 .navigation/
-*.iml
-*.apk
-*.ap_
+.kotlin/
 *.aab
+*.ap_
+*.apk
 *.class
+*.iml
 *.log
-vcs.xml
-one-money-sdk/build
-visit-sdk/build
 finoramic-android-sdk/build
 finoramic-androidx-sdk/build/
-npci-upi-cl/build/
 local.env
+npci-upi-cl/build/
+one-money-sdk/build
+vcs.xml
+visit-sdk/build
 # Local build cache
 build-cache
 api-credentials.json
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,6 +6,7 @@ plugins {
    alias libs.plugins.google.services
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.kapt
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
@@ -127,9 +128,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/application-platform/app/build.gradle
+++ b/android/application-platform/app/build.gradle
@@ -37,9 +37,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        jvmTarget = '17'
    }
--- a/android/application-platform/navi-ap/build.gradle
+++ b/android/application-platform/navi-ap/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -36,9 +37,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -31,6 +31,7 @@ plugins {
    alias libs.plugins.google.services apply false
    alias libs.plugins.hilt.android apply false
    alias libs.plugins.kotlin.android apply false
+    alias libs.plugins.kotlin.compose apply false
    alias libs.plugins.kotlin.kapt apply false
    alias libs.plugins.kotlin.parcelize apply false
    alias libs.plugins.ksp apply false
--- a/android/gradle/libs.versions.toml
+++ b/android/gradle/libs.versions.toml
@@ -57,7 +57,6 @@ cashfree = "2.0.6"
 chucker = "4.0.0"
 coil = "2.5.0"
 compose-bom = "2024.09.02"
-compose-lib = "1.5.14"
 delight-advancedWebView = "v3.0.0"
 digio = "v4.0.6"
 digitap = "1.4.4"
@@ -85,10 +84,10 @@ junit = "4.13.2"
 juspay-googlePayClientApi = "1.0.0"
 juspay-hypersdk = "2.1.33"
 juspay-hypersdkPlugin = "2.0.4"
-kotlin = "1.9.24"
+kotlin = "2.0.21"
 kotlinxCoroutines = "1.8.1"
 kotlinxCoroutinesTest = "1.8.1"
-ksp = "1.9.24-1.0.20"
+ksp = "2.0.21-1.0.26"
 lottie = "6.4.1"
 masayukiSuda-easingInterpolator = "v1.3.2"
 mlkit-barcodeScanning = "17.3.0"
@@ -98,12 +97,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.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"
+navi-adverse = "1.8.0"
+navi-alfred = "1.17.0"
+navi-elex = "1.3.0"
+navi-guarddog = "3.9.0"
+navi-pulse = "1.11.0"
+navi-uitron = "1.29.0"
 navigation = "2.5.3"
 okhttp-bom = "4.12.0"
 otaliastudios-cameraview = "2.7.2"
@@ -409,6 +408,7 @@ firebase-perf = { id = "com.google.firebase.firebase-perf", version.ref = "fireb
 google-services = { id = "com.google.gms.google-services", version.ref = "google-services" }
 hilt-android = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
--- a/android/navi-amc/build.gradle
+++ b/android/navi-amc/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.kapt
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
@@ -41,9 +42,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-amc/src/main/java/com/navi/amc/common/fragment/BannerHorizontalBottomSheet.kt
+++ b/android/navi-amc/src/main/java/com/navi/amc/common/fragment/BannerHorizontalBottomSheet.kt
@@ -45,12 +45,12 @@ class BannerHorizontalBottomSheet : BaseBottomSheet() {
        binding.apply {
            banner.isVisible =
                if (data.banner != null) {
-                    icon.showWhenDataIsAvailable(data?.banner.icon)
-                    bannerTitle.setSpannableString(data?.banner.title)
+                    icon.showWhenDataIsAvailable(data?.banner?.icon)
+                    bannerTitle.setSpannableString(data?.banner?.title)
                    banner.background =
                        getNaviDrawable(
                            radii = CornerRadius(leftTop = dpToPx(16), rightTop = dpToPx(16)),
-                            backgroundColor = data?.banner.bgColor.parseColorSafe()
+                            backgroundColor = data?.banner?.bgColor.parseColorSafe()
                        )
                    true
                } else {
--- a/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragment.kt
+++ b/android/navi-amc/src/main/java/com/navi/amc/fundbuy/fragments/FundDetailsFragment.kt
@@ -203,7 +203,7 @@ class FundDetailsFragment : AmcBaseFragment(), FooterInteractionListener {
                                    backgroundColor = it.label?.bgColor.parseColorSafe()
                                )

-                            fundDetailScreenData?.content?.rewards.gradient?.let { gradient ->
+                            fundDetailScreenData?.content?.rewards?.gradient?.let { gradient ->
                                binding.rewards.root.background =
                                    getGradientDrawable(context, gradient)
                            }
@@ -212,7 +212,7 @@ class FundDetailsFragment : AmcBaseFragment(), FooterInteractionListener {
                                        fundDetailScreenData
                                            ?.content
                                            ?.rewards
-                                            .bgColor
+                                            ?.bgColor
                                            .parseColorSafe()
                                    )
                                }
--- a/android/navi-bbps/build.gradle
+++ b/android/navi-bbps/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -37,9 +38,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-chat/build.gradle
+++ b/android/navi-chat/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -37,9 +38,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-coin/build.gradle
+++ b/android/navi-coin/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -36,9 +37,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-common/build.gradle
+++ b/android/navi-common/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.kapt
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
@@ -39,9 +40,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-cycs/build.gradle
+++ b/android/navi-cycs/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -31,9 +32,6 @@ android {
            matchingFallbacks = ['release']
        }
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
--- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/sharedelements/KeyframeBasedMotion.kt
+++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/sharedelements/KeyframeBasedMotion.kt
@@ -9,6 +9,8 @@ package com.navi.cycs.sharedelements

 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.geometry.lerp
+import androidx.compose.ui.util.unpackFloat1
+import androidx.compose.ui.util.unpackFloat2

 abstract class KeyframeBasedMotion : PathMotion {

@@ -18,7 +20,8 @@ abstract class KeyframeBasedMotion : PathMotion {

    protected abstract fun getKeyframes(start: Offset, end: Offset): Pair<FloatArray, LongArray>

-    private fun LongArray.getOffset(index: Int) = @Suppress("INVISIBLE_MEMBER") Offset(get(index))
+    private fun LongArray.getOffset(index: Int) =
+        Offset(unpackFloat1(get(index)), unpackFloat2(get(index)))

    override fun invoke(start: Offset, end: Offset, fraction: Float): Offset {
        var frac = fraction
--- a/android/navi-cycs/src/main/kotlin/com/navi/cycs/sharedelements/QuadraticBezier.kt
+++ b/android/navi-cycs/src/main/kotlin/com/navi/cycs/sharedelements/QuadraticBezier.kt
@@ -8,6 +8,7 @@
 package com.navi.cycs.sharedelements

 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.util.packFloats

 internal object QuadraticBezier {

@@ -68,8 +69,7 @@ internal object QuadraticBezier {
        val lengths = FloatArray(count)
        for (i in result.indices) {
            val point = cur.point
-            @Suppress("INVISIBLE_MEMBER")
-            result[i] = point.packedValue
+            result[i] = packFloats(point.x, point.y)
            if (i > 0) {
                val distance = (point - last).getDistance()
                length += distance
--- a/android/navi-design/build.gradle
+++ b/android/navi-design/build.gradle
@@ -1,6 +1,7 @@
 plugins {
    alias libs.plugins.android.library
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.kapt
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
@@ -37,9 +38,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-design/src/main/java/com/navi/design/calendar/view/NaviCalendarListView.kt
+++ b/android/navi-design/src/main/java/com/navi/design/calendar/view/NaviCalendarListView.kt
@@ -210,8 +210,7 @@ constructor(context: Context, attrs: AttributeSet? = null) : ConstraintLayout(co
                            if (
                                isDateAvailable &&
                                    skipDateConfig?.startDate != null &&
-                                    skipDateConfig.endDate != null &&
-                                    selectableDates.isNullOrEmpty()
+                                    skipDateConfig.endDate != null
                            ) {
                                isDateAvailable =
                                    !((currentDate.after(skipDateConfig.startDate) ||
--- a/android/navi-gold/build.gradle
+++ b/android/navi-gold/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
    alias libs.plugins.navigation
@@ -40,9 +41,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-hl/build.gradle
+++ b/android/navi-hl/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.kapt
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
@@ -40,9 +41,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-insurance/build.gradle
+++ b/android/navi-insurance/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -38,9 +39,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-pay/build.gradle
+++ b/android/navi-pay/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -37,9 +38,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-payment/build.gradle
+++ b/android/navi-payment/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
 }
@@ -37,9 +38,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-rr/build.gradle
+++ b/android/navi-rr/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.kapt
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
@@ -39,9 +40,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-rr/src/main/java/com/navi/rr/uitron/render/CustomSpannableTextRenderer.kt
+++ b/android/navi-rr/src/main/java/com/navi/rr/uitron/render/CustomSpannableTextRenderer.kt
@@ -52,7 +52,7 @@ class CustomSpannableTextRenderer : Renderer<CustomSpannableProperty> {
                                    newSpannableTextData.textMap?.put(index.toString(), text)
                                }
                            }
-                    } ?: emptyList()
+                    } ?: emptyList<SpanProperty>()
                )
            }

--- a/android/navi-widgets/build.gradle
+++ b/android/navi-widgets/build.gradle
@@ -2,6 +2,7 @@ plugins {
    alias libs.plugins.android.library
    alias libs.plugins.hilt.android
    alias libs.plugins.kotlin.android
+    alias libs.plugins.kotlin.compose
    alias libs.plugins.kotlin.kapt
    alias libs.plugins.kotlin.parcelize
    alias libs.plugins.ksp
@@ -38,9 +39,6 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-    composeOptions {
-        kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
-    }
    kotlinOptions {
        freeCompilerArgs += ["-Xstring-concat=inline"]
        jvmTarget = '17'
--- a/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleWidgetComposable.kt
+++ b/android/navi-widgets/src/main/java/com/navi/naviwidgets/views/composables/TitleWidgetComposable.kt
@@ -38,7 +38,7 @@ fun TitleWidgetComposable(data: TitleComposableWidget, handleCta: (CtaData) -> U
                        font = "TT_SEMI_BOLD",
                        size = 16,
                        lineSpacing = 24,
-                        text = data.widgetData?.title?.text,
+                        text = "",
                        textColor = "#191919",
                        fontWeight = 600
                    )