From 394558d63401b20522ede04cf1c6a4273bdc51d0 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Tue, 4 Oct 2022 00:14:13 +0530 Subject: [PATCH] fix(ci): run Detekt separately --- .github/workflows/ci.yml | 6 ++++++ .../src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt | 7 ------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b548013..8d909649 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,12 @@ jobs: arguments: check -PslimTests gradle-home-cache-cleanup: true + - name: Run Detekt + uses: gradle/gradle-build-action@v2.3.2 + with: + arguments: detektMain + gradle-home-cache-cleanup: true + - name: (Fail-only) Upload test report if: failure() uses: actions/upload-artifact@v3.1.0 diff --git a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt index e03f78ae..65e856a1 100644 --- a/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt +++ b/build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt @@ -4,7 +4,6 @@ import io.gitlab.arturbosch.detekt.DetektPlugin import io.gitlab.arturbosch.detekt.extensions.DetektExtension import org.gradle.api.Project import org.gradle.kotlin.dsl.configure -import org.gradle.language.base.plugins.LifecycleBasePlugin object Detekt { private const val TWITTER_RULES_VERSION = "0.0.18" @@ -22,12 +21,6 @@ object Detekt { .file("${project.name}.xml") .asFile } - project.pluginManager.withPlugin("base") { - project.tasks.named(LifecycleBasePlugin.CHECK_TASK_NAME).configure { - val task = project.tasks.findByPath("detektMain") ?: project.tasks.findByPath("detekt") - if (task != null) dependsOn(task) - } - } project.dependencies.add( "detektPlugins", "com.twitter.compose.rules:detekt:$TWITTER_RULES_VERSION",