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 com.diffplug.spotless from 6.12.0 to 6.12.1 #1021

Closed

Conversation

dependabot[bot]
Copy link
Contributor

@dependabot dependabot bot commented on behalf of github Jan 3, 2023

Bumps com.diffplug.spotless from 6.12.0 to 6.12.1.

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot will merge this PR once CI passes on it, as requested by @nextcloud-command.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Bumps com.diffplug.spotless from 6.12.0 to 6.12.1.

---
updated-dependencies:
- dependency-name: com.diffplug.spotless
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
@dependabot dependabot bot added 3. to review dependencies Pull requests that update a dependency file labels Jan 3, 2023
Copy link

@nextcloud-command nextcloud-command left a comment

Choose a reason for hiding this comment

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

@dependabot merge

@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jan 3, 2023

One of your CI runs failed on this pull request, so Dependabot won't merge it.

Dependabot will still automatically merge this pull request if you amend it and your tests pass.

@codecov
Copy link

codecov bot commented Jan 3, 2023

Codecov Report

Merging #1021 (9e4e18b) into master (bfd11ac) will increase coverage by 0.05%.
The diff coverage is n/a.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1021      +/-   ##
==========================================
+ Coverage   49.33%   49.39%   +0.05%     
==========================================
  Files         178      178              
  Lines        6713     6713              
  Branches      892      892              
==========================================
+ Hits         3312     3316       +4     
+ Misses       2931     2929       -2     
+ Partials      470      468       -2     
Impacted Files Coverage Δ
...sources/status/GetCapabilitiesRemoteOperation.java 50.00% <0.00%> (+0.33%) ⬆️
...ncloud/android/lib/common/network/WebdavEntry.java 79.28% <0.00%> (+0.39%) ⬆️
...wncloud/android/lib/resources/files/FileUtils.java 85.71% <0.00%> (+14.28%) ⬆️

@tobiasKaminsky
Copy link
Member

Step 'ktlint' found problem in 'src/main/java/com/owncloud/android/lib/resources/files/model/FileLockType.kt':
25:42 Expecting ';' after the last enum entry or '}' to close enum class body

But this is is already in place.
If I remove companion block, then it works, but then fails on CapabilityBooleanType.

I will close this, and hopefully next minor will fix it.

@tobiasKaminsky
Copy link
Member

@dependabot ignore this minor version

@dependabot dependabot bot closed this Jan 5, 2023
@dependabot @github
Copy link
Contributor Author

dependabot bot commented on behalf of github Jan 5, 2023

OK, I won't notify you about version 6.12.x again, unless you re-open this PR. 😢

@dependabot dependabot bot deleted the dependabot/gradle/com.diffplug.spotless-6.12.1 branch January 5, 2023 07:58
@AlvaroBrey
Copy link
Member

AlvaroBrey commented Jan 7, 2023

Step 'ktlint' found problem in 'src/main/java/com/owncloud/android/lib/resources/files/model/FileLockType.kt':
25:42 Expecting ';' after the last enum entry or '}' to close enum class body

But this is is already in place. If I remove companion block, then it works, but then fails on CapabilityBooleanType.

I will close this, and hopefully next minor will fix it.

See pinterest/ktlint#1733. Looks like we'll need to suppress no-semi for enums with companion objects/methods, as the only supported format right now just looks bad.

@AlvaroBrey
Copy link
Member

To elaborate, seems like ktlint 0.48.0 now enables trailing commas by default. In this case no-semi conflicts with trailing commas, as the semicolon is needed to separate the enum values from the methods/companion object, but it is expected at the same place as the trailing comma, so the formatter doesn't know what to do.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants