Skip to content

Commit 9136e4b

Browse files
committed
Migrate to use buf v2 configs
Simplify the build by migrating to v2 configs.
1 parent 8f81355 commit 9136e4b

File tree

984 files changed

+1327
-271
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

984 files changed

+1327
-271
lines changed

buf.gen.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
version: v1
2-
managed:
3-
enabled: false
1+
version: v2
42
plugins:
5-
- plugin: buf.build/protocolbuffers/java:v25.3
3+
- remote: buf.build/protocolbuffers/java:v25.3
64
out: src/main/java

buf.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: v2
2+
modules:
3+
- path: src/main/resources
4+
- path: src/test/resources/proto
5+
lint:
6+
use:
7+
- DEFAULT
8+
breaking:
9+
use:
10+
- FILE

build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,26 +63,27 @@ tasks.register<Exec>("licenseHeader") {
6363
"src/main/java/build/buf/validate/",
6464
"--ignore",
6565
"conformance/src/main/java/build/buf/validate/conformance/",
66+
"--ignore",
67+
"src/main/resources/buf/validate/",
6668
)
6769
}
6870

6971
tasks.register<Exec>("generateTestSourcesImports") {
70-
dependsOn("configureBuf")
72+
dependsOn("exportProtovalidateModule")
7173
description = "Generates code with buf generate --include-imports for unit tests."
7274
commandLine(
7375
buf.asPath,
7476
"generate",
7577
"--template",
7678
"src/test/resources/proto/buf.gen.imports.yaml",
77-
"src/test/resources/proto",
7879
"--include-imports",
7980
)
8081
}
8182

8283
tasks.register<Exec>("generateTestSourcesNoImports") {
83-
dependsOn("configureBuf")
84+
dependsOn("exportProtovalidateModule")
8485
description = "Generates code with buf generate --include-imports for unit tests."
85-
commandLine(buf.asPath, "generate", "--template", "src/test/resources/proto/buf.gen.noimports.yaml", "src/test/resources/proto")
86+
commandLine(buf.asPath, "generate", "--template", "src/test/resources/proto/buf.gen.noimports.yaml")
8687
}
8788

8889
tasks.register("generateTestSources") {
@@ -103,7 +104,7 @@ tasks.register<Exec>("exportProtovalidateModule") {
103104
}
104105

105106
tasks.register<Exec>("generateSources") {
106-
dependsOn("configureBuf")
107+
dependsOn("exportProtovalidateModule")
107108
description = "Generates sources for the bufbuild/protovalidate module sources to src/main/java."
108109
commandLine(buf.asPath, "generate", "--template", "buf.gen.yaml", "src/main/resources")
109110
}
@@ -126,7 +127,6 @@ tasks.register("generate") {
126127
description = "Generates sources with buf generate and buf export."
127128
dependsOn(
128129
"generateTestSources",
129-
"exportProtovalidateModule",
130130
"generateSources",
131131
"generateConformance",
132132
"licenseHeader",

conformance/buf.gen.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
version: v1
1+
version: v2
22
managed:
33
enabled: true
4-
java_package_prefix: "build"
4+
override:
5+
- file_option: java_package_prefix
6+
value: build
57
plugins:
6-
- plugin: buf.build/protocolbuffers/java:v24.3
8+
- remote: buf.build/protocolbuffers/java:v25.3
79
out: src/main/java

conformance/src/main/java/build/buf/validate/conformance/cases/AnEnum.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyIn.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyInOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyNone.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyNoneOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyNotIn.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyNotInOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyRequired.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/AnyRequiredOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BoolConstFalse.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BoolConstFalseOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BoolConstTrue.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BoolConstTrueOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BoolNone.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BoolNoneOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BoolProto.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesConst.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesConstOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesContains.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesContainsOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesEqualMinMaxLen.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesEqualMinMaxLenOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIP.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIPOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIPv4.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIPv4OrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIPv6.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIPv6Ignore.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIPv6IgnoreOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIPv6OrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesIn.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesInOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesLen.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesLenOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesMaxLen.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesMaxLenOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesMinLen.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesMinLenOrBuilder.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

conformance/src/main/java/build/buf/validate/conformance/cases/BytesMinMaxLen.java

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)