From c4c03c12b23e6b5fa593418ca303391304d13fa9 Mon Sep 17 00:00:00 2001 From: Scott Dugas Date: Mon, 17 Mar 2025 10:50:29 -0400 Subject: [PATCH] Add missing explicit dependencies for gradle tasks The JMH one is a little surprising to me, as that is just a plugin. I basically just followed what gradle printed in the warnings. Also, I validated this locally running each task with a clean, e.g. ./gradlew clean :fdb-relational-cli:jar --warning-mode all on main, it fails because files don't exst, but on this branch they succeed. --- fdb-record-layer-jmh/fdb-record-layer-jmh.gradle | 4 ++++ fdb-relational-cli/fdb-relational-cli.gradle | 3 +++ 2 files changed, 7 insertions(+) diff --git a/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle b/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle index 4db5587e64..e67d5cfebf 100644 --- a/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle +++ b/fdb-record-layer-jmh/fdb-record-layer-jmh.gradle @@ -34,6 +34,10 @@ dependencies { testCompileOnly(libs.bundles.test.compileOnly) } +generateJmhProto { + dependsOn "extractIncludeProto" +} + jmh { environment = rootProject.ext.fdbEnvironment } diff --git a/fdb-relational-cli/fdb-relational-cli.gradle b/fdb-relational-cli/fdb-relational-cli.gradle index 3d3d85f759..0aef3da15c 100644 --- a/fdb-relational-cli/fdb-relational-cli.gradle +++ b/fdb-relational-cli/fdb-relational-cli.gradle @@ -84,6 +84,9 @@ jar { from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } } + + dependsOn ':fdb-extensions:jar' + dependsOn ':fdb-record-layer-core:jar' dependsOn ':fdb-relational-api:jar' dependsOn ':fdb-relational-core:jar' dependsOn ':fdb-relational-grpc:jar'