From a2677dfcfbc4c99402cc1ec8a602f72eaa64e7ec Mon Sep 17 00:00:00 2001 From: fabio-insolia-cko <123394131+fabio-insolia-cko@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:49:52 +0100 Subject: [PATCH] feature/PIMOB-2943_Create_SNAPSHOT_version_with_compose_update_fix (#284) * feature/PIMOB-2943_Create_SNAPSHOT_version_with_compose_update_fix feature/PIMOB-2943_Create_SNAPSHOT_version_with_compose_update_fix * Adding jetbrains kotlin plugin to app build.gradle * Updating compose to the latest stable 1.7.4 --- app/build.gradle | 1 + buildSrc/src/main/java/Versions.kt | 2 +- example_app_frames/lint-baseline.xml | 110 ++++++++++++++---- frames/lint-baseline.xml | 24 +++- .../paymentdetails/PaymentDetailsScreen.kt | 2 +- 5 files changed, 112 insertions(+), 27 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4d99286a..27bbfc18 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,6 @@ plugins { id("com.android.application") + id("org.jetbrains.kotlin.android") } android { diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt index 72b804f7..aebe59c9 100644 --- a/buildSrc/src/main/java/Versions.kt +++ b/buildSrc/src/main/java/Versions.kt @@ -22,7 +22,7 @@ object Versions { const val lifeCycle = "2.5.1" const val compose_compiler_ext = "1.5.3" const val compose_material3 = "1.1.2" - const val compose_version = "1.5.3" + const val compose_version = "1.7.4" const val compose_activity_version = "1.8.0" const val compose_customview_poolingcontainer = "1.0.0" const val compose_viewmodel = "2.6.2" diff --git a/example_app_frames/lint-baseline.xml b/example_app_frames/lint-baseline.xml index 30cf809f..a726f312 100644 --- a/example_app_frames/lint-baseline.xml +++ b/example_app_frames/lint-baseline.xml @@ -1,65 +1,129 @@ - + - + + + + + + + + + + + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - - + + diff --git a/frames/lint-baseline.xml b/frames/lint-baseline.xml index fe369fe7..dbd5889e 100644 --- a/frames/lint-baseline.xml +++ b/frames/lint-baseline.xml @@ -1,5 +1,25 @@ - + + + + + + + + + + + + + diff --git a/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt b/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt index 1b809029..b4274513 100644 --- a/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt +++ b/frames/src/main/java/com/checkout/frames/screen/paymentdetails/PaymentDetailsScreen.kt @@ -15,10 +15,10 @@ import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalFocusManager -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.platform.LocalSoftwareKeyboardController import androidx.lifecycle.DefaultLifecycleObserver import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.compose.LocalLifecycleOwner import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController import com.checkout.frames.di.base.Injector