Skip to content

Commit 52e9e55

Browse files
committed
chore: update spotless and enable removeWildcardImports
Signed-off-by: Niels Pardon <[email protected]>
1 parent b5aaca1 commit 52e9e55

File tree

9 files changed

+13
-12
lines changed

9 files changed

+13
-12
lines changed

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ plugins {
88
id("java")
99
id("idea")
1010
id("com.github.vlsi.gradle-extensions") version "1.74"
11-
id("com.diffplug.spotless") version "6.19.0"
11+
id("com.diffplug.spotless") version "7.1.0"
1212
id("org.jreleaser") version "1.18.0" apply false
1313
}
1414

@@ -55,6 +55,7 @@ allprojects {
5555
googleJavaFormat()
5656
removeUnusedImports()
5757
trimTrailingWhitespace()
58+
removeWildcardImports()
5859
}
5960
}
6061
}

core/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
id("idea")
1313
id("antlr")
1414
id("com.google.protobuf") version "0.9.4"
15-
id("com.diffplug.spotless") version "6.19.0"
15+
id("com.diffplug.spotless") version "7.1.0"
1616
id("com.gradleup.shadow") version "8.3.6"
1717
id("org.jreleaser")
1818
}
@@ -261,7 +261,7 @@ project.configure<IdeaModel> {
261261
generatedSourceDirs.addAll(
262262
listOf(
263263
file("build/generated/sources/antlr/main"),
264-
file("build/generated/source/proto/main/java")
264+
file("build/generated/source/proto/main/java"),
265265
)
266266
)
267267
}

core/src/main/java/io/substrait/expression/proto/ProtoExpressionConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ public Type visit(Type.Struct type) throws RuntimeException {
258258
}
259259
}
260260

261-
// TODO enum.
261+
// TODO enum.
262262
case ENUM:
263263
throw new UnsupportedOperationException("Unsupported type: " + expr.getRexTypeCase());
264264
default:

core/src/main/java/io/substrait/type/proto/TypeExpressionProtoVisitor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ private DerivationExpression.BinaryOp.BinaryOpType getDerivationOpType(
5252
return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_MAX;
5353
case LT:
5454
return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_LESS_THAN;
55-
// case LTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_LESS_THAN;
55+
// case LTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_LESS_THAN;
5656
case GT:
5757
return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_GREATER_THAN;
58-
// case GTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_MINUS;
59-
// case NOT_EQ -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_EQ;
58+
// case GTE -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_MINUS;
59+
// case NOT_EQ -> DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_EQ;
6060
case EQ:
6161
return DerivationExpression.BinaryOp.BinaryOpType.BINARY_OP_TYPE_EQUALS;
6262
case COVERS:

examples/substrait-spark/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
// Apply the application plugin to add support for building a CLI application in Java.
33
id("java")
4-
id("com.diffplug.spotless") version "6.19.0"
4+
id("com.diffplug.spotless") version "7.1.0"
55
}
66

77
repositories {

isthmus-cli/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id("java")
33
id("idea")
44
id("com.palantir.graal") version "0.10.0"
5-
id("com.diffplug.spotless") version "6.19.0"
5+
id("com.diffplug.spotless") version "7.1.0"
66
}
77

88
java {

isthmus/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
signing
66
id("java-library")
77
id("idea")
8-
id("com.diffplug.spotless") version "6.19.0"
8+
id("com.diffplug.spotless") version "7.1.0"
99
id("com.gradleup.shadow") version "8.3.6"
1010
id("com.google.protobuf") version "0.9.4"
1111
id("org.jreleaser")

spark/.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
runner.dialect = scala212
22

33
# Version is required to make sure IntelliJ picks the right version
4-
version = 3.7.3
4+
version = 3.8.1
55
preset = default
66

77
# Max column

spark/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id("java")
55
id("scala")
66
id("idea")
7-
id("com.diffplug.spotless") version "6.19.0"
7+
id("com.diffplug.spotless") version "7.1.0"
88
id("org.jreleaser")
99
}
1010

0 commit comments

Comments
 (0)