MBS-10881 update to gradle 7.2 #1167
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Waiting for release version |
dsvoronin
force-pushed
the
MBS-10881-gradle72
branch
from
2e3d2d7 to
c1218df
Compare
| @@ -1,5 +1,5 @@ | |||
| distributionBase=GRADLE_USER_HOME | |||
| distributionPath=wrapper/dists | |||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip | |||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-2-all.zip | |||
There was a problem hiding this comment.
Suggested change
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-2-all.zip | |
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-3-all.zip |
| @@ -1,5 +1,5 @@ | |||
| distributionBase=GRADLE_USER_HOME | |||
| distributionPath=wrapper/dists | |||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip | |||
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-2-all.zip | |||
There was a problem hiding this comment.
Suggested change
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-2-all.zip | |
| distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-rc-3-all.zip |
| @@ -106,7 +106,8 @@ abstract class InHouseInstrumentationTestRunner : | |||
| ) | |||
| } | |||
|
|
|||
| @Suppress("MemberVisibilityCanBePrivate") // Public for *TestApp to skip on orchestrator runs | |||
| // Public for *TestApp to skip on orchestrator runs | |||
| @Suppress("MemberVisibilityCanBePrivate") | |||
There was a problem hiding this comment.
Already fixed here
pinterest/ktlint#1168
| id("io.gitlab.arturbosch.detekt") version "1.16.0" | ||
| // accessing version catalog here is blocked by IDE false-postive error | ||
| // https://youtrack.jetbrains.com/issue/KTIJ-19369 | ||
| id("io.gitlab.arturbosch.detekt") version "1.18.0" |
There was a problem hiding this comment.
Remove the jetbrains-kotlin-html repo
| @@ -262,8 +262,9 @@ formatting: | |||
| active: false | |||
| AnnotationSpacing: | |||
| active: true | |||
| # todo fix and enable | |||
| ArgumentListWrapping: | |||
There was a problem hiding this comment.
pinterest/ktlint#1196
This is fixed too
There was a problem hiding this comment.
That's why I didn't update the Detekt version here :)
There was a problem hiding this comment.
We need to run ktlint separately i think
MBS-11763
dsvoronin
force-pushed
the
MBS-10881-gradle72
branch
2 times, most recently
from
e7d2db1 to
ed3396c
Compare
https://docs.gradle.org/7.2-rc-2/release-notes.html also update detekt to 1.18.0, because of kotlin 1.5 dependency disable "ArgumentListWrapping" rule, different behavior fix "ImportOrdering" rule remove kotlinx-html dependency
dsvoronin
force-pushed
the
MBS-10881-gradle72
branch
from
ed3396c to
54742e6
Compare
|
I think it's safe to merge now; |
|
Close also MBS-11267 |
RuslanMingaliev
approved these changes
Aug 16, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://docs.gradle.org/7.2-rc-2/release-notes.html
also update detekt to 1.18.0, because of kotlin 1.5 dependency
disable "ArgumentListWrapping" rule, different behavior
fix "ImportOrdering" rule