Skip to content

Commit

Permalink
Merge pull request #57 from dprint/updates-2023.2
Browse files Browse the repository at this point in the history
Updates 2023.2
  • Loading branch information
ryan-rushton committed Aug 18, 2023
2 parents eefd77b + cbaef01 commit eb3f676
Show file tree
Hide file tree
Showing 19 changed files with 362 additions and 252 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# dprint-intellij-plugin Changelog

## [Unreleased]
- Update to latest dependencies

## [0.4.2]
- Fix issue with run on save config not saving
Expand Down
21 changes: 11 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.changelog.Changelog
import org.jetbrains.changelog.markdownToHTML
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

Expand All @@ -8,16 +9,16 @@ plugins {
// Java support
id("java")
// Kotlin support
kotlin("jvm") version "1.7.20"
kotlin("plugin.serialization") version "1.7.20"
kotlin("jvm") version "1.9.0"
kotlin("plugin.serialization") version "1.9.0"
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
id("org.jetbrains.intellij") version "1.9.0"
id("org.jetbrains.intellij") version "1.15.0"
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
id("org.jetbrains.changelog") version "1.3.1"
id("org.jetbrains.changelog") version "2.1.2"
// detekt linter - read more: https://detekt.github.io/detekt/gradle.html
id("io.gitlab.arturbosch.detekt") version "1.21.0"
id("io.gitlab.arturbosch.detekt") version "1.23.1"
// ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
id("org.jlleitschuh.gradle.ktlint") version "11.5.1"
}

group = properties("pluginGroup")
Expand All @@ -29,7 +30,7 @@ repositories {
}
dependencies {
implementation("org.apache.commons:commons-collections4:4.4")
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.20.0")
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
testImplementation(kotlin("test"))
}

Expand All @@ -43,7 +44,7 @@ intellij {
// Ensures all new builds will "just work" without an update. Obtained from thread in IntelliJ slack
updateSinceUntilBuild.set(false)
if (properties("platformType") == "IU") {
plugins.set(listOf("JavaScriptLanguage"))
plugins.set(listOf("JavaScript"))
}
}

Expand All @@ -57,7 +58,7 @@ changelog {
// Configure detekt plugin.
// Read more: https://detekt.github.io/detekt/kotlindsl.html
detekt {
config = files("./detekt-config.yml")
config.setFrom("./detekt-config.yml")
buildUponDefaultConfig = true
}

Expand Down Expand Up @@ -126,7 +127,7 @@ tasks {
)

// Get the latest available change notes from the changelog file
changeNotes.set(provider { changelog.getLatest().toHTML() })
changeNotes.set(provider { changelog.renderItem(changelog.getLatest(), Changelog.OutputType.HTML) })
}

runPluginVerifier {
Expand Down
7 changes: 1 addition & 6 deletions detekt-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,8 @@ complexity:
thresholdInClasses: 20
LongParameterList:
functionThreshold: 7
ComplexMethod:
CyclomaticComplexMethod:
threshold: 25
formatting:
Indentation:
continuationIndentSize: 8
ParameterListWrapping:
indentSize: 8
style:
ReturnCount:
max: 5
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
pluginGroup=com.dprint.intellij.plugin
pluginName=dprint-intellij-plugin
pluginVersion=0.4.2
pluginVersion=0.4.3
# See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
# for insight into build numbers and IntelliJ Platform versions.
pluginSinceBuild=221
pluginSinceBuild=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=IC-2022.1,IC-2022.2,IU-2022.1,IU-2022.2
pluginVerifierIdeVersions=IC-2023.2,IU-2023.2
platformType=IU
platformVersion=2022.2
platformVersion=2023.2
platformDownloadSources=true
# Opt-out flag for bundling Kotlin standard library.
# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit eb3f676

Please sign in to comment.