ci: Fix checkers calls

bartwell · Nov 16, 2022 · d1e8a62 · d1e8a62
1 parent 860d00e
commit d1e8a62
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 30 deletions.
diff --git a/.github/workflows/ci_review_pr.yml b/.github/workflows/ci_review_pr.yml
@@ -46,10 +46,10 @@ jobs:
         run: ./gradlew clean assembleDebug
 
       - name: Run Lint
-        run: ./gradlew mewwalletui:lintDebug
+        run: ./gradlew lintDebug
 
       - name: Run Detekt
-        run: ./gradlew detektDebug
+        run: ./gradlew detektAll
 
       - name: Run Danger
         run: |

diff --git a/build.gradle b/build.gradle
@@ -12,36 +12,38 @@ plugins {
     id 'io.gitlab.arturbosch.detekt' version '1.21.0' apply false
 }
 
-def projectSource = file(projectDir)
-def configFile = files("$rootDir/config/detekt/detekt.yml")
-def baselineFile = file("$rootDir/config/detekt/baseline.xml")
-def kotlinFiles = "**/*.kt"
-def resourceFiles = "**/resources/**"
-def buildFiles = "**/build/**"
+allprojects {
+    def projectSource = file(projectDir)
+    def configFile = files("$rootDir/config/detekt/detekt.yml")
+    def baselineFile = file("$rootDir/config/detekt/baseline.xml")
+    def kotlinFiles = "**/*.kt"
+    def resourceFiles = "**/resources/**"
+    def buildFiles = "**/build/**"
 
-apply plugin: 'io.gitlab.arturbosch.detekt'
+    apply plugin: 'io.gitlab.arturbosch.detekt'
 
-tasks.register("detektAll", Detekt) {
-    def autoFix = project.hasProperty('detektAutoFix')
-    description = "Detekt build for all modules"
-    parallel = false
-    ignoreFailures = true
-    autoCorrect = autoFix
-    buildUponDefaultConfig = true
-    setSource(projectSource)
-    baseline.set(baselineFile)
-    config.setFrom(configFile)
-    include(kotlinFiles)
-    exclude(resourceFiles, buildFiles)
-    reports {
-        html.enabled = true
-        xml.enabled = false
-        txt.enabled = false
+    tasks.register("detektAll", Detekt) {
+        def autoFix = project.hasProperty('detektAutoFix')
+        description = "Detekt build for all modules"
+        parallel = false
+        ignoreFailures = true
+        autoCorrect = autoFix
+        buildUponDefaultConfig = true
+        setSource(projectSource)
+        baseline.set(baselineFile)
+        config.setFrom(configFile)
+        include(kotlinFiles)
+        exclude(resourceFiles, buildFiles)
+        reports {
+            html.enabled = false
+            xml.enabled = true
+            txt.enabled = false
+        }
     }
-}
 
-dependencies {
-    detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0"
-    detektPlugins("ru.kode:detekt-rules-compose:1.2.2")
-    detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0"
+    dependencies {
+        detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0"
+        detektPlugins("ru.kode:detekt-rules-compose:1.2.2")
+        detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.21.0"
+    }
 }
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -39,6 +39,13 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion compose_version
     }
+    lint {
+        warningsAsErrors true
+        abortOnError false
+        checkDependencies true
+        baseline file("$rootDir/config/lint/lint-baseline.xml")
+        lintConfig file("$rootDir/config/lint/lint.xml")
+    }
     packagingOptions {
         resources {
             excludes += '/META-INF/{AL2.0,LGPL2.1}'