From 8955174c1e0edbceb39adf36b2905d6c75eab15f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 18:11:45 +0000 Subject: [PATCH 1/3] Bump androidx.activity:activity-ktx from 1.8.0 to 1.9.3 Bumps androidx.activity:activity-ktx from 1.8.0 to 1.9.3. --- updated-dependencies: - dependency-name: androidx.activity:activity-ktx dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5374199eb1c..20242834db8 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ agp = '8.5.1' android-billingclient = '5.0.0' android-desugar = '2.0.4' android-security-lint = '1.0.1' -androidx-activity = '1.8.0' +androidx-activity = '1.9.3' androidx-appcompat = '1.4.2' androidx-arch-core = '2.1.0' androidx-browser = '1.5.0' From 292fd06d074a9ae48b4f1a8b428846479b1861a2 Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Wed, 4 Dec 2024 00:41:06 +0100 Subject: [PATCH 2/3] Removes Intent nullability from Activity's onNewIntent --- .../main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt index 8b5f17d864e..84bcc116432 100644 --- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt +++ b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt @@ -395,7 +395,7 @@ class MainActivity : super.onPause() } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) // Verify authenticated session From 260f7cab28f7ed160cad1dff8e4d7987716bd606 Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Wed, 4 Dec 2024 00:55:49 +0100 Subject: [PATCH 3/3] Remove activity-ktx as it is now completely empty dependency According to official docs, when upgrading to v1.9.0: "The remainder of the Activity APIs have been rewritten in Kotlin and all extensions previously available in activity-ktx have been moved to activity. activity-ktx is now completely empty" --- WooCommerce/build.gradle | 1 - gradle/libs.versions.toml | 1 - 2 files changed, 2 deletions(-) diff --git a/WooCommerce/build.gradle b/WooCommerce/build.gradle index 8959fc8e102..8472134e4d4 100644 --- a/WooCommerce/build.gradle +++ b/WooCommerce/build.gradle @@ -429,7 +429,6 @@ dependencies { // ViewModel and LiveData implementation(libs.androidx.fragment.ktx) - implementation(libs.androidx.activity.ktx) implementation(libs.androidx.lifecycle.viewmodel.savedstate) implementation(libs.androidx.lifecycle.process) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e2fa3557b69..b81f3c67c45 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -98,7 +98,6 @@ android-billingclient-ktx = { group = "com.android.billingclient", name = "billi android-desugar = { group = "com.android.tools", name = "desugar_jdk_libs", version.ref = "android-desugar" } android-security-lint = { group = "com.android.security.lint", name = "lint", version.ref = "android-security-lint" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose" } -androidx-activity-ktx = { group = "androidx.activity", name = "activity-ktx", version.ref = "androidx-activity" } androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } androidx-arch-core-testing = { group = "androidx.arch.core", name = "core-testing", version.ref = "androidx-arch-core" } androidx-browser = { group = "androidx.browser", name = "browser", version.ref = "androidx-browser" }