Skip to content

Commit

Permalink
chore: autoapply detekt (#20)
Browse files Browse the repository at this point in the history
PR: #20
  • Loading branch information
anonvt authored Aug 9, 2024
1 parent 00c453c commit 5764c74
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 14 deletions.
7 changes: 7 additions & 0 deletions TopsortAnalytics/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import io.gitlab.arturbosch.detekt.Detekt

plugins {
id 'com.android.library'
id 'org.jetbrains.kotlin.android'
id 'io.gitlab.arturbosch.detekt'
}

android {
Expand Down Expand Up @@ -34,6 +37,10 @@ android {
}
}

tasks.withType(Detekt).configureEach {
config = files(["$projectDir/../detekt.yaml"])
}

dependencies {

implementation 'androidx.core:core-ktx:1.13.1'
Expand Down
13 changes: 10 additions & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import io.gitlab.arturbosch.detekt.Detekt

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'io.gitlab.arturbosch.detekt'
}

def config = { k -> "\"${project.properties.get(k)}\"" }
def properties = { k -> "\"${project.properties.get(k)}\"" }

android {
namespace 'com.topsort.analytics'
Expand All @@ -21,13 +24,13 @@ android {

buildTypes {
debug {
buildConfigField 'String', 'TOKEN', config("topsort.sample.bearertoken")
buildConfigField 'String', 'TOKEN', properties("topsort.sample.bearertoken")
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}

release {
buildConfigField 'String', 'TOKEN', config("topsort.sample.bearertoken")
buildConfigField 'String', 'TOKEN', properties("topsort.sample.bearertoken")
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
Expand All @@ -44,6 +47,10 @@ android {
}
}

tasks.withType(Detekt).configureEach {
config = files(["$projectDir/../detekt.yaml"])
}

dependencies {

implementation 'androidx.core:core-ktx:1.13.1'
Expand Down
4 changes: 2 additions & 2 deletions app/src/test/java/com/topsort/analytics/ExampleUnitTest.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.topsort.analytics

import org.junit.Test
import org.junit.Assert.assertEquals
import org.junit.Test

/**
* Example local unit test, which will execute on the development machine (host).
Expand All @@ -13,4 +13,4 @@ class ExampleUnitTest {
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}
}
19 changes: 10 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ plugins {
id 'com.android.application' version '8.5.1' apply false
id 'com.android.library' version '8.5.1' apply false
id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
id 'io.gitlab.arturbosch.detekt' version '1.23.6'
id 'io.gitlab.arturbosch.detekt' version '1.23.6' apply false
}

tasks.withType(Detekt).configureEach {
jvmTarget = '1.8'
autoCorrect = true
buildUponDefaultConfig = true
config = files(["$projectDir/../detekt.yaml"])
}
tasks.withType(DetektCreateBaselineTask).configureEach {
jvmTarget = '1.8'
subprojects {
tasks.withType(Detekt).configureEach {
jvmTarget = '1.8'
autoCorrect = true
buildUponDefaultConfig = true
}
tasks.withType(DetektCreateBaselineTask).configureEach {
jvmTarget = '1.8'
}
}

0 comments on commit 5764c74

Please sign in to comment.