Skip to content

Commit 0d162dd

Browse files
committed
Dogfood plugin, use provider
Signed-off-by: Akshath Kothari <[email protected]>
1 parent 59a764e commit 0d162dd

File tree

3 files changed

+20
-24
lines changed

3 files changed

+20
-24
lines changed

build.gradle.kts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ plugins {
44
`java-gradle-plugin`
55
id("org.hypertrace.repository-plugin") version "0.4.0"
66
id("org.hypertrace.ci-utils-plugin") version "0.3.0"
7+
id("org.hypertrace.code-style-plugin") version "latest.release"
78
id("org.hypertrace.publish-plugin") version "1.0.4"
89
id("org.owasp.dependencycheck") version "8.4.0"
9-
id("com.diffplug.spotless") version "7.0.0"
1010
}
1111

1212
group = "org.hypertrace.gradle.code.style"
@@ -40,14 +40,3 @@ dependencyCheck {
4040
scanConfigurations.add("runtimeClasspath")
4141
failBuildOnCVSS = 3.0F
4242
}
43-
44-
spotless {
45-
java {
46-
importOrder()
47-
removeUnusedImports()
48-
googleJavaFormat("1.17.0")
49-
}
50-
kotlin {
51-
ktlint()
52-
}
53-
}

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ plugins {
1212
id("org.hypertrace.version-settings") version "0.2.0"
1313
}
1414

15-
rootProject.name = "hypertrace-gradle-code-style-plugin"
15+
rootProject.name = "hypertrace-gradle-code-style-plugin"

src/main/java/org/hypertrace/gradle/code/style/CodeStylePlugin.java

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.gradle.api.Plugin;
1313
import org.gradle.api.Project;
1414
import org.gradle.api.plugins.PluginContainer;
15+
import org.gradle.api.provider.Provider;
1516

1617
public class CodeStylePlugin implements Plugin<Project> {
1718

@@ -49,18 +50,24 @@ private void configureFormatting(Project project) {
4950
});
5051

5152
BufExtension bufExtension = project.getExtensions().getByType(BufExtension.class);
53+
Provider<File> bufBinaryProvider =
54+
project.provider(
55+
() -> {
56+
File binary =
57+
project
58+
.getConfigurations()
59+
.getByName(BufSupportKt.BUF_BINARY_CONFIGURATION_NAME)
60+
.getSingleFile();
61+
if (!binary.canExecute()) {
62+
binary.setExecutable(true);
63+
}
64+
return binary;
65+
});
5266
spotlessExtension.protobuf(
53-
format -> {
54-
File bufBinary =
55-
project
56-
.getConfigurations()
57-
.getByName(BufSupportKt.BUF_BINARY_CONFIGURATION_NAME)
58-
.getSingleFile();
59-
if (!bufBinary.canExecute()) {
60-
bufBinary.setExecutable(true);
61-
}
62-
format.buf(bufExtension.getToolVersion()).pathToExe(bufBinary.getAbsolutePath());
63-
});
67+
format ->
68+
format
69+
.buf(bufExtension.getToolVersion())
70+
.pathToExe(bufBinaryProvider.get().getAbsolutePath()));
6471
bufExtension.setEnforceFormat(false);
6572

6673
spotlessExtension.format(

0 commit comments

Comments
 (0)