diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-07-03 13:05:38 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-07-03 16:53:19 +0200 |
| commit | 71e0d37050282ed3ed222e0df34962f3887ba8de (patch) | |
| tree | 45ed44904e68bd1b9aa2ba3de7b549098d1c9195 | |
| parent | c6771e8b135b8ea7bdb435109a2c95cbeaa777bf (diff) | |
| download | mullvadvpn-71e0d37050282ed3ed222e0df34962f3887ba8de.tar.xz mullvadvpn-71e0d37050282ed3ed222e0df34962f3887ba8de.zip | |
Add activity-compose explicitly to bump verison
4 files changed, 5 insertions, 1 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 359a4259cc..51ecdacc95 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 5649442050..7d592f468a 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 8b96a3a4d4..417cb52603 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 06597bfba3..e2daca63a1 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" |