Skip to content

Commit

Permalink
Upgrade to build again with more recent versions of intellij plugin g…
Browse files Browse the repository at this point in the history
…radle tool.
  • Loading branch information
Layoric committed Sep 13, 2024
1 parent cf88a01 commit fca7a47
Show file tree
Hide file tree
Showing 5 changed files with 187 additions and 130 deletions.
30 changes: 12 additions & 18 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
fun properties(key: String) = project.findProperty(key).toString()

plugins {
// Java support
id("java")
// Kotlin support
id("org.jetbrains.kotlin.jvm") version "1.5.10"
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
id("org.jetbrains.intellij") version "1.1.2"
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
id("org.jetbrains.changelog") version "1.1.2"
// detekt linter - read more: https://detekt.github.io/detekt/gradle.html
id("io.gitlab.arturbosch.detekt") version "1.17.1"
// ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
id("org.jetbrains.kotlin.jvm") version "1.8.20"
id("org.jetbrains.intellij") version "1.13.3"
id("org.jetbrains.changelog") version "2.0.0"
id("io.gitlab.arturbosch.detekt") version "1.22.0"
id("org.jlleitschuh.gradle.ktlint") version "11.3.1"
}

group = properties("pluginGroup")
Expand All @@ -27,7 +21,7 @@ repositories {
mavenCentral()
}
dependencies {
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.17.1")
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
}

// Configure gradle-intellij-plugin plugin.
Expand All @@ -46,8 +40,8 @@ intellij {
// Configure gradle-changelog-plugin plugin.
// Read more: https://github.com/JetBrains/gradle-changelog-plugin
changelog {
version = properties("pluginVersion")
groups = emptyList()
version.set(properties("pluginVersion"))
groups.set(emptyList())
}

// Configure detekt plugin.
Expand All @@ -66,15 +60,15 @@ detekt {
tasks {
// Set the compatibility versions to 1.8
withType<JavaCompile> {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
sourceCompatibility = "11"
targetCompatibility = "11"
}
withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
kotlinOptions.jvmTarget = "11"
}

withType<Detekt> {
jvmTarget = "1.8"
jvmTarget = "11"
}

// runIde {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit fca7a47

Please sign in to comment.