Merge pull request #270 from tecchu11/feature/fix-detekt-conf

fix detekt conf
tecchu11 · Nov 13, 2023 · e207b5f · e207b5f
2 parents e7be396 + 3720fb7
commit e207b5f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -8,7 +8,7 @@ repositories {
 
 dependencies {
     val kotlin = "1.9.20"
-    val detekt = "1.23.2"
+    val detekt = "1.23.3"
     val springDependency = "1.1.3"
     val springBoot = "3.1.5"
     val jib = "3.4.0"

diff --git a/buildSrc/src/main/kotlin/base.kotlin-analysis.gradle.kts b/buildSrc/src/main/kotlin/base.kotlin-analysis.gradle.kts
@@ -1,4 +1,5 @@
 import io.gitlab.arturbosch.detekt.Detekt
+import io.gitlab.arturbosch.detekt.getSupportedKotlinVersion
 import io.gitlab.arturbosch.detekt.report.ReportMergeTask
 
 plugins {
@@ -9,10 +10,11 @@ dependencies {
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:${detekt.toolVersion}")
 }
 
+// Uncomment the following to specify the version of kotlin as the compatible version of detekt.
 project.afterEvaluate {
     configurations["detekt"].resolutionStrategy.eachDependency {
         if (requested.group == "org.jetbrains.kotlin") {
-            useVersion("1.9.0")
+            useVersion(getSupportedKotlinVersion())
         }
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -2,4 +2,4 @@ kotlin.code.style=offical
 org.gradle.caching=true
 org.gradle.warning.mode=all
 org.gradle.parallel=true
-org.gradle.jvmargs=-Xmx1024m "-XX:MaxMetaspaceSize=512m"
+org.gradle.jvmargs=-XX:MaxRAMPercentage=80