Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make BaseGroovyExtension and BaseKotlinExtension public #1912

Merged
merged 4 commits into from
Nov 29, 2023
Merged

Make BaseGroovyExtension and BaseKotlinExtension public #1912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5eec2d2
Make BaseGroovyExtension and BaseKotlinExtension public
Goooler Nov 27, 2023
e0b3787
Fix doc formats
Goooler Nov 27, 2023
3c5a9b0
Note breaking changes for Gradle plugin
Goooler Nov 27, 2023
0d1f612
Test Spotless Ktlint integration in kts
Goooler Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions plugin-gradle/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).

## [Unreleased]
### Fixed
* Make `BaseGroovyExtension` and `BaseKotlinExtension` public. ([#1912](https://github.com/diffplug/spotless/pull/1912))

## [6.23.0] - 2023-11-27
Goooler marked this conversation as resolved.
Show resolved Hide resolved
### Added
* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
### Fixed
* Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
* Check if EditorConfig file exist for Ktlint in KotlinGradleExtension. ([#1889](https://github.com/diffplug/spotless/pull/1889))
### Changes
* Bump default `ktlint` version to latest `1.0.0` -> `1.0.1`. ([#1855](https://github.com/diffplug/spotless/pull/1855))
* Add a Step to remove semicolons from Groovy files. ([#1881](https://github.com/diffplug/spotless/pull/1881))
### Fixed
* Fix `GoogleJavaFormatConfig.reorderImports` not working. ([#1872](https://github.com/diffplug/spotless/issues/1872))
* **POSSIBLY BREAKING** `userData` method has been removed from Ktlint step in ([#1891](https://github.com/diffplug/spotless/pull/1891)), you may use `editorConfigOverride` instead.
* **POSSIBLY BREAKING** Reuse configs for `KotlinExtension` and `KotlinGradleExtension` in ([#1890](https://github.com/diffplug/spotless/pull/1890)), this may break your integrations in Gradle Kotlin DSL, wait for Spotless 6.23.1 to fix this.
* **POSSIBLY BREAKING** Reuse configs for `GroovyExtension` and `GroovyGradleExtension` in ([#1890](https://github.com/diffplug/spotless/pull/1890)), this may break your integrations in Gradle Kotlin DSL, wait for Spotless 6.23.1 to fix this.

## [6.22.0] - 2023-09-28
### Added
Expand Down
2 changes: 1 addition & 1 deletion plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseGroovyExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.diffplug.spotless.groovy.RemoveSemicolonsStep;
import com.diffplug.spotless.java.ImportOrderStep;

abstract class BaseGroovyExtension extends FormatExtension {
public abstract class BaseGroovyExtension extends FormatExtension {
protected BaseGroovyExtension(SpotlessExtension spotless) {
super(spotless);
}
Expand Down
2 changes: 1 addition & 1 deletion plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import com.diffplug.spotless.kotlin.KtLintStep;
import com.diffplug.spotless.kotlin.KtfmtStep;

abstract class BaseKotlinExtension extends FormatExtension {
public abstract class BaseKotlinExtension extends FormatExtension {
protected BaseKotlinExtension(SpotlessExtension spotless) {
super(spotless);
}
Expand Down
16 changes: 8 additions & 8 deletions plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,21 @@ void testSetEditorConfigCanOverrideEditorConfigFile() throws IOException {

@Test
void withCustomRuleSetApply() throws IOException {
setFile("build.gradle").toLines(
setFile("build.gradle.kts").toLines(
"plugins {",
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
" id 'com.diffplug.spotless'",
" id(\"org.jetbrains.kotlin.jvm\") version \"1.6.21\"",
" id(\"com.diffplug.spotless\")",
"}",
"repositories { mavenCentral() }",
"spotless {",
" kotlin {",
" ktlint(\"1.0.1\")",
" .customRuleSets([",
" .customRuleSets(listOf(",
" \"io.nlopez.compose.rules:ktlint:0.3.3\"",
" ])",
" .editorConfigOverride([",
" ktlint_function_naming_ignore_when_annotated_with: \"Composable\",",
" ])",
" ))",
" .editorConfigOverride(mapOf(",
" \"ktlint_function_naming_ignore_when_annotated_with\" to \"Composable\"",
" ))",
" }",
"}");
setFile("src/main/kotlin/Main.kt").toResource("kotlin/ktlint/listScreen.dirty");
Expand Down
2 changes: 1 addition & 1 deletion plugin-maven/CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (
## [2.41.0] - 2023-11-27
### Added
* CompileSourceRoots and TestCompileSourceRoots are now respected as default includes. These properties are commonly set when adding extra source directories. ([#1846](https://github.com/diffplug/spotless/issues/1846))
* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896)
* Support custom rule sets for Ktlint. ([#1896](https://github.com/diffplug/spotless/pull/1896))
### Fixed
* Fix crash when build dir is a softlink to another directory. ([#1859](https://github.com/diffplug/spotless/pull/1859))
* Fix Eclipse JDT on some settings files. ([#1864](https://github.com/diffplug/spotless/pull/1864) fixes [#1638](https://github.com/diffplug/spotless/issues/1638))
Expand Down
Loading