diff --git a/build.gradle.kts b/build.gradle.kts index 916820e680c89c73b57738ccdabf7e2497f2af95..df6137fcad9b52334dcecb7fb84f2333e583116f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,16 +12,16 @@ plugins { // Java support id("java") // Kotlin support - id("org.jetbrains.kotlin.jvm") version "1.5.10" + id("org.jetbrains.kotlin.jvm") version "1.8.20" // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin - id("org.jetbrains.intellij") version "1.0" + id("org.jetbrains.intellij") version "1.13.3" // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin - id("org.jetbrains.changelog") version "1.1.2" + id("org.jetbrains.changelog") version "2.0.0" // detekt linter - read more: https://detekt.github.io/detekt/gradle.html - id("io.gitlab.arturbosch.detekt") version "1.18.1" + id("io.gitlab.arturbosch.detekt") version "1.23.0" // ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle - id("org.jlleitschuh.gradle.ktlint") version "10.2.0" - + id("org.jlleitschuh.gradle.ktlint") version "11.3.2" + // grammrkit - read more: https://plugins.gradle.org/plugin/org.jetbrains.grammarkit id("org.jetbrains.grammarkit") version "2022.3.1" } @@ -32,9 +32,7 @@ version = properties("pluginVersion") repositories { mavenCentral() } -dependencies { - detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.18.1") -} + java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 @@ -68,21 +66,14 @@ sourceSets { // Configure gradle-changelog-plugin plugin. // Read more: https://github.com/JetBrains/gradle-changelog-plugin changelog { - version = properties("pluginVersion") - groups = listOf("Added", "Changed", "Deprecated", "Removed", "Fixed") + version.set(properties("pluginVersion")) + groups.set(listOf("Added", "Changed", "Deprecated", "Removed", "Fixed")) } // Configure detekt plugin. // Read more: https://detekt.github.io/detekt/kotlindsl.html detekt { - config = files("./detekt-config.yml") - buildUponDefaultConfig = true - - reports { - html.enabled = true - xml.enabled = false - txt.enabled = false - } + source.from(files("build.gradle.kts")) } tasks { @@ -161,15 +152,6 @@ tasks { changeNotes.set(provider { changelog.getLatest().toHTML() }) } - runPluginVerifier { - ideVersions.set(properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty)) - } - - buildSearchableOptions { - // otherwise the build fails - enabled = false - } - publishPlugin { dependsOn("patchChangelog") token.set(System.getenv("PUBLISH_TOKEN")) diff --git a/detekt-config.yml b/detekt-config.yml deleted file mode 100644 index 874b29a3babcdeedc0e1a1762d8e8c71734ec90f..0000000000000000000000000000000000000000 --- a/detekt-config.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Default detekt configuration: -# https://github.com/detekt/detekt/blob/master/detekt-core/src/main/resources/default-detekt-config.yml - -formatting: - Indentation: - continuationIndentSize: 8 - ParameterListWrapping: - indentSize: 8 diff --git a/gradle.properties b/gradle.properties index b46a19e92d441dd07869b68cbdf4922c9dbc24eb..8bdd4c7ebd25557088818b941e9c60fb003b0f41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,12 +7,12 @@ pluginVersion = 0.3.1 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. -pluginSinceBuild = 222 +pluginSinceBuild = 223 pluginUntilBuild = 231.* -# Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl -# See https://jb.gg/intellij-platform-builds-list for available build versions. -pluginVerifierIdeVersions = 2022.2.4, 2022.3.1, 2023.1.2 +## Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl +## See https://jb.gg/intellij-platform-builds-list for available build versions. +#pluginVerifierIdeVersions = 2022.2.4, 2022.3.1, 2023.1.2 platformType = IC platformVersion = 2022.3.1