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

Update plugin ktlint to v12.1.0 #2200

Merged
merged 9 commits into from
Jan 10, 2024

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Jan 9, 2024

Mend Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
org.jlleitschuh.gradle.ktlint 12.0.3 -> 12.1.0 age adoption passing confidence

Warning

Some dependencies could not be looked up. Check the Dependency Dashboard for more information.


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot requested a review from a team as a code owner January 9, 2024 16:16
@renovate renovate bot requested review from jmartinesp and removed request for a team January 9, 2024 16:16
@renovate renovate bot added the PR-Dependencies Pull requests that update a dependency file label Jan 9, 2024
Copy link
Contributor

github-actions bot commented Jan 9, 2024

📱 Scan the QR code below to install the build (arm64 only) for this PR.
QR code
If you can't scan the QR code you can install the build via this link: https://i.diawi.com/XutKvz

Copy link
Contributor Author

renovate bot commented Jan 10, 2024

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

Warning: custom changes will be lost.

@ElementBot
Copy link
Collaborator

ElementBot commented Jan 10, 2024

Warnings
⚠️

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt#L30 - Using a material import while also using the material3 library

⚠️

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfileView.kt#L31 - Using a material import while also using the material3 library

⚠️

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt#L34 - Using a material import while also using the material3 library

⚠️

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditView.kt#L35 - Using a material import while also using the material3 library

⚠️

gradle/libs.versions.toml#L94 - A newer version of androidx.compose.material3:material3 than 1.2.0-alpha11 is available: 1.2.0-beta01

⚠️

libraries/maplibre-compose/src/main/kotlin/io/element/android/libraries/maplibre/compose/MapboxMap.kt#L186 - Use AppCompatResources.getDrawable()

Generated by 🚫 dangerJS against 303f6c6

Copy link

codecov bot commented Jan 10, 2024

Codecov Report

Attention: 49 lines in your changes are missing coverage. Please review.

Comparison is base (e8c6226) 67.01% compared to head (2085729) 69.43%.
Report is 14 commits behind head on develop.

❗ Current head 2085729 differs from pull request most recent head b3ba069. Consider uploading reports for the commit b3ba069 to get more accurate results

Files Patch % Lines
...d/features/poll/api/pollcontent/PollContentView.kt 0.00% 6 Missing and 1 partial ⚠️
...ignsystem/components/media/WaveformPlaybackView.kt 64.28% 5 Missing ⚠️
...en/impl/biometric/DefaultBiometricUnlockManager.kt 0.00% 4 Missing ⚠️
.../features/lockscreen/impl/unlock/PinUnlockState.kt 0.00% 2 Missing and 1 partial ⚠️
.../components/receipt/TimelineItemReadReceiptView.kt 70.00% 0 Missing and 3 partials ⚠️
...id/features/invitelist/impl/InviteListPresenter.kt 84.61% 0 Missing and 2 partials ⚠️
...atures/login/impl/changeserver/ChangeServerView.kt 0.00% 2 Missing ⚠️
...l/timeline/components/TimelineItemReactionsView.kt 50.00% 1 Missing and 1 partial ⚠️
...onents/reactionsummary/ReactionSummaryPresenter.kt 71.42% 0 Missing and 2 partials ⚠️
...ures/rageshake/impl/reporter/DefaultBugReporter.kt 0.00% 2 Missing ⚠️
... and 15 more
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2200      +/-   ##
===========================================
+ Coverage    67.01%   69.43%   +2.42%     
===========================================
  Files         1376     1341      -35     
  Lines        34263    33249    -1014     
  Branches      7460     7116     -344     
===========================================
+ Hits         22961    23087     +126     
+ Misses        7677     6646    -1031     
+ Partials      3625     3516     -109     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@bmarty bmarty added the Run-Maestro Starts a Maestro Cloud session to run integration tests label Jan 10, 2024
@github-actions github-actions bot removed the Run-Maestro Starts a Maestro Cloud session to run integration tests label Jan 10, 2024
if (!applyPaddingToContents) {
then(Modifier.padding(DialogContentDefaults.externalHorizontalPadding))
}
}
Copy link
Member

Choose a reason for hiding this comment

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

This does not seem to be equivalent, see the failure in the screenshot test:
image

Copy link
Member

Choose a reason for hiding this comment

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

Yes, I restored the previous behaviour here: b3ba069

I guess the .apply lambda captures the initial value of applyPaddingToContents and never updates it.

Copy link
Member

Choose a reason for hiding this comment

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

The other change is because the changed material.Text to material3.Text and the rendering is slightly different.

Copy link
Member

Choose a reason for hiding this comment

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

Actually the returned value of apply is its receiver. This is not the case for then, which return other in this case.

                            // Align the title to the center when an icon is present.
                            (
                                if (applyPaddingToContents)
                                    Modifier
                                else
                                    Modifier.padding(DialogContentDefaults.externalHorizontalPadding)
                                )
                                .padding(DialogContentDefaults.titlePadding)
                                .align(
                                    if (icon == null) {
                                        Alignment.Start
                                    } else {
                                        Alignment.CenterHorizontally
                                    }
                                )

would have worked too (I think), hence a bit hard to read.

Copy link
Member

Choose a reason for hiding this comment

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

Oh, true 🤦 . Maybe a .run { ... } would have worked, but it would look quite weird there.

Copy link

sonarcloud bot commented Jan 10, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

Copy link
Member

@bmarty bmarty left a comment

Choose a reason for hiding this comment

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

Thanks, approving all the changes, but I let @jmartinesp merge when ready. Do not wait to much to avoid to handle conflict, regarding the number of impacted files :)

@jmartinesp jmartinesp added the Run-Maestro Starts a Maestro Cloud session to run integration tests label Jan 10, 2024
@github-actions github-actions bot removed the Run-Maestro Starts a Maestro Cloud session to run integration tests label Jan 10, 2024
@jmartinesp jmartinesp merged commit c8bd362 into develop Jan 10, 2024
16 checks passed
@jmartinesp jmartinesp deleted the renovate/org.jlleitschuh.gradle.ktlint-12.x branch January 10, 2024 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR-Dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants