Skip to content

Commit bac0d88

Browse files
committed
Tweak lint configs
1 parent 0caf5ac commit bac0d88

File tree

3 files changed

+6
-14
lines changed

3 files changed

+6
-14
lines changed

build.gradle.kts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ kotlin {
2929

3030
lint {
3131
baseline = file("lint-baseline.xml")
32+
ignoreTestSources = true
33+
warningsAsErrors = true
3234
}
3335

3436
spotless {
@@ -84,7 +86,6 @@ dependencies {
8486
funcTestImplementation(libs.moshi.kotlin)
8587

8688
lintChecks(libs.androidx.gradlePluginLints)
87-
lintChecks(libs.assertk.lint)
8889
}
8990

9091
val integrationTest by tasks.registering(Test::class) {
@@ -131,14 +132,6 @@ tasks.withType<Test>().configureEach {
131132
)
132133
}
133134

134-
tasks.whenTaskAdded {
135-
if (name == "lintAnalyzeJvmTest") {
136-
// This task often fails on Windows CI devices.
137-
enabled = !providers.systemProperty("os.name").get().startsWith("Windows") &&
138-
!providers.environmentVariable("CI").isPresent
139-
}
140-
}
141-
142135
tasks.clean {
143136
val includedBuilds = gradle.includedBuilds
144137
dependsOn(includedBuilds.map { it.task(path) })

gradle/libs.versions.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jetbrains-dokka = "org.jetbrains.dokka:dokka-gradle-plugin:2.0.0"
2222
node = "com.github.node-gradle:gradle-node-plugin:7.1.0"
2323

2424
androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0-alpha03"
25-
assertk-lint = "com.jzbrooks:assertk-lint:1.4.0"
2625
# Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless.
2726
ktlint = "com.pinterest.ktlint:ktlint-cli:1.5.0"
2827

lint-baseline.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
108108
<location
109109
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
110-
line="30"
110+
line="31"
111111
column="1"/>
112112
</issue>
113113

@@ -118,7 +118,7 @@
118118
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
119119
<location
120120
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
121-
line="31"
121+
line="32"
122122
column="1"/>
123123
</issue>
124124

@@ -129,7 +129,7 @@
129129
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
130130
<location
131131
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
132-
line="32"
132+
line="33"
133133
column="1"/>
134134
</issue>
135135

@@ -140,7 +140,7 @@
140140
errorLine2="~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
141141
<location
142142
file="src/main/kotlin/com/github/jengelman/gradle/plugins/shadow/tasks/ShadowJar.kt"
143-
line="33"
143+
line="34"
144144
column="1"/>
145145
</issue>
146146

0 commit comments

Comments
 (0)