detektのbaselineタスク実行エラー修正

crow-misia · Apr 18, 2023 · f64c1be · f64c1be
1 parent 5cbff37
commit f64c1be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,9 @@
 # Build options
 kotlin.code.style=official
-org.gradle.jvmargs=-Xmx1536m -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
+kotlin.incremental.usePreciseJavaTracking=true
+android.enableBuildScriptClasspathCheck=false
+android.nonTransitiveRClass=true
 android.useAndroidX=true
diff --git a/location-coroutines/build.gradle.kts b/location-coroutines/build.gradle.kts
@@ -166,8 +166,10 @@ afterEvaluate {
 }
 
 detekt {
-    buildUponDefaultConfig = true // preconfigure defaults
-    allRules = false // activate all available (even unstable) rules.
+    parallel = true
+    buildUponDefaultConfig = true
+    allRules = false
+    autoCorrect = true
     config.setFrom(files("$rootDir/config/detekt.yml"))
 }
 
@@ -183,6 +185,9 @@ tasks {
             sarif.required.set(true)
         }
     }
+    withType<io.gitlab.arturbosch.detekt.DetektCreateBaselineTask>().configureEach {
+        jvmTarget = "11"
+    }
     withType<Test> {
         useJUnitPlatform()
         testLogging {

diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts
@@ -5,12 +5,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 plugins {
     id("com.android.application")
-    kotlin("android")
-    kotlin("kapt")
+    id("org.jetbrains.kotlin.android")
+    id("org.jetbrains.kotlin.kapt")
 }
 
 android {
-    buildToolsVersion = "33.0.1"
     compileSdk = 33
 
     defaultConfig {
@@ -40,7 +39,7 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = versionFor(AndroidX.compose.compiler)
     }
-    packagingOptions {
+    packaging {
         resources {
             excludes.add("/META-INF/{AL2.0,LGPL2.1}")
         }