From 9b681de24c2b1b6d32348a197ebd74b263909408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Wed, 3 Jul 2024 13:05:38 +0200 Subject: [PATCH 1/2] Add activity-compose explicitly to bump verison --- android/app/build.gradle.kts | 1 + .../src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt | 2 +- android/buildSrc/src/main/kotlin/Dependencies.kt | 2 ++ android/buildSrc/src/main/kotlin/Versions.kt | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 359a4259ccff..51ecdacc95c5 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -325,6 +325,7 @@ dependencies { playImplementation(project(Dependencies.Mullvad.billingLib)) implementation(Dependencies.commonsValidator) + implementation(Dependencies.AndroidX.activityCompose) implementation(Dependencies.AndroidX.coreKtx) implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) implementation(Dependencies.AndroidX.lifecycleViewmodelKtx) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt index 56494420503e..7d592f468ae5 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt @@ -72,7 +72,7 @@ class MainActivity : ComponentActivity() { } } - override fun onNewIntent(intent: Intent?) { + override fun onNewIntent(intent: Intent) { super.onNewIntent(intent) intentProvider.setStartIntent(intent) } diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 8b96a3a4d4be..417cb526037a 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -19,6 +19,8 @@ object Dependencies { const val billingClient = "com.android.billingclient:billing-ktx:${Versions.billingClient}" object AndroidX { + const val activityCompose = + "androidx.activity:activity-compose:${Versions.AndroidX.activityCompose}" const val appcompat = "androidx.appcompat:appcompat:${Versions.AndroidX.appcompat}" const val coreKtx = "androidx.core:core-ktx:${Versions.AndroidX.coreKtx}" const val fragmentTestning = diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 06597bfba300..e2daca63a1e3 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -22,6 +22,7 @@ object Versions { } object AndroidX { + const val activityCompose = "1.9.0" const val appcompat = "1.7.0" const val coreKtx = "1.12.0" const val espresso = "3.6.1" From 1219828313bf0989764d82bd2abb5dbc9887b1be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20G=C3=B6ransson?= Date: Wed, 3 Jul 2024 13:20:04 +0200 Subject: [PATCH 2/2] Update gradle lockfile --- android/gradle/verification-metadata.xml | 70 +++++++++++------------- 1 file changed, 31 insertions(+), 39 deletions(-) diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index 0c7d020dc68e..132f874ac356 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -61,14 +61,6 @@ - - - - - - - - @@ -85,30 +77,12 @@ - - - - - - - - - - - - - - - - - - - - - + + + - - + + @@ -119,6 +93,14 @@ + + + + + + + + @@ -135,14 +117,6 @@ - - - - - - - - @@ -159,6 +133,14 @@ + + + + + + + + @@ -657,6 +639,11 @@ + + + + + @@ -696,6 +683,11 @@ + + + + +