Skip to content

Commit

Permalink
Merge branch 'main' into 3.x
Browse files Browse the repository at this point in the history
* main:
  Update ktlint to 1.0.0. (#1882)
  Fix typo in docs (#1881)
  Bump okio from 3.5.0 to 3.6.0 (#1879)
  Bump com.diffplug.spotless from 6.21.0 to 6.22.0 (#1877)
  Bump com.android.tools.build:gradle from 8.1.1 to 8.1.2 (#1875)
  • Loading branch information
colinrtwhite committed Oct 3, 2023
2 parents fe9b739 + d33aa80 commit 8086790
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 8 deletions.
21 changes: 18 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,30 @@ ij_kotlin_allow_trailing_comma_on_call_site=true
ij_kotlin_imports_layout=*

ktlint_standard_annotation=disabled
ktlint_standard_blank-line-before-declaration=disabled
ktlint_standard_discouraged-comment-location=disabled
ktlint_standard_filename=disabled
ktlint_standard_function-naming=disabled
ktlint_standard_function-signature=disabled
ktlint_standard_indent=disabled
ktlint_standard_max-line-length=disabled
ktlint_standard_no-blank-line-in-list=disabled
ktlint_standard_no-empty-first-line-in-class-body=disabled
ktlint_standard_property-naming=disabled
ktlint_standard_spacing-between-declarations-with-annotations=disabled
ktlint_standard_string-template-indent=disabled
ktlint_standard_try-catch-finally-spacing=disabled

ktlint_standard_wrapping=disabled
ktlint_standard_parameter-wrapping=disabled
ktlint_standard_property-wrapping=disabled
# Wrapping
ktlint_standard_argument-list-wrapping=disabled
ktlint_standard_context-receiver-wrapping=disabled
ktlint_standard_enum-wrapping=disabled
ktlint_standard_if-else-wrapping=disabled
ktlint_standard_multiline-expression-wrapping=disabled
ktlint_standard_parameter-wrapping=disabled
ktlint_standard_parameter-list-wrapping=disabled
ktlint_standard_property-wrapping=disabled
ktlint_standard_statement-wrapping=disabled
ktlint_standard_trailing-comma-on-call-site=disabled
ktlint_standard_trailing-comma-on-declaration-site=disabled
ktlint_standard_wrapping=disabled
2 changes: 1 addition & 1 deletion coil-test/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ val imageLoader = ImageLoader.Builder(context)
Coil.setImageLoader(imageLoader)
```

This strategy works great with [Papparazzi](https://github.com/cashapp/paparazzi) to screenshot test UIs without a physical device or emulator:
This strategy works great with [Paparazzi](https://github.com/cashapp/paparazzi) to screenshot test UIs without a physical device or emulator:

```kotlin
class PaparazziTest {
Expand Down
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ androidx-compose-compiler = "1.5.3"
coroutines = "1.7.3"
jetbrains-compose = "1.5.2"
jetbrains-compose-compiler = "1.5.2"
ktlint = "0.50.0"
okio = "3.5.0"
ktlint = "1.0.0"
okio = "3.6.0"
roborazzi = "1.5.0"

[plugins]
binaryCompatibility = "org.jetbrains.kotlinx.binary-compatibility-validator:0.13.2"
dokka = "org.jetbrains.dokka:1.9.0"
spotless = "com.diffplug.spotless:6.21.0"
spotless = "com.diffplug.spotless:6.22.0"

[libraries]
gradlePlugin-android = "com.android.tools.build:gradle:8.1.1"
gradlePlugin-android = "com.android.tools.build:gradle:8.1.2"
gradlePlugin-atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.22.0"
gradlePlugin-jetbrainsCompose = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "jetbrains-compose" }
gradlePlugin-kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
Expand Down

0 comments on commit 8086790

Please sign in to comment.