Skip to content

Commit

Permalink
Upgrade to ktlint 1.2.1 and release 4.3.0
Browse files Browse the repository at this point in the history
Also
- Improve plugin versionss
- Configure dependabot
  • Loading branch information
jeremymailen committed Mar 18, 2024
1 parent 9c6893d commit 2945e2d
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 11 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "weekly"
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Available on the Gradle Plugins Portal: https://plugins.gradle.org/plugin/org.jm

```kotlin
plugins {
id("org.jmailen.kotlinter") version "4.2.0"
id("org.jmailen.kotlinter") version "4.3.0"
}
```

Expand All @@ -31,7 +31,7 @@ plugins {

```groovy
plugins {
id "org.jmailen.kotlinter" version "4.2.0"
id "org.jmailen.kotlinter" version "4.3.0"
}
```

Expand All @@ -45,7 +45,7 @@ Root `build.gradle.kts`

```kotlin
plugins {
id("org.jmailen.kotlinter") version "4.2.0" apply false
id("org.jmailen.kotlinter") version "4.3.0" apply false
}
```

Expand All @@ -65,7 +65,7 @@ Root `build.gradle`

```groovy
plugins {
id 'org.jmailen.kotlinter' version "4.2.0" apply false
id 'org.jmailen.kotlinter' version "4.3.0" apply false
}
```

Expand Down Expand Up @@ -319,7 +319,7 @@ Alternatively, if you have a custom build convention plugin that utilizes kotlin
```kotlin
dependencies {
implementation(platform("com.pinterest.ktlint:ktlint-bom:1.2.1"))
implementation("org.jmailen.gradle:kotlinter-gradle:4.2.0")
implementation("org.jmailen.gradle:kotlinter-gradle:4.3.0")
}

```
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version libs.versions.kotlin
id("com.gradle.plugin-publish") version "1.1.0"
`java-gradle-plugin`
`maven-publish`
id("org.jmailen.kotlinter") version "4.1.1"
idea
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.gradle.publish)
alias(libs.plugins.kotlinter)
}

repositories {
Expand All @@ -20,7 +20,7 @@ val githubUrl = "https://github.com/jeremymailen/kotlinter-gradle"
val webUrl = "https://github.com/jeremymailen/kotlinter-gradle"
val projectDescription = "Lint and formatting for Kotlin using ktlint with configuration-free setup on JVM and Android projects"

version = "4.2.0"
version = "4.3.0"
group = "org.jmailen.gradle"
description = projectDescription

Expand Down
11 changes: 9 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[versions]
kotlin = "1.9.22"
ktlint = "1.1.1"
kotlin = "1.9.23"
ktlint = "1.2.1"
android-tools = "7.3.1"
junit = "5.10.1"
mockito = "4.1.0"
commons-io = "2.15.1"
gradle-publish = "1.1.0"
kotlinter-check = "4.2.0"

[libraries]
ktlint-rule-engine = { group = "com.pinterest.ktlint", name = "ktlint-rule-engine", version.ref = "ktlint" }
Expand All @@ -28,3 +30,8 @@ ktlint-engine = ["ktlint-rule-engine", "ktlint-rule-engine-core"]
ktlint-reporters = ["ktlint-cli-reporter-core", "ktlint-cli-reporter-plain", "ktlint-cli-reporter-html", "ktlint-cli-reporter-checkstyle", "ktlint-cli-reporter-json", "ktlint-cli-reporter-sarif"]
ktlint-rulesets = ["ktlint-ruleset-standard"]
junit-jupiter = ["junit-jupiter-engine", "junit-jupiter-api", "junit-jupiter-params"]

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
gradle-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-publish" }
kotlinter = { id = "org.jmailen.kotlinter", version.ref = "kotlinter-check" }

0 comments on commit 2945e2d

Please sign in to comment.