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.

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 to K2 #6397

Merged
merged 5 commits into from
Jun 27, 2024
Merged

Bump to K2 #6397

merged 5 commits into from
Jun 27, 2024

Conversation

Rawa
Copy link
Contributor

@Rawa Rawa commented Jun 24, 2024

This PR aims to bump to K2. For now we wait with KSP2 since there are blocking issues in other projects.

raamcosta/compose-destinations#643
raamcosta/compose-destinations#545


This change is Reviewable

@Rawa
Copy link
Contributor Author

Rawa commented Jun 24, 2024

Once PR #6393 is merged, we also should bump compose destinations to "2.1.0-beta09"

@Pururun Pururun added the Android Issues related to Android label Jun 24, 2024
@Rawa Rawa force-pushed the k2-bump branch 3 times, most recently from ad1fff1 to af62cd1 Compare June 25, 2024 13:51
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 40 of 71 files at r1, all commit messages.
Reviewable status: 40 of 71 files reviewed, 2 unresolved discussions (waiting on @Rawa)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt line 141 at r1 (raw file):

            dropUnlessResumed { navigator.navigate(DeviceNameInfoDialogDestination) },
        onPurchaseBillingProductClick = { productId ->
            navigator.navigate(PaymentDestination(productId), onlyIfResumed = true)

As discussed we need a plan for how to handle this case. We should either fix/restore it as part of this PR or as another PR or issue that we work on soon. Would be nice to move all of these onlyIfResumed diffs to a separate commit for a better git history.

Code quote:

onlyIfResumed = true

android/gradle/verification-metadata.xml line 66 at r1 (raw file):

         </artifact>
         <artifact name="activity-1.7.2.module">
            <sha256 value="aa629fbdb50669248338956fab5b308ade51df188f355067d5d0726b3275ff1f" origin="Generated by Gradle"/>

Please move the changes to this file into a separate commit called Update gradle lockfile. That makes it easier to track things. Also easier to handle since commits that modify this file needs to be signed.

@Rawa Rawa force-pushed the k2-bump branch 2 times, most recently from bce4df4 to 9e64808 Compare June 26, 2024 09:15
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 10 files at r2, all commit messages.
Reviewable status: 40 of 73 files reviewed, 1 unresolved discussion (waiting on @Rawa)

@Rawa Rawa force-pushed the k2-bump branch 2 times, most recently from 23d13e7 to d21d92d Compare June 27, 2024 05:39
Copy link
Contributor Author

@Rawa Rawa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 38 of 73 files reviewed, 1 unresolved discussion (waiting on @albin-mullvad)


android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/AccountScreen.kt line 141 at r1 (raw file):

Previously, albin-mullvad wrote…

As discussed we need a plan for how to handle this case. We should either fix/restore it as part of this PR or as another PR or issue that we work on soon. Would be nice to move all of these onlyIfResumed diffs to a separate commit for a better git history.

Fixed 👍


android/gradle/verification-metadata.xml line 66 at r1 (raw file):

Previously, albin-mullvad wrote…

Please move the changes to this file into a separate commit called Update gradle lockfile. That makes it easier to track things. Also easier to handle since commits that modify this file needs to be signed.

Fixed

Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm: 🚀

Reviewed 22 of 71 files at r1, 8 of 10 files at r2, 5 of 5 files at r3, 1 of 1 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa Rawa marked this pull request as ready for review June 27, 2024 07:55
@Rawa Rawa requested a review from albin-mullvad June 27, 2024 07:55
Copy link
Collaborator

@albin-mullvad albin-mullvad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r5, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@Rawa Rawa merged commit 69f1462 into main Jun 27, 2024
32 checks passed
@Rawa Rawa deleted the k2-bump branch June 27, 2024 08:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Android Issues related to Android
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants