Skip to content

Commit 78dcce9

Browse files
mlykotommlykotom
committed
Fix spotless configuration for all samples except Jetcaster
Jetcaster format is fixed in a separate PR. I'm doing it this way to prevent million of conflicts, because Jetcaster has major redesign
1 parent e4e6f0f commit 78dcce9

File tree

12 files changed

+157
-233
lines changed

12 files changed

+157
-233
lines changed

‎JetLagged/.editorconfig

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# When authoring changes in .editorconfig, run ./gradlew spotlessApply --no-daemon
2+
# Reference: https://github.com/diffplug/spotless/issues/1924
3+
[*.{kt,kts}]
4+
ktlint_code_style = android_studio
5+
ij_kotlin_allow_trailing_comma = true
6+
ij_kotlin_allow_trailing_comma_on_call_site = true
7+
max_line_length = 140 # ktlint official
8+
ktlint_function_naming_ignore_when_annotated_with = Composable, Test
9+
ktlint_standard_filename = disabled
10+
ktlint_standard_package-name = disabled
11+
ktlint_standard_property-naming = disabled
12+
ktlint_standard_backing-property-naming = disabled
13+
ktlint_standard_argument-list-wrapping=disabled
14+
ktlint_standard_parameter-list-wrapping = disabled
15+
ktlint_standard_double-colon-spacing=disabled
16+
ktlint_standard_enum-entry-name-case=disabled
17+
ktlint_standard_multiline-if-else=disabled
18+
ktlint_standard_no-empty-first-line-in-method-block = disabled
19+
ktlint_standard_package-name = disabled
20+
ktlint_standard_trailing-comma = disabled
21+
ktlint_standard_spacing-around-angle-brackets = disabled
22+
ktlint_standard_spacing-between-declarations-with-annotations = disabled
23+
ktlint_standard_spacing-between-declarations-with-comments = disabled
24+
ktlint_standard_unary-op-spacing = disabled
25+
ktlint_standard_function-expression-body = disabled
26+
ktlint_standard_value-parameter-comment = disabled
27+
ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than= unset

‎JetLagged/build.gradle.kts

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,18 @@ apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
2929
subprojects {
3030
apply(plugin = "com.diffplug.spotless")
3131
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
32-
ratchetFrom = "origin/main"
3332
kotlin {
3433
target("**/*.kt")
35-
targetExclude("**/build/**/*.kt")
36-
ktlint().editorConfigOverride(
37-
mapOf(
38-
"ktlint_code_style" to "android_studio",
39-
"ij_kotlin_allow_trailing_comma" to true,
40-
"ktlint_function_naming_ignore_when_annotated_with" to "Composable",
41-
// These rules were introduced in ktlint 0.46.0 and should not be
42-
// enabled without further discussion. They are disabled for now.
43-
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
44-
"disabled_rules" to
45-
"filename," +
46-
"annotation,annotation-spacing," +
47-
"argument-list-wrapping," +
48-
"double-colon-spacing," +
49-
"enum-entry-name-case," +
50-
"multiline-if-else," +
51-
"no-empty-first-line-in-method-block," +
52-
"package-name," +
53-
"trailing-comma," +
54-
"spacing-around-angle-brackets," +
55-
"spacing-between-declarations-with-annotations," +
56-
"spacing-between-declarations-with-comments," +
57-
"unary-op-spacing"
58-
)
59-
)
34+
targetExclude("${layout.buildDirectory}/**/*.kt")
35+
ktlint()
6036
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
6137
}
62-
format("kts") {
63-
target("**/*.kts")
64-
targetExclude("**/build/**/*.kts")
65-
// Look for the first line that doesn't have a block comment (assumed to be the license)
66-
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
67-
}
6838
kotlinGradle {
6939
target("*.gradle.kts")
40+
targetExclude("${layout.buildDirectory}/**/*.kt")
7041
ktlint()
42+
// Look for the first line that doesn't have a block comment (assumed to be the license)
43+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
7144
}
7245
}
7346
}

‎JetNews/.editorconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# When authoring changes in .editorconfig, run ./gradlew spotlessApply --no-daemon
2+
# Reference: https://github.com/diffplug/spotless/issues/1924
3+
[*.{kt,kts}]
4+
ktlint_code_style = android_studio
5+
ij_kotlin_allow_trailing_comma = true
6+
ij_kotlin_allow_trailing_comma_on_call_site = true
7+
max_line_length = 140 # ktlint official
8+
ktlint_function_naming_ignore_when_annotated_with = Composable, Test
9+
ktlint_standard_filename = disabled
10+
ktlint_standard_package-name = disabled
11+
ktlint_standard_property-naming = disabled
12+
ktlint_standard_backing-property-naming = disabled
13+
ktlint_standard_argument-list-wrapping=disabled
14+
ktlint_standard_parameter-list-wrapping = disabled
15+
ktlint_standard_double-colon-spacing=disabled
16+
ktlint_standard_enum-entry-name-case=disabled
17+
ktlint_standard_multiline-if-else=disabled
18+
ktlint_standard_no-empty-first-line-in-method-block = disabled
19+
ktlint_standard_package-name = disabled
20+
ktlint_standard_trailing-comma = disabled
21+
ktlint_standard_spacing-around-angle-brackets = disabled
22+
ktlint_standard_spacing-between-declarations-with-annotations = disabled
23+
ktlint_standard_spacing-between-declarations-with-comments = disabled
24+
ktlint_standard_unary-op-spacing = disabled
25+
ktlint_standard_function-expression-body = disabled
26+
ktlint_standard_value-parameter-comment = disabled

‎JetNews/build.gradle.kts

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,18 @@ apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
2929
subprojects {
3030
apply(plugin = "com.diffplug.spotless")
3131
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
32-
ratchetFrom = "origin/main"
3332
kotlin {
3433
target("**/*.kt")
35-
targetExclude("**/build/**/*.kt")
36-
ktlint().editorConfigOverride(
37-
mapOf(
38-
"ktlint_code_style" to "android_studio",
39-
"ij_kotlin_allow_trailing_comma" to true,
40-
"ktlint_function_naming_ignore_when_annotated_with" to "Composable",
41-
// These rules were introduced in ktlint 0.46.0 and should not be
42-
// enabled without further discussion. They are disabled for now.
43-
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
44-
"disabled_rules" to
45-
"filename," +
46-
"annotation,annotation-spacing," +
47-
"argument-list-wrapping," +
48-
"double-colon-spacing," +
49-
"enum-entry-name-case," +
50-
"multiline-if-else," +
51-
"no-empty-first-line-in-method-block," +
52-
"package-name," +
53-
"trailing-comma," +
54-
"spacing-around-angle-brackets," +
55-
"spacing-between-declarations-with-annotations," +
56-
"spacing-between-declarations-with-comments," +
57-
"unary-op-spacing"
58-
)
59-
)
34+
targetExclude("${layout.buildDirectory}/**/*.kt")
35+
ktlint()
6036
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
6137
}
62-
format("kts") {
63-
target("**/*.kts")
64-
targetExclude("**/build/**/*.kts")
65-
// Look for the first line that doesn't have a block comment (assumed to be the license)
66-
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
67-
}
6838
kotlinGradle {
6939
target("*.gradle.kts")
40+
targetExclude("${layout.buildDirectory}/**/*.kt")
7041
ktlint()
42+
// Look for the first line that doesn't have a block comment (assumed to be the license)
43+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
7144
}
7245
}
7346
}

‎Jetchat/.editorconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# When authoring changes in .editorconfig, run ./gradlew spotlessApply --no-daemon
2+
# Reference: https://github.com/diffplug/spotless/issues/1924
3+
[*.{kt,kts}]
4+
ktlint_code_style = android_studio
5+
ij_kotlin_allow_trailing_comma = true
6+
ij_kotlin_allow_trailing_comma_on_call_site = true
7+
max_line_length = 140 # ktlint official
8+
ktlint_function_naming_ignore_when_annotated_with = Composable, Test
9+
ktlint_standard_filename = disabled
10+
ktlint_standard_package-name = disabled
11+
ktlint_standard_property-naming = disabled
12+
ktlint_standard_backing-property-naming = disabled
13+
ktlint_standard_argument-list-wrapping = disabled
14+
ktlint_standard_parameter-list-wrapping = disabled
15+
ktlint_standard_double-colon-spacing = disabled
16+
ktlint_standard_enum-entry-name-case = disabled
17+
ktlint_standard_multiline-if-else = disabled
18+
ktlint_standard_no-empty-first-line-in-method-block = disabled
19+
ktlint_standard_package-name = disabled
20+
ktlint_standard_trailing-comma = disabled
21+
ktlint_standard_spacing-around-angle-brackets = disabled
22+
ktlint_standard_spacing-between-declarations-with-annotations = disabled
23+
ktlint_standard_spacing-between-declarations-with-comments = disabled
24+
ktlint_standard_unary-op-spacing = disabled
25+
ktlint_standard_function-expression-body = disabled
26+
ktlint_standard_value-parameter-comment = disabled

‎Jetchat/build.gradle.kts

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,18 @@ apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
2929
subprojects {
3030
apply(plugin = "com.diffplug.spotless")
3131
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
32-
ratchetFrom = "origin/main"
3332
kotlin {
3433
target("**/*.kt")
35-
targetExclude("**/build/**/*.kt")
36-
ktlint().editorConfigOverride(
37-
mapOf(
38-
"ktlint_code_style" to "android_studio",
39-
"ij_kotlin_allow_trailing_comma" to true,
40-
"ktlint_function_naming_ignore_when_annotated_with" to "Composable",
41-
// These rules were introduced in ktlint 0.46.0 and should not be
42-
// enabled without further discussion. They are disabled for now.
43-
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
44-
"disabled_rules" to
45-
"filename," +
46-
"annotation,annotation-spacing," +
47-
"argument-list-wrapping," +
48-
"double-colon-spacing," +
49-
"enum-entry-name-case," +
50-
"multiline-if-else," +
51-
"no-empty-first-line-in-method-block," +
52-
"package-name," +
53-
"trailing-comma," +
54-
"spacing-around-angle-brackets," +
55-
"spacing-between-declarations-with-annotations," +
56-
"spacing-between-declarations-with-comments," +
57-
"unary-op-spacing"
58-
)
59-
)
34+
targetExclude("${layout.buildDirectory}/**/*.kt")
35+
ktlint()
6036
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
6137
}
62-
format("kts") {
63-
target("**/*.kts")
64-
targetExclude("**/build/**/*.kts")
65-
// Look for the first line that doesn't have a block comment (assumed to be the license)
66-
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
67-
}
6838
kotlinGradle {
6939
target("*.gradle.kts")
40+
targetExclude("${layout.buildDirectory}/**/*.kt")
7041
ktlint()
42+
// Look for the first line that doesn't have a block comment (assumed to be the license)
43+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
7144
}
7245
}
7346
}

‎Jetsnack/.editorconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# When authoring changes in .editorconfig, run ./gradlew spotlessApply --no-daemon
2+
# Reference: https://github.com/diffplug/spotless/issues/1924
3+
[*.{kt,kts}]
4+
ktlint_code_style = android_studio
5+
ij_kotlin_allow_trailing_comma = true
6+
ij_kotlin_allow_trailing_comma_on_call_site = true
7+
max_line_length = 140 # ktlint official
8+
ktlint_function_naming_ignore_when_annotated_with = Composable, Test
9+
ktlint_standard_filename = disabled
10+
ktlint_standard_package-name = disabled
11+
ktlint_standard_property-naming = disabled
12+
ktlint_standard_backing-property-naming = disabled
13+
ktlint_standard_argument-list-wrapping=disabled
14+
ktlint_standard_parameter-list-wrapping = disabled
15+
ktlint_standard_double-colon-spacing=disabled
16+
ktlint_standard_enum-entry-name-case=disabled
17+
ktlint_standard_multiline-if-else=disabled
18+
ktlint_standard_no-empty-first-line-in-method-block = disabled
19+
ktlint_standard_package-name = disabled
20+
ktlint_standard_trailing-comma = disabled
21+
ktlint_standard_spacing-around-angle-brackets = disabled
22+
ktlint_standard_spacing-between-declarations-with-annotations = disabled
23+
ktlint_standard_spacing-between-declarations-with-comments = disabled
24+
ktlint_standard_unary-op-spacing = disabled
25+
ktlint_standard_function-expression-body = disabled
26+
ktlint_standard_value-parameter-comment = disabled

‎Jetsnack/build.gradle.kts

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,18 @@ apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
2929
subprojects {
3030
apply(plugin = "com.diffplug.spotless")
3131
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
32-
ratchetFrom = "origin/main"
3332
kotlin {
3433
target("**/*.kt")
35-
targetExclude("**/build/**/*.kt")
36-
ktlint().editorConfigOverride(
37-
mapOf(
38-
"ktlint_code_style" to "android_studio",
39-
"ij_kotlin_allow_trailing_comma" to true,
40-
"ktlint_function_naming_ignore_when_annotated_with" to "Composable",
41-
// These rules were introduced in ktlint 0.46.0 and should not be
42-
// enabled without further discussion. They are disabled for now.
43-
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
44-
"disabled_rules" to
45-
"filename," +
46-
"annotation,annotation-spacing," +
47-
"argument-list-wrapping," +
48-
"double-colon-spacing," +
49-
"enum-entry-name-case," +
50-
"multiline-if-else," +
51-
"no-empty-first-line-in-method-block," +
52-
"package-name," +
53-
"trailing-comma," +
54-
"spacing-around-angle-brackets," +
55-
"spacing-between-declarations-with-annotations," +
56-
"spacing-between-declarations-with-comments," +
57-
"unary-op-spacing"
58-
)
59-
)
34+
targetExclude("${layout.buildDirectory}/**/*.kt")
35+
ktlint()
6036
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
6137
}
62-
format("kts") {
63-
target("**/*.kts")
64-
targetExclude("**/build/**/*.kts")
65-
// Look for the first line that doesn't have a block comment (assumed to be the license)
66-
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
67-
}
6838
kotlinGradle {
6939
target("*.gradle.kts")
40+
targetExclude("${layout.buildDirectory}/**/*.kt")
7041
ktlint()
42+
// Look for the first line that doesn't have a block comment (assumed to be the license)
43+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
7144
}
7245
}
7346
}

‎Reply/.editorconfig

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# When authoring changes in .editorconfig, run ./gradlew spotlessApply --no-daemon
2+
# Reference: https://github.com/diffplug/spotless/issues/1924
3+
[*.{kt,kts}]
4+
ktlint_code_style = android_studio
5+
ij_kotlin_allow_trailing_comma = true
6+
ij_kotlin_allow_trailing_comma_on_call_site = true
7+
max_line_length = 140 # ktlint official
8+
ktlint_function_naming_ignore_when_annotated_with = Composable, Test
9+
ktlint_standard_filename = disabled
10+
ktlint_standard_package-name = disabled
11+
ktlint_standard_property-naming = disabled
12+
ktlint_standard_backing-property-naming = disabled
13+
ktlint_standard_argument-list-wrapping=disabled
14+
ktlint_standard_parameter-list-wrapping = disabled
15+
ktlint_standard_double-colon-spacing=disabled
16+
ktlint_standard_enum-entry-name-case=disabled
17+
ktlint_standard_multiline-if-else=disabled
18+
ktlint_standard_no-empty-first-line-in-method-block = disabled
19+
ktlint_standard_package-name = disabled
20+
ktlint_standard_trailing-comma = disabled
21+
ktlint_standard_spacing-around-angle-brackets = disabled
22+
ktlint_standard_spacing-between-declarations-with-annotations = disabled
23+
ktlint_standard_spacing-between-declarations-with-comments = disabled
24+
ktlint_standard_unary-op-spacing = disabled
25+
ktlint_standard_function-expression-body = disabled
26+
ktlint_standard_value-parameter-comment = disabled

‎Reply/build.gradle.kts

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,18 @@ apply("${project.rootDir}/buildscripts/toml-updater-config.gradle")
2929
subprojects {
3030
apply(plugin = "com.diffplug.spotless")
3131
configure<com.diffplug.gradle.spotless.SpotlessExtension> {
32-
ratchetFrom = "origin/main"
3332
kotlin {
3433
target("**/*.kt")
35-
targetExclude("**/build/**/*.kt")
36-
ktlint().editorConfigOverride(
37-
mapOf(
38-
"ktlint_code_style" to "android_studio",
39-
"ij_kotlin_allow_trailing_comma" to true,
40-
"ktlint_function_naming_ignore_when_annotated_with" to "Composable",
41-
// These rules were introduced in ktlint 0.46.0 and should not be
42-
// enabled without further discussion. They are disabled for now.
43-
// See: https://github.com/pinterest/ktlint/releases/tag/0.46.0
44-
"disabled_rules" to
45-
"filename," +
46-
"annotation,annotation-spacing," +
47-
"argument-list-wrapping," +
48-
"double-colon-spacing," +
49-
"enum-entry-name-case," +
50-
"multiline-if-else," +
51-
"no-empty-first-line-in-method-block," +
52-
"package-name," +
53-
"trailing-comma," +
54-
"spacing-around-angle-brackets," +
55-
"spacing-between-declarations-with-annotations," +
56-
"spacing-between-declarations-with-comments," +
57-
"unary-op-spacing"
58-
)
59-
)
34+
targetExclude("${layout.buildDirectory}/**/*.kt")
35+
ktlint()
6036
licenseHeaderFile(rootProject.file("spotless/copyright.kt"))
6137
}
62-
format("kts") {
63-
target("**/*.kts")
64-
targetExclude("**/build/**/*.kts")
65-
// Look for the first line that doesn't have a block comment (assumed to be the license)
66-
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
67-
}
6838
kotlinGradle {
6939
target("*.gradle.kts")
40+
targetExclude("${layout.buildDirectory}/**/*.kt")
7041
ktlint()
42+
// Look for the first line that doesn't have a block comment (assumed to be the license)
43+
licenseHeaderFile(rootProject.file("spotless/copyright.kt"), "(^(?![\\/ ]\\*).*$)")
7144
}
7245
}
7346
}

‎scripts/format.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424

2525
set -xe
2626

27-
./scripts/gradlew_recursive.sh --init-script buildscripts/init.gradle.kts spotlessApply
27+
./scripts/gradlew_recursive.sh spotlessApply "$@"

0 commit comments

Comments
 (0)