From 5764c748d88c141346835700ce51f659dc98d06d Mon Sep 17 00:00:00 2001 From: Guilherme Pimenta Date: Fri, 9 Aug 2024 08:12:48 -0300 Subject: [PATCH] chore: autoapply detekt (#20) PR: https://github.com/Topsort/topsort.kt/pull/20 --- TopsortAnalytics/build.gradle | 7 +++++++ app/build.gradle | 13 ++++++++++--- .../com/topsort/analytics/ExampleUnitTest.kt | 4 ++-- build.gradle | 19 ++++++++++--------- 4 files changed, 29 insertions(+), 14 deletions(-) diff --git a/TopsortAnalytics/build.gradle b/TopsortAnalytics/build.gradle index 473334d..2ed0774 100644 --- a/TopsortAnalytics/build.gradle +++ b/TopsortAnalytics/build.gradle @@ -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 { @@ -34,6 +37,10 @@ android { } } +tasks.withType(Detekt).configureEach { + config = files(["$projectDir/../detekt.yaml"]) +} + dependencies { implementation 'androidx.core:core-ktx:1.13.1' diff --git a/app/build.gradle b/app/build.gradle index da9503c..63dd637 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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' @@ -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' } @@ -44,6 +47,10 @@ android { } } +tasks.withType(Detekt).configureEach { + config = files(["$projectDir/../detekt.yaml"]) +} + dependencies { implementation 'androidx.core:core-ktx:1.13.1' diff --git a/app/src/test/java/com/topsort/analytics/ExampleUnitTest.kt b/app/src/test/java/com/topsort/analytics/ExampleUnitTest.kt index e16e887..ccf0b36 100644 --- a/app/src/test/java/com/topsort/analytics/ExampleUnitTest.kt +++ b/app/src/test/java/com/topsort/analytics/ExampleUnitTest.kt @@ -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). @@ -13,4 +13,4 @@ class ExampleUnitTest { fun addition_isCorrect() { assertEquals(4, 2 + 2) } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index 6af0d76..822998f 100644 --- a/build.gradle +++ b/build.gradle @@ -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' + } }