Skip to content

Commit 8fbcb43

Browse files
sureshgsureshg
committed
chore: another attempt to fix spotless for kmp
1 parent 6298a32 commit 8fbcb43

File tree

6 files changed

+74
-79
lines changed

6 files changed

+74
-79
lines changed

‎gradle/build-logic/src/main/kotlin/dev.suresh.plugin.kotlin.docs.gradle.kts

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import com.diffplug.spotless.kotlin.KtfmtStep
21
import common.*
32
import java.time.Year
43
import org.hildan.github.changelog.plugin.GitHubChangelogExtension
@@ -83,34 +82,41 @@ dokka {
8382
}
8483

8584
spotless {
86-
java {
87-
// googleJavaFormat(libs.versions.google.javaformat.get())
88-
palantirJavaFormat(libs.versions.palantir.javaformat.get()).formatJavadoc(true)
89-
target("**/*.java_disabled")
85+
pluginManager.withPlugin("java") {
86+
java {
87+
palantirJavaFormat(libs.versions.palantir.javaformat.get()).formatJavadoc(true)
88+
target("src/**/*.java1")
89+
targetExclude("**/build/**", "**/generated/**")
90+
}
9091
}
91-
// if(plugins.hasPlugin(JavaPlugin::class.java)){ }
9292

93-
val ktfmtVersion = maxOf(KtfmtStep.defaultVersion(), libs.versions.ktfmt.get())
9493
kotlin {
95-
ktfmt(ktfmtVersion)
96-
target("src/**/*.kts", "src/**/*.kt")
94+
ktfmt(libs.versions.ktfmt.get())
95+
target("src/**/*.kt")
96+
targetExclude("**/build/**", "**/generated/**")
9797
trimTrailingWhitespace()
98-
suppressLintsFor { step = "ktfmt" }
99-
// licenseHeader(rootProject.file("gradle/license-header.txt"))
98+
endWithNewline()
99+
// licenseHeaderFile(rootProject.file("gradle/license-header.txt"))
100+
// suppressLintsFor {
101+
// step = "ktfmt"
102+
// shortCode = "ktfmt"
103+
// }
100104
}
101105

102106
kotlinGradle {
103-
ktfmt(ktfmtVersion)
104-
target("**/*.gradle.kts")
107+
ktfmt(libs.versions.ktfmt.get())
108+
target("**/*.kts", "*.kts")
105109
targetExclude("**/build/**")
106110
trimTrailingWhitespace()
111+
endWithNewline()
107112
}
108113

109114
format("misc") {
110-
target("**/*.md", "**/.kte")
115+
target("*.md", "*.kte")
111116
targetExclude("**/build/**")
112117
trimTrailingWhitespace()
113118
leadingTabsToSpaces(2)
119+
endWithNewline()
114120
}
115121
}
116122

‎shared/src/jvmMain/java/dev/suresh/DOP.java

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package dev.suresh;
22

3+
import static dev.suresh.Expr.eval;
4+
import static java.lang.System.out;
5+
import static java.util.Objects.requireNonNull;
6+
37
import java.io.*;
48
import java.lang.reflect.RecordComponent;
59
import java.nio.file.Files;
610
import java.util.Arrays;
711
import java.util.List;
812
import java.util.concurrent.CompletableFuture;
913

10-
import static dev.suresh.Expr.eval;
11-
import static java.lang.System.out;
12-
import static java.util.Objects.requireNonNull;
13-
1414
public class DOP {
1515
public static void run() throws Exception {
16-
record Person(String name, int age) {
17-
}
16+
record Person(String name, int age) {}
1817

1918
var future = new CompletableFuture<>();
20-
var textBlock = """
19+
var textBlock =
20+
"""
2121
This is text block
2222
This will join \
2323
with the line : %s
@@ -28,7 +28,8 @@ record Person(String name, int age) {
2828
\\d+
2929
Escape char: \u00A0 \u2000 \u3000 \uFEFF \u200B \u200C \u200D \u2028 \u2029
3030
END
31-
""".formatted(new Person("Foo", 40));
31+
"""
32+
.formatted(new Person("Foo", 40));
3233
future.complete(textBlock);
3334
out.println(future.get());
3435

@@ -50,17 +51,16 @@ private static void stringTemplates() {
5051
out.printf("x + y = %d%n", x + y);
5152
}
5253

53-
interface Name<T> {
54-
}
54+
interface Name<T> {}
5555

56-
record FullName<T>(T firstName, T lastName) implements Name<T> {
57-
}
56+
record FullName<T>(T firstName, T lastName) implements Name<T> {}
5857

5958
private static <T> void print(Name<T> name) {
60-
var result = switch (name) {
61-
case FullName(var first, var last) -> "%s, %s".formatted(first, last);
62-
default -> "Invalid name";
63-
};
59+
var result =
60+
switch (name) {
61+
case FullName(var first, var last) -> "%s, %s".formatted(first, last);
62+
default -> "Invalid name";
63+
};
6464
out.println(result);
6565

6666
if (name instanceof FullName<?> f) {
@@ -95,7 +95,6 @@ private static void amberReflections() {
9595
}
9696
}
9797

98-
9998
private static void serializeRecord() throws Exception {
10099
// Local record
101100
record Lang(String name, int year) implements Serializable {
@@ -123,24 +122,26 @@ record Lang(String name, int year) implements Serializable {
123122
try (var ois = new ObjectInputStream(new FileInputStream(serialFile))) {
124123
Object rec;
125124
while ((rec = ois.readObject()) != null) {
126-
var result = switch (rec) {
127-
case Lang l when l.year >= 20 -> l.toString();
128-
case Lang(var name, var year) -> name;
129-
case Result<?> r -> "Result value: %s".formatted(r.getOrNull());
130-
default -> "Invalid serialized data. Expected Result, but found %s".formatted(rec);
131-
};
125+
var result =
126+
switch (rec) {
127+
case Lang l when l.year >= 20 -> l.toString();
128+
case Lang(var name, var year) -> name;
129+
case Result<?> r -> "Result value: %s".formatted(r.getOrNull());
130+
default -> "Invalid serialized data. Expected Result, but found %s".formatted(rec);
131+
};
132132

133133
out.printf("Deserialized record: %s%n", rec);
134134
out.println(result);
135135
}
136136
}
137137

138138
results().forEach(r -> {
139-
var result = switch (r) {
140-
case null -> "n/a";
141-
case Result.Success<?> s -> s.toString();
142-
case Result.Failure<?> f -> f.toString();
143-
};
139+
var result =
140+
switch (r) {
141+
case null -> "n/a";
142+
case Result.Success<?> s -> s.toString();
143+
case Result.Failure<?> f -> f.toString();
144+
};
144145
out.printf("Result (Sealed Type): %s%n", result);
145146
});
146147
}
@@ -158,4 +159,3 @@ static Result<Number> getResult(Object obj) {
158159
};
159160
}
160161
}
161-

‎shared/src/jvmMain/java/dev/suresh/Expr.java

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,22 @@
44

55
@NullMarked
66
public sealed interface Expr {
7-
record Add(Expr left, Expr right) implements Expr {
8-
}
7+
record Add(Expr left, Expr right) implements Expr {}
98

10-
record Mul(Expr left, Expr right) implements Expr {
11-
}
9+
record Mul(Expr left, Expr right) implements Expr {}
1210

13-
record Div(Expr left, Expr right) implements Expr {
14-
}
11+
record Div(Expr left, Expr right) implements Expr {}
1512

16-
record Neg(Expr e) implements Expr {
17-
}
13+
record Neg(Expr e) implements Expr {}
1814

1915
sealed interface Const extends Expr {
20-
record Int(int i) implements Const {
21-
}
16+
record Int(int i) implements Const {}
2217

23-
record Double(double d) implements Const {
24-
}
18+
record Double(double d) implements Const {}
2519

26-
record Long(long l) implements Const {
27-
}
20+
record Long(long l) implements Const {}
2821

29-
record Str(String s) implements Const {
30-
}
22+
record Str(String s) implements Const {}
3123
}
3224

3325
static long eval(Expr expr) {
@@ -36,12 +28,13 @@ static long eval(Expr expr) {
3628
case Expr.Mul(var l, var r) -> eval(l) * eval(r);
3729
case Expr.Div(var l, var r) -> eval(l) / eval(r);
3830
case Expr.Neg(var e) -> -eval(e);
39-
case Expr.Const c -> switch (c) {
40-
case Expr.Const.Int(var i) -> i;
41-
case Expr.Const.Double(var d) -> (long) d;
42-
case Expr.Const.Long(var l) -> l;
43-
case Expr.Const.Str(var s) -> Long.parseLong(s);
44-
};
31+
case Expr.Const c ->
32+
switch (c) {
33+
case Expr.Const.Int(var i) -> i;
34+
case Expr.Const.Double(var d) -> (long) d;
35+
case Expr.Const.Long(var l) -> l;
36+
case Expr.Const.Str(var s) -> Long.parseLong(s);
37+
};
4538
};
4639
}
47-
}
40+
}

‎shared/src/jvmMain/java/dev/suresh/Gatherers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static <T> Gatherer<T, List<T>, List<T>> group(int size) {
4141
return Gatherer.ofSequential(initializer, integrator, finisher);
4242
}
4343

44-
public static void main(String[] args) {
44+
static void main(String[] args) {
4545
Stream.of(1, 2, 3, 4, 5).gather(map(e -> e + 1)).gather(group(2)).forEach(System.out::println);
4646
}
4747
}

‎shared/src/jvmMain/java/dev/suresh/Lang.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package dev.suresh;
22

3-
public record Lang(String name) {
4-
}
5-
3+
public record Lang(String name) {}
64

75
record Model(String name, float temp, int tokens) {
86

@@ -13,7 +11,6 @@ public static ModelBuilder builder() {
1311
void main() {
1412

1513
var b = Model.builder().name("test").build();
16-
1714
}
1815
}
1916

@@ -41,4 +38,4 @@ public ModelBuilder tokens(int tokens) {
4138
public Model build() {
4239
return new Model(name, temp, tokens);
4340
}
44-
}
41+
}

‎shared/src/jvmMain/java/dev/suresh/Result.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import java.io.Serializable;
44

55
/**
6-
* A discriminated union that encapsulates a successful outcome with a value of type T or a failure
7-
* with an arbitrary Throwable exception.
6+
* A discriminated union that encapsulates a successful outcome with a value of type T or a failure with an arbitrary
7+
* Throwable exception.
88
*
99
* @param <T> Result value type.
1010
*/
@@ -41,12 +41,11 @@ default String fString() {
4141
Success -> %3$s
4242
Failure -> %4$s
4343
Exception -> %5$s
44-
""".formatted(toString(), getOrNull(), isSuccess(), isFailure(), exceptionOrNull());
44+
"""
45+
.formatted(toString(), getOrNull(), isSuccess(), isFailure(), exceptionOrNull());
4546
}
4647

47-
record Success<T>(T value) implements Result<T> {
48-
}
48+
record Success<T>(T value) implements Result<T> {}
4949

50-
record Failure<T>(Throwable error) implements Result<T> {
51-
}
50+
record Failure<T>(Throwable error) implements Result<T> {}
5251
}

0 commit comments

Comments
 (0)