Skip to content

Commit a7aa20b

Browse files
committed
Detekt 2.0.0-alpha.0.
1 parent 8d3a4da commit a7aa20b

File tree

14 files changed

+24
-28
lines changed

14 files changed

+24
-28
lines changed

build.gradle.kts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@file:Suppress("UnstableApiUsage")
22

3-
import io.gitlab.arturbosch.detekt.Detekt
3+
import dev.detekt.gradle.Detekt
44
import org.gradle.api.tasks.testing.logging.TestLogEvent
55
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
66
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -107,16 +107,17 @@ detekt {
107107
source.from(files("src/"))
108108
config.from(files("${project.rootDir}/detekt.yml"))
109109
buildUponDefaultConfig = true
110-
allRules = true
111110
}
112111

113112
tasks.withType<Detekt>().configureEach {
114113
jvmTarget = JvmTarget.JVM_22.target
115114
reports {
115+
xml.required.set(false)
116+
sarif.required.set(false)
117+
md.required.set(false)
116118
html.outputLocation.set(file("build/reports/detekt/${project.name}.html"))
117119
}
118120
}
119121

120-
val detektFormatting = libs.plugin.detektFormatting.get()
121122

122-
dependencies.add("detektPlugins", detektFormatting)
123+
dependencies.add("detektPlugins", libs.plugin.detektKtlintWrapper.get())

detekt.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,24 @@ complexity:
66
LargeClass:
77
excludes: ["**/test/**","**/functionalTest/**"]
88

9-
formatting:
10-
MaximumLineLength:
9+
ktlint:
10+
ChainMethodContinuation:
1111
active: false
12-
TrailingCommaOnCallSite:
12+
ClassSignature:
1313
active: false
14-
TrailingCommaOnDeclarationSite:
14+
FunctionExpressionBody:
1515
active: false
1616
FunctionSignature:
1717
active: false
18-
19-
naming:
20-
FunctionMaxLength:
18+
MultilineExpressionWrapping:
19+
active: false
20+
MaximumLineLength:
21+
active: false
22+
StringTemplateIndent:
23+
active: false
24+
TrailingCommaOnCallSite:
25+
active: false
26+
TrailingCommaOnDeclarationSite:
2127
active: false
2228

2329
style:

gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
kotlin = "2.2.20"
33
binaryCompabilityValidator = "0.18.0"
44
agp = "8.13.0"
5-
detekt = "1.23.7"
5+
detekt = "2.0.0-alpha.0"
66
mavenPublish = "0.34.0"
77
testParameterInjector = "1.18"
88
toolchainsResolver = "0.10.0"
99

1010
[libraries]
11-
plugin-detektFormatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }
11+
plugin-detektKtlintWrapper = { module = "dev.detekt:detekt-rules-ktlint-wrapper", version.ref = "detekt"}
1212

1313
agp-build-gradle = { module = "com.android.tools.build:gradle", version.ref = "agp" }
1414
agp-build-api = { module = "com.android.tools.build:gradle-api", version.ref = "agp" }
@@ -18,5 +18,5 @@ testParameterInjector = { group = "com.google.testparameterinjector", name = "te
1818
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
1919
kotlin-gradle-samWithReceiver = { id = "org.jetbrains.kotlin.plugin.sam.with.receiver", version.ref = "kotlin" }
2020
binaryCompatibilityValidator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binaryCompabilityValidator" }
21-
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
21+
detekt = { id = "dev.detekt", version.ref = "detekt" }
2222
mavenPublish = { id = "com.vanniktech.maven.publish", version.ref = "mavenPublish" }

src/functionalTest/kotlin/io/github/reactivecircus/appversioning/AppVersioningPluginIntegrationTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import kotlin.test.assertTrue
2323

2424
@RunWith(TestParameterInjector::class)
2525
class AppVersioningPluginIntegrationTest {
26-
2726
@get:Rule
2827
val fixtureDir = TemporaryFolder()
2928

src/functionalTest/kotlin/io/github/reactivecircus/appversioning/tasks/GenerateAppVersionInfoTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import kotlin.test.assertEquals
1414
import kotlin.test.assertTrue
1515

1616
class GenerateAppVersionInfoTest {
17-
1817
@get:Rule
1918
val fixtureDir = TemporaryFolder()
2019

src/functionalTest/kotlin/io/github/reactivecircus/appversioning/tasks/PrintAppVersionInfoTest.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import kotlin.test.assertEquals
1313
import kotlin.test.assertTrue
1414

1515
class PrintAppVersionInfoTest {
16-
1716
@get:Rule
1817
val fixtureDir = TemporaryFolder()
1918

src/main/kotlin/io/github/reactivecircus/appversioning/AppVersioningExtension.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import org.gradle.api.provider.ProviderFactory
1010
*/
1111
@Suppress("unused")
1212
open class AppVersioningExtension internal constructor(objects: ObjectFactory) {
13-
1413
/**
1514
* Whether to enable the plugin.
1615
*

src/main/kotlin/io/github/reactivecircus/appversioning/AppVersioningPlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import java.util.concurrent.atomic.AtomicBoolean
1717
* A plugin that generates and sets the version code and version name for an Android app using the latest git tag.
1818
*/
1919
class AppVersioningPlugin : Plugin<Project> {
20-
2120
override fun apply(project: Project) {
2221
val androidAppPluginApplied = AtomicBoolean(false)
2322
val pluginDisabled = AtomicBoolean(false)

src/main/kotlin/io/github/reactivecircus/appversioning/internal/GitClient.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import java.io.File
44
import java.util.concurrent.TimeUnit
55

66
class GitClient private constructor(private val projectDir: File) {
7-
87
fun listLocalTags(): List<String> {
98
return listOf("git", "tag", "--list").execute(projectDir).lines()
109
}
@@ -68,7 +67,6 @@ class GitClient private constructor(private val projectDir: File) {
6867
}
6968

7069
companion object {
71-
7270
fun initialize(projectDir: File): GitClient {
7371
return GitClient(projectDir).apply {
7472
listOf("git", "init").execute(projectDir)

src/main/kotlin/io/github/reactivecircus/appversioning/tasks/GenerateAppVersionInfo.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import javax.inject.Inject
4141
abstract class GenerateAppVersionInfo @Inject constructor(
4242
private val workerExecutor: WorkerExecutor
4343
) : DefaultTask() {
44-
4544
@get:Optional
4645
@get:InputDirectory
4746
@get:PathSensitive(PathSensitivity.RELATIVE)
@@ -139,7 +138,6 @@ private interface GenerateAppVersionInfoWorkParameters : WorkParameters {
139138
private abstract class GenerateAppVersionInfoWorkAction @Inject constructor(
140139
private val providers: ProviderFactory
141140
) : WorkAction<GenerateAppVersionInfoWorkParameters> {
142-
143141
private val logger = Logging.getLogger(GenerateAppVersionInfo::class.java)
144142

145143
@Suppress("LongMethod")
@@ -164,7 +162,9 @@ private abstract class GenerateAppVersionInfoWorkAction @Inject constructor(
164162

165163
val gitClient = GitClient.open(rootProjectDirectory.get().asFile)
166164

167-
val gitTag: GitTag = gitClient.describeLatestTag(tagFilter.orNull)?.toGitTag() ?: if (fetchTagsWhenNoneExistsLocally.get()) {
165+
val gitTag: GitTag = gitClient.describeLatestTag(
166+
tagFilter.orNull
167+
)?.toGitTag() ?: if (fetchTagsWhenNoneExistsLocally.get()) {
168168
val tagsList = gitClient.listLocalTags()
169169
if (tagsList.isEmpty()) {
170170
logger.warn("No git tags found. Fetching tags from remote.")

0 commit comments

Comments
 (0)