Skip to content

Commit

Permalink
Merge branch 'master' into 2220-statement-wrapping
Browse files Browse the repository at this point in the history
  • Loading branch information
paul-dingemans authored Sep 3, 2023
2 parents 50f7b28 + 61941a3 commit 665f00b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ If an `EditorConfigProperty` is defined in a `Rule` that is only provided via a
* Update kotlin monorepo to v1.9.10 [#2197](https://github.com/pinterest/ktlint/issues/2197)
* Update dependency info.picocli:picocli to v4.7.5 [#2215](https://github.com/pinterest/ktlint/pull/2215)
* Move wrapping on semicolon from `wrapping` rule to `statement-wrapping` rule [#2220](https://github.com/pinterest/ktlint/issue/2220)
* Update dependency org.jetbrains.dokka:dokka-gradle-plugin to v1.9.0 [#2221](https://github.com/pinterest/ktlint/pull/2221)

## [0.50.0] - 2023-06-29

Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ kotlinx-binary-compatibiltiy-validator = "org.jetbrains.kotlinx.binary-compatibi
kotlin-compiler = { module = "org.jetbrains.kotlin:kotlin-compiler-embeddable", version.ref = "kotlin" }
kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-plugin-dev = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinDev" }
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.8.20"
dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.0"
ec4j = "org.ec4j.core:ec4j-core:0.3.0"
picocli = "info.picocli:picocli:4.7.5"
logging = "io.github.oshai:kotlin-logging-jvm:5.1.0"
Expand Down

0 comments on commit 665f00b

Please sign in to comment.