Skip to content

Commit bd4de6d

Browse files
Updating KtLint (#440)
1 parent 6f92ab9 commit bd4de6d

File tree

61 files changed

+349
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+349
-303
lines changed

.editorconfig

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# .editorconfig
2+
root = true
3+
4+
[*.{kt,kts}]
5+
end_of_line = lf
6+
ij_kotlin_packages_to_use_import_on_demand = true
7+
ij_kotlin_allow_trailing_comma = true
8+
ij_kotlin_allow_trailing_comma_on_call_site = true
9+
ij_kotlin_imports_layout = *
10+
ij_kotlin_indent_before_arrow_on_new_line = false
11+
ij_kotlin_line_break_after_multiline_when_entry = true
12+
indent_size = 4
13+
indent_style = space
14+
insert_final_newline = true
15+
ktlint_argument_list_wrapping_ignore_when_parameter_count_greater_or_equal_than = 8
16+
ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = 4
17+
ktlint_code_style = android_studio
18+
ktlint_enum_entry_name_casing = upper_or_camel_cases
19+
ktlint_function_naming_ignore_when_annotated_with = Composable
20+
ktlint_function_signature_body_expression_wrapping = default
21+
ktlint_ignore_back_ticked_identifier = false
22+
max_line_length = 140
23+
parameter-list-wrapping = true

.github/workflows/build_mac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
restore-keys: |
3434
${{ runner.os }}-gradle-
3535
- name: Build
36-
run: ./gradlew build --no-daemon --stacktrace --build-cache
36+
run: ./gradlew ktlintCheck build --no-daemon --stacktrace --build-cache
3737
env:
3838
S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}
3939
S3_BUILD_CACHE_BUCKET_NAME: ${{ secrets.S3_BUILD_CACHE_BUCKET_NAME }}

.github/workflows/build_win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
restore-keys: |
4040
${{ runner.os }}-gradle-
4141
- name: Build
42-
run: ./gradlew mingwX64Test --no-daemon --stacktrace --build-cache
42+
run: ./gradlew ktlintCheck mingwX64Test --no-daemon --stacktrace --build-cache
4343
env:
4444
S3_BUILD_CACHE_AWS_REGION: ${{ secrets.S3_BUILD_CACHE_AWS_REGION }}
4545
S3_BUILD_CACHE_BUCKET_NAME: ${{ secrets.S3_BUILD_CACHE_BUCKET_NAME }}

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.gradle.kts

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,9 @@ plugins {
2323
alias(libs.plugins.dokka) apply false
2424
alias(libs.plugins.touchlab.docusaurus.template)
2525
alias(libs.plugins.android.library) apply false
26-
26+
id("org.jlleitschuh.gradle.ktlint") version "12.2.0" apply false
2727
}
28+
2829
apiValidation {
2930
nonPublicMarkers.add("co.touchlab.kermit.ExperimentalKermitApi")
3031
// ignoredProjects.addAll(listOf("kermit-gradle-plugin", "kermit-ir-plugin", "kermit-ir-plugin-native"))
@@ -46,10 +47,29 @@ allprojects {
4647

4748
allprojects {
4849
apply(plugin = "org.jetbrains.dokka")
50+
4951
repositories {
5052
mavenCentral()
5153
google()
5254
}
5355
tasks.getByName("dokkaHtml").dependsOn(":kermit:transformIosMainCInteropDependenciesMetadataForIde")
5456
}
5557

58+
subprojects {
59+
apply(plugin = "org.jlleitschuh.gradle.ktlint")
60+
61+
configure<org.jlleitschuh.gradle.ktlint.KtlintExtension> {
62+
version.set("1.4.0")
63+
enableExperimentalRules.set(true)
64+
verbose.set(true)
65+
filter {
66+
exclude { it.file.path.contains("build/") }
67+
}
68+
}
69+
70+
afterEvaluate {
71+
tasks.named("check") {
72+
dependsOn(tasks.getByName("ktlintCheck"))
73+
}
74+
}
75+
}

extensions/kermit-bugsnag/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ android {
5959

6060
tasks.withType<KotlinCompile> {
6161
kotlinOptions.jvmTarget = "1.8"
62-
}
62+
}

extensions/kermit-bugsnag/src/commonMain/kotlin/co/touchlab/kermit/bugsnag/BugsnagLogWriter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import co.touchlab.kermit.Tag
2525
class BugsnagLogWriter(
2626
private val minSeverity: Severity = Severity.Info,
2727
private val minCrashSeverity: Severity? = Severity.Warn,
28-
private val messageStringFormatter: MessageStringFormatter = DefaultFormatter
28+
private val messageStringFormatter: MessageStringFormatter = DefaultFormatter,
2929
) : LogWriter() {
3030

3131
private val bugsnagCalls: BugsnagCalls = BugsnagCallsActual()
@@ -42,7 +42,7 @@ class BugsnagLogWriter(
4242

4343
override fun log(severity: Severity, message: String, tag: String, throwable: Throwable?) {
4444
bugsnagCalls.logMessage(
45-
messageStringFormatter.formatMessage(severity, Tag(tag), Message(message))
45+
messageStringFormatter.formatMessage(severity, Tag(tag), Message(message)),
4646
)
4747
if (throwable != null && minCrashSeverity != null && severity >= minCrashSeverity) {
4848
bugsnagCalls.sendHandledException(throwable)

extensions/kermit-crashlytics/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@ android {
5959

6060
tasks.withType<KotlinCompile> {
6161
kotlinOptions.jvmTarget = "1.8"
62-
}
62+
}

extensions/kermit-crashlytics/src/commonMain/kotlin/co/touchlab/kermit/crashlytics/CrashlyticsLogWriter.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import co.touchlab.kermit.Tag
2525
class CrashlyticsLogWriter(
2626
private val minSeverity: Severity = Severity.Info,
2727
private val minCrashSeverity: Severity? = Severity.Warn,
28-
private val messageStringFormatter: MessageStringFormatter = DefaultFormatter
28+
private val messageStringFormatter: MessageStringFormatter = DefaultFormatter,
2929
) : LogWriter() {
3030

3131
private val crashlyticsCalls: CrashlyticsCalls = CrashlyticsCallsActual()
@@ -42,7 +42,7 @@ class CrashlyticsLogWriter(
4242

4343
override fun log(severity: Severity, message: String, tag: String, throwable: Throwable?) {
4444
crashlyticsCalls.logMessage(
45-
messageStringFormatter.formatMessage(severity, Tag(tag), Message(message))
45+
messageStringFormatter.formatMessage(severity, Tag(tag), Message(message)),
4646
)
4747
if (throwable != null && minCrashSeverity != null && severity >= minCrashSeverity) {
4848
crashlyticsCalls.sendHandledException(throwable)

extensions/kermit-koin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ android {
7373

7474
tasks.withType<KotlinCompile> {
7575
kotlinOptions.jvmTarget = "1.8"
76-
}
76+
}

0 commit comments

Comments
 (0)