Skip to content

Commit bc8d60c

Browse files
committed
Pin plugin version, undo provider changes
1 parent 0d162dd commit bc8d60c

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ 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"
7+
id("org.hypertrace.code-style-plugin") version "2.0.1"
88
id("org.hypertrace.publish-plugin") version "1.0.4"
99
id("org.owasp.dependencycheck") version "8.4.0"
1010
}

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

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
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;
1615

1716
public class CodeStylePlugin implements Plugin<Project> {
1817

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

5251
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-
});
6652
spotlessExtension.protobuf(
67-
format ->
68-
format
69-
.buf(bufExtension.getToolVersion())
70-
.pathToExe(bufBinaryProvider.get().getAbsolutePath()));
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+
});
7164
bufExtension.setEnforceFormat(false);
7265

7366
spotlessExtension.format(

0 commit comments

Comments
 (0)