Skip to content
This repository was archived by the owner on Sep 27, 2024. It is now read-only.

Commit f14cbfb

Browse files
committed
Merge branch 'release/prepare-formatter-release-0.2.0'
2 parents 773aee8 + 14f1026 commit f14cbfb

File tree

7 files changed

+24
-26
lines changed

7 files changed

+24
-26
lines changed
Lines changed: 1 addition & 1 deletion
Loading

docs/develop/badges.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ curl "https://img.shields.io/badge/Quality-→-orange.svg?style=flat" -s -o ../a
3434
```
3535
- Code Formatter
3636
```bash
37-
curl "https://img.shields.io/badge/CodeFormatter-v0.1.1-orange.svg?style=flat" -s -o ../assets/images/badge-release-quality-code-formatter.svg
37+
curl "https://img.shields.io/badge/CodeFormatter-v0.2.0-orange.svg?style=flat" -s -o ../assets/images/badge-release-quality-code-formatter.svg
3838
```
3939
- Report
4040
```bash

plugins/quality/formatter/CHANGELOG.md

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,21 @@ This project adheres to [semantic versioning](http://semver.org/spec/v2.0.0.html
99

1010
## [Unreleased](https://github.com/bitfunk/gradle-plugins/releases/latest)
1111

12-
See [changeset](https://github.com/bitfunk/gradle-plugins/compare/plugin-quality-formatter@v0.1.1...main)
12+
See [changeset](https://github.com/bitfunk/gradle-plugins/compare/plugin-quality-formatter@v0.2.0...main)
13+
14+
## [0.2.0](https://github.com/bitfunk/gradle-plugins/releases/tag/plugin-quality-formatter@v0.2.0)
15+
16+
See [changeset](https://github.com/bitfunk/gradle-plugins/compare/plugin-quality-formatter@v0.1.1...plugin-quality-formatter@v0.2.0)
17+
18+
### Removed
19+
20+
- Remove unnecessary rules for `.kt`, `.kts` and `.md` files as ktlint and prettier apply them already
21+
22+
### Bumped
23+
24+
- Gradle Plugin Convention 0.1.0 -> 0.2.0
25+
- ktlint 0.48.0 -> 0.48.2
26+
- Spotless 6.12.0 -> 6.15.0
1327

1428
## [0.1.1](https://github.com/bitfunk/gradle-plugins/releases/tag/plugin-quality-formatter@v0.1.1)
1529

@@ -23,7 +37,7 @@ See [changeset](https://github.com/bitfunk/gradle-plugins/compare/plugin-quality
2337

2438
- Spotless 6.11.0 -> 6.12.0
2539
- ktlint 0.47.1 -> 0.48.0
26-
- Gradle Plugin Convention 0.7.0 -> 1.0.0
40+
- Gradle Plugin Convention 0.0.7 -> 0.1.0
2741

2842
## [0.1.0](https://github.com/bitfunk/gradle-plugins/releases/tag/plugin-quality-formatter@v0.1.0)
2943

plugins/quality/formatter/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ plugins {
2222
}
2323

2424
group = "eu.bitfunk.gradle.plugin.quality"
25-
version = "0.1.1"
25+
version = "0.2.0"
2626

2727
gradlePlugin {
2828
plugins.create("qualityFormatter") {

plugins/quality/formatter/gradle/libs-formatter.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
2-
ktlint = "0.48.0"
3-
spotless = "6.12.0"
4-
gradlePluginConvention = "0.1.0"
2+
ktlint = "0.48.2"
3+
spotless = "6.15.0"
4+
gradlePluginConvention = "0.2.1"
55

66
[libraries]
77
gradleKtlintPlugin = { module = "com.pinterest:ktlint", version.ref = "ktlint" }

plugins/quality/formatter/src/main/kotlin/eu/bitfunk/gradle/plugin/quality/formatter/FormatterPlugin.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,15 @@ public class FormatterPlugin : Plugin<Project>, FormatterContract.Plugin {
4848
ktlint()
4949
target("**/*.kt")
5050
targetExclude("**/build/", "**/resources/")
51-
trimTrailingWhitespace()
52-
indentWithSpaces()
53-
endWithNewline()
5451
}
5552
kotlinGradle {
53+
ktlint()
5654
target("**/*.gradle.kts", "**/*.df.kts")
5755
targetExclude("**/build/")
58-
trimTrailingWhitespace()
59-
indentWithSpaces()
60-
endWithNewline()
6156
}
6257
format("markdown") {
6358
prettier()
6459
target("**/*.md")
65-
trimTrailingWhitespace()
66-
indentWithSpaces()
67-
endWithNewline()
6860
}
6961
format("misc") {
7062
target("**/.gitignore", "**/.gitattributes", ".java-version")

plugins/quality/formatter/src/test/kotlin/eu/bitfunk/gradle/plugin/quality/formatter/FormatterPluginTest.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -133,21 +133,13 @@ class FormatterPluginTest {
133133
kotlinExtension.ktlint()
134134
kotlinExtension.target("**/*.kt")
135135
kotlinExtension.targetExclude("**/build/", "**/resources/")
136-
kotlinExtension.trimTrailingWhitespace()
137-
kotlinExtension.indentWithSpaces()
138-
kotlinExtension.endWithNewline()
139136

137+
kotlinGradleExtension.ktlint()
140138
kotlinGradleExtension.target("**/*.gradle.kts", "**/*.df.kts")
141139
kotlinGradleExtension.targetExclude("**/build/")
142-
kotlinGradleExtension.trimTrailingWhitespace()
143-
kotlinGradleExtension.indentWithSpaces()
144-
kotlinGradleExtension.endWithNewline()
145140

146141
markdownFormatExtension.prettier()
147142
markdownFormatExtension.target("**/*.md")
148-
markdownFormatExtension.trimTrailingWhitespace()
149-
markdownFormatExtension.indentWithSpaces()
150-
markdownFormatExtension.endWithNewline()
151143

152144
miscFormatExtension.target("**/.gitignore", "**/.gitattributes", ".java-version")
153145
miscFormatExtension.trimTrailingWhitespace()

0 commit comments

Comments
 (0)