bufbuild
diff --git a/‎build.gradle.kts
Lines changed: 2 additions & 4 deletions b/‎build.gradle.kts
Lines changed: 2 additions & 4 deletions
diff --git a/‎conformance/src/main/java/build/buf/validate/conformance/cases/custom_constraints/CustomConstraintsProto.java
Lines changed: 30 additions & 25 deletions b/‎conformance/src/main/java/build/buf/validate/conformance/cases/custom_constraints/CustomConstraintsProto.java
Lines changed: 30 additions & 25 deletions
diff --git a/‎conformance/src/main/java/build/buf/validate/conformance/cases/custom_constraints/FieldExpressions.java
Lines changed: 66 additions & 0 deletions b/‎conformance/src/main/java/build/buf/validate/conformance/cases/custom_constraints/FieldExpressions.java
Lines changed: 66 additions & 0 deletions
diff --git a/‎conformance/src/main/java/build/buf/validate/conformance/cases/custom_constraints/FieldExpressionsOrBuilder.java
Lines changed: 6 additions & 0 deletions b/‎conformance/src/main/java/build/buf/validate/conformance/cases/custom_constraints/FieldExpressionsOrBuilder.java
Lines changed: 6 additions & 0 deletions
@@ -97,8 +97,7 @@ tasks.register<Exec>("exportProtovalidateModule") {
     commandLine(
         buf.asPath,
         "export",
-        // TODO: DO NOT MERGE
-        "buf.build/jchadwick-buf/protovalidate:fd74cad4128d4294812fe3ad3fac0e2f",
+        "buf.build/bufbuild/protovalidate:${project.findProperty("protovalidate.version")}",
         "--output",
         "src/main/resources",
     )
@@ -120,8 +119,7 @@ tasks.register<Exec>("generateConformance") {
         "conformance/buf.gen.yaml",
         "-o",
         "conformance/",
-        // TODO: DO NOT MERGE
-        "buf.build/bufbuild/protovalidate-testing:v0.8.2",
+        "buf.build/bufbuild/protovalidate-testing:${project.findProperty("protovalidate.version")}",
     )
 }
Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,7 @@ tasks.register<Exec>("exportProtovalidateModule") {`
`97`	`97`	`commandLine(`
`98`	`98`	`buf.asPath,`
`99`	`99`	`"export",`
`100`		`- // TODO: DO NOT MERGE`
`101`		`- "buf.build/jchadwick-buf/protovalidate:fd74cad4128d4294812fe3ad3fac0e2f",`
	`100`	`+ "buf.build/bufbuild/protovalidate:${project.findProperty("protovalidate.version")}",`
`102`	`101`	`"--output",`
`103`	`102`	`"src/main/resources",`
`104`	`103`	`)`
`@@ -120,8 +119,7 @@ tasks.register<Exec>("generateConformance") {`
`120`	`119`	`"conformance/buf.gen.yaml",`
`121`	`120`	`"-o",`
`122`	`121`	`"conformance/",`
`123`		`- // TODO: DO NOT MERGE`
`124`		`- "buf.build/bufbuild/protovalidate-testing:v0.8.2",`
	`122`	`+ "buf.build/bufbuild/protovalidate-testing:${project.findProperty("protovalidate.version")}",`
`125`	`123`	`)`
`126`	`124`	`}`
`127`	`125`