Merge branch 'sourceplusplus:master' into feature/issue-1021/hide-inactive-endpoints

chess-equality · web-flow · commit 0611b5f24125 · 2023-07-31T08:19:09.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -87,7 +87,7 @@ dependencies {
     kapt("io.vertx:vertx-codegen:$vertxVersion:processor")
     compileOnly("io.vertx:vertx-codegen:$vertxVersion")
 
-    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.0")
+    detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1")
 }
 
 tasks.withType<JavaCompile> {
diff --git a/settings.gradle b/settings.gradle
@@ -5,7 +5,7 @@ pluginManagement {
         id 'org.jetbrains.kotlin.kapt' version kotlinVersion apply false
         id 'org.jetbrains.kotlin.plugin.noarg' version kotlinVersion apply false
         id 'com.diffplug.spotless' version '6.20.0' apply false
-        id 'io.gitlab.arturbosch.detekt' version "1.23.0" apply false
+        id 'io.gitlab.arturbosch.detekt' version "1.23.1" apply false
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ dependencies {`
`87`	`87`	`kapt("io.vertx:vertx-codegen:$vertxVersion:processor")`
`88`	`88`	`compileOnly("io.vertx:vertx-codegen:$vertxVersion")`
`89`	`89`
`90`		`- detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.0")`
	`90`	`+ detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.1")`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`tasks.withType<JavaCompile> {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ pluginManagement {`
`5`	`5`	`id 'org.jetbrains.kotlin.kapt' version kotlinVersion apply false`
`6`	`6`	`id 'org.jetbrains.kotlin.plugin.noarg' version kotlinVersion apply false`
`7`	`7`	`id 'com.diffplug.spotless' version '6.20.0' apply false`
`8`		`- id 'io.gitlab.arturbosch.detekt' version "1.23.0" apply false`
	`8`	`+ id 'io.gitlab.arturbosch.detekt' version "1.23.1" apply false`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`