Skip to content

Commit

Permalink
build(deps): migrate detekt compose rules from Twitter to the support…
Browse files Browse the repository at this point in the history
…ed fork (mrmans0n/compose-rules)

See for details:
twitter/compose-rules#112 (comment)

Signed-off-by: Artyom Shendrik <[email protected]>
  • Loading branch information
amal committed Feb 23, 2023
1 parent d1bf2e9 commit 06fdf30
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ tab_width = 4
trim_trailing_whitespace = true
insert_final_newline = true

[*.{json, yml, xml, html, css, md, pro}]
[*.{json,yml,xml,html,css,md,pro}]
indent_size = 2
tab_width = 2

[{*.kt, *.kts}]
[{*.kt,*.kts}]
max_line_length = 140
ij_continuation_indent_size = 4
ij_kotlin_align_in_columns_case_branch = false
Expand Down
6 changes: 2 additions & 4 deletions detekt-compose.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# https://github.com/twitter/compose-rules/blob/main/rules/detekt/src/main/resources/config/config.yml
TwitterCompose:
# https://github.com/mrmans0n/compose-rules/blob/main/rules/detekt/src/main/resources/config/config.yml
Compose:
CompositionLocalAllowlist:
active: true
CompositionLocalNaming:
active: true
ContentEmitterReturningValues:
active: true
ModifierComposable:
Expand Down
5 changes: 3 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,9 @@ plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.
plugin-detekt = { module = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin", version.ref = "detekt" }
plugin-android = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }

# https://github.com/twitter/compose-rules/releases
detekt-compose = { module = "com.twitter.compose.rules:detekt", version = "0.0.26" }
# https://github.com/mrmans0n/compose-rules/releases
# https://mvnrepository.com/artifact/io.nlopez.compose.rules/detekt
detekt-compose = { module = "io.nlopez.compose.rules:detekt", version = "0.1.1" }
detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
detekt-core = { module = "io.gitlab.arturbosch.detekt:detekt-core", version.ref = "detekt" }

Expand Down

0 comments on commit 06fdf30

Please sign in to comment.