Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/sources/bufgen
65 changes: 54 additions & 11 deletions build.gradle.kts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import com.diffplug.gradle.spotless.SpotlessExtension
import com.vanniktech.maven.publish.JavaLibrary
import com.vanniktech.maven.publish.JavadocJar
import com.vanniktech.maven.publish.SourcesJar
import net.ltgt.gradle.errorprone.CheckSeverity
import net.ltgt.gradle.errorprone.errorprone

Expand DownExpand Up@@ -56,6 +57,7 @@ tasks.register("configureBuf") {
tasks.register<Exec>("installLicenseHeader") {
description = "Installs the Buf license-header CLI."
environment("GOBIN", bufLicenseHeaderCLIFile.parentFile.absolutePath)
inputs.property("bufVersion", libs.versions.buf.get())
outputs.file(bufLicenseHeaderCLIFile)
commandLine("go", "install", "github.com/bufbuild/buf/private/pkg/licenseheader/cmd/license-header@v${libs.versions.buf.get()}")
}
Expand All@@ -81,8 +83,11 @@ tasks.register<Exec>("licenseHeader") {
}

tasks.register<Copy>("filterBufGenYaml") {
from(".")
include("buf.gen.yaml", "src/**/buf*gen*.yaml")
from(files("buf.gen.yaml"))
from("src/test/resources/proto") {
include("buf*gen*.yaml")
into("src/test/resources/proto")
}
includeEmptyDirs = false
into(layout.buildDirectory.dir("buf-gen-templates"))
expand("protocJavaPluginVersion" to "v${libs.versions.protobuf.get().substringAfter('.')}")
Expand All@@ -92,34 +97,50 @@ tasks.register<Copy>("filterBufGenYaml") {
tasks.register<Exec>("generateTestSourcesImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.imports.yaml",
template.get().asFile.absolutePath,
"--include-imports",
)
}

tasks.register<Exec>("generateTestSourcesNoImports") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates code with buf generate --include-imports for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources")
inputs.dir("src/test/resources/proto")
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.noimports.yaml",
template.get().asFile.absolutePath,
)
}

tasks.register<Exec>("generateCelConformance") {
dependsOn("generateCelConformanceTestTypes", "filterBufGenYaml")
description = "Generates CEL conformance code with buf generate for unit tests."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--exclude-path",
"cel/expr/conformance/proto2",
Expand All@@ -136,11 +157,16 @@ tasks.register<Exec>("generateCelConformance") {
tasks.register<Exec>("generateCelConformanceTestTypes") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates CEL conformance test types with buf generate for unit tests using a Java package override."
val template = layout.buildDirectory.file("buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("celSpecVersion", project.findProperty("cel.spec.version").toString())
outputs.dir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/src/test/resources/proto/buf.gen.cel.testtypes.yaml",
template.get().asFile.absolutePath,
"buf.build/google/cel-spec:${project.findProperty("cel.spec.version")}",
"--path",
"cel/expr/conformance/proto3",
Expand DownExpand Up@@ -184,6 +210,9 @@ tasks.register<Exec>("exportProtovalidateModule") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate,ref=$version"
}
inputs.files(buf)
inputs.property("protovalidateVersion", version)
outputs.dir("src/main/resources/buf")
commandLine(
buf.asPath,
"export",
Expand All@@ -196,7 +225,12 @@ tasks.register<Exec>("exportProtovalidateModule") {
tasks.register<Exec>("generateSources") {
dependsOn("exportProtovalidateModule", "filterBufGenYaml")
description = "Generates sources for the bufbuild/protovalidate module sources to build/generated/sources/bufgen."
commandLine(buf.asPath, "generate", "--template", "${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml", "src/main/resources")
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.dir("src/main/resources/buf")
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(buf.asPath, "generate", "--template", template.get().asFile.absolutePath, "src/main/resources")
}

tasks.register("generate") {
Expand All@@ -205,9 +239,16 @@ tasks.register("generate") {
"generateTestSources",
"generateSources",
"licenseHeader",
":conformance:generateConformance",
)
}

// src/main/resources and build/generated/sources/bufgen are generate-task outputs; consumers need explicit ordering.
tasks.named("processResources") { dependsOn("exportProtovalidateModule") }
tasks.matching { it.name == "sourcesJar" }.configureEach {
dependsOn("exportProtovalidateModule", "generateSources")
}

tasks.withType<JavaCompile> {
dependsOn("generate")
if (JavaVersion.current().isJava9Compatible) {
Expand DownExpand Up@@ -251,15 +292,18 @@ sourceSets {
}
test {
java {
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-imports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-noimports"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel"))
srcDir(layout.buildDirectory.dir("generated/test-sources/bufgen-cel-testtypes"))
}
}
}

apply(plugin = "com.diffplug.spotless")
configure<SpotlessExtension> {
java {
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen/**/*.java")
targetExclude("build/generated/sources/bufgen/build/buf/validate/**/*.java", "build/generated/test-sources/bufgen-*/**/*.java")
}
kotlinGradle {
ktlint()
Expand DownExpand Up@@ -319,8 +363,7 @@ mavenPublishing {
// - `JavadocJar.Empty()` publish an empty jar
// - `JavadocJar.Javadoc()` to publish standard javadocs
javadocJar = JavadocJar.Javadoc(),
// whether to publish a sources jar
sourcesJar = true,
sourcesJar = SourcesJar.Sources(),
),
)
pom {
Expand Down
1 change: 0 additions & 1 deletion conformance/buf.gen.yaml
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
version: v2
clean: true

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't needed and wasn't consistently set across other buf.gen.yaml files.

managed:
enabled: true
override:
Expand Down
8 changes: 7 additions & 1 deletion conformance/build.gradle.kts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,7 @@ val conformanceArgs = (project.findProperty("protovalidate.conformance.args")?.t
tasks.register<Exec>("installProtovalidateConformance") {
description = "Installs the Protovalidate Conformance CLI."
environment("GOBIN", conformanceCLIFile.parentFile.absolutePath)
inputs.property("protovalidateVersion", project.findProperty("protovalidate.version").toString())
outputs.file(conformanceCLIFile)
commandLine(
"go",
Expand DownExpand Up@@ -71,11 +72,16 @@ tasks.register<Exec>("generateConformance") {
if (!semverRegex.matches(version)) {
input = "https://github.com/bufbuild/protovalidate.git#subdir=proto/protovalidate-testing,ref=$version"
}
val template = layout.buildDirectory.file("buf-gen-templates/buf.gen.yaml")
inputs.files(buf)
inputs.file(template)
inputs.property("protovalidateVersion", version)
outputs.dir(layout.buildDirectory.dir("generated/sources/bufgen"))
commandLine(
buf.asPath,
"generate",
"--template",
"${layout.buildDirectory.get()}/buf-gen-templates/buf.gen.yaml",
template.get().asFile.absolutePath,
input,
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.testtypes.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,4 +6,4 @@ managed:
value: cel.expr.conformance.proto3
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel-testtypes
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.cel.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,4 +3,4 @@ managed:
enabled: true
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-cel
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.imports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,6 @@ managed:
value: com.example.imports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-imports
inputs:
- directory: src/test/resources/proto
2 changes: 1 addition & 1 deletion src/test/resources/proto/buf.gen.noimports.yaml
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ managed:
value: com.example.noimports
plugins:
- remote: buf.build/protocolbuffers/java:$protocJavaPluginVersion
out: build/generated/test-sources/bufgen
out: build/generated/test-sources/bufgen-noimports
inputs:
- directory: src/main/resources
- directory: src/test/resources/proto
Loading