Merge branch 'main' into dependabot/gradle/org.jetbrains.kotlin.jvm-1…

….9.20
JetBrains · Nov 9, 2023 · 1cebb12 · 1cebb12
2 parents 84be3b8 + a20b953
commit 1cebb12
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/detekt.yml b/.github/workflows/detekt.yml
@@ -34,7 +34,7 @@ jobs:
       - name: "set-up-detekt"
         uses: peter-murray/setup-detekt@v2
         with:
-          detekt_version: 1.23.1
+          detekt_version: 1.23.3
       # Runs detekt on changed files
       - name: "run-detekt"
         run: |
@@ -45,7 +45,7 @@ jobs:
           fi
           
           echo "Running detekt check..."
-          DETEKT_ISSUES=$(detekt-cli --build-upon-default-config --config detekt/detekt-config.yml --plugins detekt/detekt-formatting-1.23.1.jar --input $CHANGED_FILES)
+          DETEKT_ISSUES=$(detekt-cli --build-upon-default-config --config detekt/detekt-config.yml --plugins detekt/detekt-formatting-1.23.3.jar --input $CHANGED_FILES)
           if [ -n "$DETEKT_ISSUES" ]; then
             echo "***********************************************"
             echo "$DETEKT_ISSUES"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ val reportMerge by tasks.registering(ReportMergeTask::class) {
 
 subprojects {
     dependencies {
-        detektPlugins("io.gitlab.arturbosch.detekt", "detekt-formatting", "1.23.1")
+        detektPlugins("io.gitlab.arturbosch.detekt", "detekt-formatting", "1.23.3")
     }
     tasks.withType<Detekt>().configureEach detekt@{
         finalizedBy(reportMerge)

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     gradleApi()
     implementation("org.jetbrains.kotlin.jvm", "org.jetbrains.kotlin.jvm.gradle.plugin", "1.9.20")
     implementation("com.avast.gradle", "gradle-docker-compose-plugin", "0.17.4")
-    implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.1")
+    implementation("io.gitlab.arturbosch.detekt", "detekt-gradle-plugin", "1.23.3")
 }
 
 plugins {

diff --git a/detekt/detekt-formatting-1.23.1.jar → detekt/detekt-formatting-1.23.3.jar b/detekt/detekt-formatting-1.23.1.jar → detekt/detekt-formatting-1.23.3.jar
diff --git a/samples/exposed-ktor/build.gradle.kts b/samples/exposed-ktor/build.gradle.kts
@@ -6,7 +6,7 @@ val h2Version: String by project
 
 plugins {
     kotlin("jvm") version "1.9.20"
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
+    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.20"
     id("io.ktor.plugin") version "2.3.4"
 }
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -16,7 +16,7 @@ include("exposed-json")
 pluginManagement {
     plugins {
         id("org.jetbrains.kotlin.jvm") version "1.9.20"
-        id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
+        id("org.jetbrains.kotlin.plugin.serialization") version "1.9.20"
     }
 }