Update Kotlin to 1.9.20 and Compose to 1.5.4 (#53)

* Update Kotlin to 1.9.20 and Compose to 1.5.4

* detekt

Author: hbmartin

.idea/kotlinc.xml

@@ -98,7 +98,7 @@ Step 2. Add the dependency - n.b. this currently does not support Material 3.
 ```kotlin 
 dependencies {
     implementation("androidx.compose.material:material:1.5.4")
-    implementation("com.github.jump-sdk:jetpack_compose_country_code_picker_emoji:2.2.5")
+    implementation("com.github.jump-sdk:jetpack_compose_country_code_picker_emoji:2.2.6")
 }  
 ```
 

README.md

@@ -31,7 +31,7 @@ tasks.register<Delete>("clean") {
 tasks.withType<com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask> {
     checkForGradleUpdate = true
     rejectVersionIf {
-        listOf("-mercury-", "-station-", "-alpha", "-dev-").any { word ->
+        listOf("2.0.0-Beta1", "2.7.0-beta01", "-alpha", "-dev-").any { word ->
             candidate.version.contains(word)
         }
     }

build.gradle.kts

@@ -58,11 +58,11 @@ dependencies {
     implementation(libs.compose.tooling.preview)
 
     detektPlugins("ru.kode:detekt-rules-compose:1.3.0")
-    detektPlugins("io.nlopez.compose.rules:detekt:0.3.0")
+    detektPlugins("io.nlopez.compose.rules:detekt:0.3.3")
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-rules-libraries:${libs.versions.detekt.get()}")
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${libs.versions.detekt.get()}")
     detektPlugins("com.braisgabin.detekt:kotlin-compiler-wrapper:0.0.4")
-    detektPlugins("com.github.hbmartin:hbmartin-detekt-rules:0.1.1")
+    detektPlugins("com.github.hbmartin:hbmartin-detekt-rules:0.1.3")
 }
 
 detekt {
@@ -78,7 +78,7 @@ afterEvaluate {
                 groupId = "com.togisoft"
                 artifactId = "jetpack_country_code_picker"
                 // Update version in README when changing below
-                version = "2.2.5"
+                version = "2.2.6"
             }
         }
     }

ccp/build.gradle.kts

@@ -1,5 +1,6 @@
 package com.togitech.ccp.component
 
+import android.content.Context
 import android.util.Log
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -27,6 +28,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.autofill.AutofillType
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
@@ -126,20 +128,20 @@ fun TogiCountryCodePicker(
         initialCountryPhoneCode,
         initialCountryIsoCode,
     ) {
-        if (initialPhoneNumber?.startsWith("+") == true) {
-            Log.e(TAG, "initialPhoneNumber must not include the country code")
-        }
-        if (initialCountryPhoneCode?.run { !startsWith("+") } == true) {
-            Log.e(TAG, "initialCountryPhoneCode must start with +")
-        }
         mutableStateOf(
-            initialCountryPhoneCode?.let { getCountryFromPhoneCode(it, context) }
-                ?: CountryData.entries.firstOrNull { it.countryIso == initialCountryIsoCode }
-                ?: CountryData.isoMap[getUserIsoCode(context)]
-                ?: fallbackCountry,
+            configureInitialCountry(
+                initialCountryPhoneCode = initialCountryPhoneCode,
+                context = context,
+                initialCountryIsoCode = initialCountryIsoCode,
+                fallbackCountry = fallbackCountry,
+            ),
         )
     }
 
+    if (initialPhoneNumber?.startsWith("+") == true) {
+        Log.e(TAG, "initialPhoneNumber must not include the country code")
+    }
+
     val phoneNumberTransformation = remember(country) {
         PhoneNumberTransformation(country.countryIso, context)
     }
@@ -214,7 +216,13 @@ fun TogiCountryCodePicker(
                 showCountryCode = showCountryCode,
                 showFlag = showCountryFlag,
                 textStyle = textStyle,
-                backgroundColor = colors.backgroundColor(enabled = true).value,
+                backgroundColor = colors.backgroundColor(enabled = true).value.let { color ->
+                    if (color == Color.Unspecified || color == Color.Transparent) {
+                        MaterialTheme.colors.surface
+                    } else {
+                        color
+                    }
+                },
             )
         },
         trailingIcon = {
@@ -251,6 +259,21 @@ fun TogiCountryCodePicker(
     )
 }
 
+private fun configureInitialCountry(
+    initialCountryPhoneCode: PhoneCode?,
+    context: Context,
+    initialCountryIsoCode: Iso31661alpha2?,
+    fallbackCountry: CountryData,
+): CountryData {
+    if (initialCountryPhoneCode?.run { !startsWith("+") } == true) {
+        Log.e(TAG, "initialCountryPhoneCode must start with +")
+    }
+    return initialCountryPhoneCode?.let { getCountryFromPhoneCode(it, context) }
+        ?: CountryData.entries.firstOrNull { it.countryIso == initialCountryIsoCode }
+        ?: CountryData.isoMap[getUserIsoCode(context)]
+        ?: fallbackCountry
+}
+
 private fun FocusRequester.safeFreeFocus() {
     try {
         this.freeFocus()

ccp/src/main/java/com/togitech/ccp/component/TogiCountryCodePicker.kt

@@ -1087,14 +1087,12 @@ HbmartinRuleSet:
 Compose:
   CompositionLocalAllowlist:
     active: true
-    # You can optionally define a list of CompositionLocals that are allowed here
-    # allowedCompositionLocals: LocalSomething,LocalSomethingElse
   ContentEmitterReturningValues:
     active: true
-    # You can optionally add your own composables here
-    # contentEmitters: MyComposable,MyOtherComposable
   DefaultsVisibility:
     active: true
+  ModifierClickableOrder:
+    active: true
   ModifierComposable:
     active: true
   ModifierMissing:
@@ -1106,22 +1104,16 @@ Compose:
     active: true
   ModifierNotUsedAtRoot:
     active: true
-    # You can optionally add your own composables here
-    # contentEmitters: MyComposable,MyOtherComposable
   ModifierReused:
     active: true
   ModifierWithoutDefault:
     active: true
   MultipleEmitters:
     active: true
-    # You can optionally add your own composables here
-    # contentEmitters: MyComposable,MyOtherComposable
   MutableParams:
     active: true
   ComposableNaming:
     active: true
-    # You can optionally disable the checks in this rule for regex matches against the composable name (e.g. molecule presenters)
-    # allowedComposableFunctionNames: .*Presenter,.*MoleculePresenter
   ComposableParamOrder:
     active: true
   PreviewAnnotationNaming:
@@ -1130,16 +1122,14 @@ Compose:
     active: true
   RememberMissing:
     active: true
+  RememberContentMissing:
+    active: true
   UnstableCollections:
     active: true
   ViewModelForwarding:
     active: true
-      # You can optionally use this rule on things other than types ending in "ViewModel" or "Presenter" (which are the defaults). You can add your own via a regex here:
-    # allowedStateHolderNames: .*ViewModel,.*Presenter
   ViewModelInjection:
     active: true
-    # You can optionally add your own ViewModel factories here
-    # viewModelFactories: hiltViewModel,potatoViewModel
 
 compose:
   ReusedModifierInstance:

detekt.yml

@@ -1,5 +1,5 @@
 [versions]
-kotlin = "1.9.10"
+kotlin = "1.9.20"
 dokka = "1.9.10"
 
 ## SDK Versions
@@ -8,9 +8,9 @@ targetSdk = "34"
 compileSdk = "34"
 
 # Dependencies
-android-gradle-plugin = "8.2.0-rc01"
+android-gradle-plugin = "8.2.0-rc03"
 gradle-versions = "0.49.0"
-detekt = "1.23.1"
+detekt = "1.23.3"
 
 accompanist = "0.32.0"
 androidx-activity-compose = "1.8.0"
@@ -22,15 +22,15 @@ androidx-test-junit = "1.1.5"
 compose = "1.5.4"
 # https://androidx.dev/storage/compose-compiler/repository/
 # https://developer.android.com/jetpack/androidx/releases/compose-compiler
-composeCompiler = "1.5.3"
+composeCompiler = "1.5.4"
 
 kotlinx-coroutines = "1.7.3"
 kotlinx-collections-immutable = "0.3.6"
 
-libphonenumber = "8.13.17"
+libphonenumber = "8.13.25"
 
 junit = "4.13.2"
-robolectric = "4.10.3"
+robolectric = "4.11.1"
 paparazzi = "1.3.2-SNAPSHOT"
 
 [libraries]