Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump activity compose #6439

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Bump activity compose #6439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b681de
Add activity-compose explicitly to bump verison
Rawa Jul 3, 2024
1219828
Update gradle lockfile
Rawa Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class MainActivity : ComponentActivity() {
}
}

override fun onNewIntent(intent: Intent?) {
override fun onNewIntent(intent: Intent) {
super.onNewIntent(intent)
intentProvider.setStartIntent(intent)
}
Expand Down
2 changes: 2 additions & 0 deletions android/buildSrc/src/main/kotlin/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down
1 change: 1 addition & 0 deletions android/buildSrc/src/main/kotlin/Versions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
70 changes: 31 additions & 39 deletions android/gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@
<sha256 value="aa629fbdb50669248338956fab5b308ade51df188f355067d5d0726b3275ff1f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity" version="1.8.0">
<artifact name="activity-1.8.0.aar">
<sha256 value="d3a676709dea04f2a8506e2ae85052fff763db526ac7f16b04de50fdd05b0720" origin="Generated by Gradle"/>
</artifact>
<artifact name="activity-1.8.0.module">
<sha256 value="d145d8b53cfd11fd26e47e7dd45c007133ef96ea24f6715cb653c737645d1df6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity" version="1.8.1">
<artifact name="activity-1.8.1.aar">
<sha256 value="66bc2c13bd91fb8ea09e445b21f784d3e5d3a9ec9b180cd07e0e9208c2f939c6" origin="Generated by Gradle"/>
Expand All @@ -85,30 +77,12 @@
<sha256 value="c8923871e556cd5467addabac6773e778f3a4d3da19bfc8153bbaee0d145298f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-compose" version="1.7.0">
<artifact name="activity-compose-1.7.0.module">
<sha256 value="f7a29bcba338575dcf89a553cff9cfad3f140340eaf2b56fd0193244da602c0a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-compose" version="1.7.1">
<artifact name="activity-compose-1.7.1.module">
<sha256 value="053a2a47af98d51c8adb4cff9a5bf434422a565fdd95acd2b5af63b099ceb73d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-compose" version="1.8.0">
<artifact name="activity-compose-1.8.0.aar">
<sha256 value="3b462bc760eba180956543232ca467c7b6200a091c5bfa146f906cfabc856314" origin="Generated by Gradle"/>
</artifact>
<artifact name="activity-compose-1.8.0.module">
<sha256 value="3ba7e92f92e94d349193c2c6e166084684e72fe1ff3e066ed4faebc707f9bc1f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-compose" version="1.8.1">
<artifact name="activity-compose-1.8.1.aar">
<sha256 value="73d44cf026ba5f685829c2085f7a08fb012d7fc6b5757413535731728b98d71b" origin="Generated by Gradle"/>
<component group="androidx.activity" name="activity" version="1.9.0">
<artifact name="activity-1.9.0.aar">
<sha256 value="46fc8e842d9a4e030dfd9e108c3bc08310f922bd7421f29f67dcaaa4adac3764" origin="Generated by Gradle"/>
</artifact>
<artifact name="activity-compose-1.8.1.module">
<sha256 value="19d953f5c3b735308a65ea70ed0de99d1cca1aed605dc95d17061713abb29e68" origin="Generated by Gradle"/>
<artifact name="activity-1.9.0.module">
<sha256 value="0750e6ebaaeee0fe793eb51a73691df0ddfa68b543e53e714be6e46c37f6a404" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-compose" version="1.8.2">
Expand All @@ -119,6 +93,14 @@
<sha256 value="0460c0a46ba9a74f92b180e4a78751745384a78f462de2cc240f32da4cefcf46" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-compose" version="1.9.0">
<artifact name="activity-compose-1.9.0.aar">
<sha256 value="fab1c6f216c44083ddb70d90e248eb34504f846b505aa3c7a832325b6b790d8c" origin="Generated by Gradle"/>
</artifact>
<artifact name="activity-compose-1.9.0.module">
<sha256 value="75adb65c58d860a1b1d8d8971db8284623b5d60c10804d7bfba184d56525ecca" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-ktx" version="1.7.0">
<artifact name="activity-ktx-1.7.0.aar">
<sha256 value="fce317d61a22f12967b475bfcb80c89dda66e418975e890ea703cb74e12b5b11" origin="Generated by Gradle"/>
Expand All @@ -135,14 +117,6 @@
<sha256 value="c5769b13afe55023c1dc30c72ea86189ab70aa3ca770ecfb04c970f4d6e6be65" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-ktx" version="1.8.0">
<artifact name="activity-ktx-1.8.0.aar">
<sha256 value="bfee12c1c88c3f74954fbf6e6766bc183956f37478b7c024fae7f5b38493d7a5" origin="Generated by Gradle"/>
</artifact>
<artifact name="activity-ktx-1.8.0.module">
<sha256 value="0251a826d94897d5c689e6a539fc533b4b7684d3f63e240221182d7cb4b4fb13" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-ktx" version="1.8.1">
<artifact name="activity-ktx-1.8.1.aar">
<sha256 value="9f77caa2bbec7ceefa5c931e2f223c2b386a594ee0442d168dfeaf1c850aeb9d" origin="Generated by Gradle"/>
Expand All @@ -159,6 +133,14 @@
<sha256 value="2c445c6709e5efb061db3551ef3b71f4a53e00db40bbbe782928f5531998980d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.activity" name="activity-ktx" version="1.9.0">
<artifact name="activity-ktx-1.9.0.aar">
<sha256 value="290798b88ce24c897747f15cd25102005a941a2cf4d35efcb8ce2f162c21f589" origin="Generated by Gradle"/>
</artifact>
<artifact name="activity-ktx-1.9.0.module">
<sha256 value="2ee9817c674857b18c073558c9126a836126c8b046bc3cfda6d638efe8857cad" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.annotation" name="annotation" version="1.2.0">
<artifact name="annotation-1.2.0.module">
<sha256 value="2efcab81ef91b211bacd206eaacd995a51f633a2e96b57a8fc00144c5f9c56b3" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -657,6 +639,11 @@
<sha256 value="d6b0001a96db9076ca784f94e24cc3c8f4840d5d372db3c597b9c1353fa0ef50" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.compose.runtime" name="runtime" version="1.0.1">
<artifact name="runtime-1.0.1.module">
<sha256 value="2543a8c7edc16bde91f140286b4fd3773d7204a283a4ec99f6e5e286aa92c0c3" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.compose.runtime" name="runtime" version="1.5.4">
<artifact name="runtime-1.5.4.module">
<sha256 value="3ddd8b5ef83800f6289b6f0c96c4fb7a640209b42c45e60e18bc8fd17bd3e32f" origin="Generated by Gradle"/>
Expand Down Expand Up @@ -696,6 +683,11 @@
<sha256 value="120fe7b0a1700d38ffe41375c700df2be08520ada0962b882b5a3b7e694979dc" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.compose.runtime" name="runtime-saveable" version="1.0.1">
<artifact name="runtime-saveable-1.0.1.module">
<sha256 value="c0d6f142542d8d74f65481ef6526d2be265f01f812a112948fcde87a458f4fb6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="androidx.compose.runtime" name="runtime-saveable" version="1.7.0-beta03">
<artifact name="runtime-saveable-1.7.0-beta03.module">
<sha256 value="a6f4d5324fab4f71969a36c2f8f6c394b6e61d933c4c904683df4316e5a21d9c" origin="Generated by Gradle"/>
Expand Down
Loading