Skip to content

Commit 5f840aa

Browse files
committed
Make KtfmtConfig.ConfigurableStyle#configure public
1 parent 28e948e commit 5f840aa

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

plugin-gradle/CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format (starting after version `3.27.0`).
44

55
## [Unreleased]
6+
### Fixed
7+
* Make `KtfmtConfig.ConfigurableStyle#configure` public. ([#1926](https://github.com/diffplug/spotless/pull/1926))
68

79
## [6.23.2] - 2023-12-01
810
### Fixed

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/BaseKotlinExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private FormatterStep createStep() {
136136
}
137137

138138
public class ConfigurableStyle {
139-
private void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
139+
public void configure(Consumer<KtfmtStep.KtfmtFormattingOptions> optionsConfiguration) {
140140
KtfmtStep.KtfmtFormattingOptions ktfmtFormattingOptions = new KtfmtStep.KtfmtFormattingOptions();
141141
optionsConfiguration.accept(ktfmtFormattingOptions);
142142
options = ktfmtFormattingOptions;

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/KotlinExtensionTest.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,26 @@ void integrationDiktat() throws IOException {
4545
}
4646

4747
@Test
48-
void integrationKtfmt_dropboxStyle_0_19() throws IOException {
49-
setFile("build.gradle").toLines(
48+
void integrationKtfmtDropboxStyleWithPublicApi() throws IOException {
49+
setFile("build.gradle.kts").toLines(
5050
"plugins {",
51-
" id 'org.jetbrains.kotlin.jvm' version '1.6.21'",
52-
" id 'com.diffplug.spotless'",
51+
" id(\"org.jetbrains.kotlin.jvm\") version \"1.6.21\"",
52+
" id(\"com.diffplug.spotless\")",
5353
"}",
5454
"repositories { mavenCentral() }",
5555
"spotless {",
5656
" kotlin {",
57-
" ktfmt('0.19').dropboxStyle()",
57+
" ktfmt().dropboxStyle().configure {",
58+
" it.setMaxWidth(4)",
59+
" it.setBlockIndent(4)",
60+
" it.setContinuationIndent(4)",
61+
" it.setRemoveUnusedImport(false)",
62+
" }",
5863
" }",
5964
"}");
6065
setFile("src/main/kotlin/basic.kt").toResource("kotlin/ktfmt/basic.dirty");
6166
gradleRunner().withArguments("spotlessApply").build();
62-
assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropboxstyle.clean");
67+
assertFile("src/main/kotlin/basic.kt").sameAsResource("kotlin/ktfmt/basic-dropbox-style.clean");
6368
}
6469

6570
@Test
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import a.*
2+
import a.b
3+
import a.b.c.*
4+
import kotlinx.android.synthetic.main.layout_name.*
5+
6+
fun main() {
7+
fun name() {
8+
a()
9+
return b
10+
}
11+
println(
12+
";")
13+
println()
14+
}

0 commit comments

Comments
 (0)