Skip to content

Commit

Permalink
Update plugin codequalitytools to v0.24.0 (#290)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
vanniktech and renovate[bot] authored Nov 30, 2023
1 parent e51c11c commit 3bd4860
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 14 deletions.
11 changes: 7 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
[*.{kt,kts}]
ktlint_code_style=intellij_idea
indent_size=2
continuation_indent_size=2
insert_final_newline=true
ij_kotlin_allow_trailing_comma=true
ij_kotlin_allow_trailing_comma_on_call_site=true
insert_final_newline=true
ktlint_standard_annotation=disabled
ktlint_standard_argument-list-wrapping=disabled
ktlint_standard_spacing-between-declarations-with-annotations=disabled
ktlint_standard_max-line-length=disabled
ktlint_standard_filename=disabled
ktlint_standard_property-naming=disabled
ktlint_standard_discouraged-comment-location=disabled
ktlint_standard_class-signature=disabled
ktlint_standard_spacing-between-declarations-with-annotations=disabled
ktlint_experimental=enabled
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.23.0'
classpath 'com.vanniktech:gradle-code-quality-tools-plugin:0.24.0'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.25.3'
}
}
Expand All @@ -30,7 +30,7 @@ validatePlugins {

codeQualityTools {
ktlint {
toolVersion = '0.50.0'
toolVersion = '1.0.1'
}
detekt {
enabled = false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,10 @@ internal abstract class DetektWorker @Inject internal constructor(
task.mainClass.set("io.gitlab.arturbosch.detekt.cli.Main")
task.classpath = parameters.classpath
task.args(
"--input", parameters.inputFile.get().asFile,
reportKey, reportValue,
"--input",
parameters.inputFile.get().asFile,
reportKey,
reportValue,
)

val configFile = parameters.configFile.asFile.get()
Expand Down
11 changes: 5 additions & 6 deletions src/test/kotlin/com/vanniktech/code/quality/tools/utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ import org.gradle.internal.reflect.Instantiator
fun defaultExtensions(): CodeQualityToolsPluginExtension {
// This is not ideal but the only solution I have found that somewhat works.
return CodeQualityToolsPluginExtension(
InstantiatorBackedObjectFactory(object : Instantiator {
@Suppress("DEPRECATION")
override fun <T : Any?> newInstance(type: Class<out T>, vararg parameters: Any?): T {
return type.newInstance()
}
},
InstantiatorBackedObjectFactory(
object : Instantiator {
@Suppress("DEPRECATION")
override fun <T : Any?> newInstance(type: Class<out T>, vararg parameters: Any?): T = type.newInstance()
},
),
)
}
Expand Down

0 comments on commit 3bd4860

Please sign in to comment.