Merge pull request #595 from nsacyber/v3_protobuf-plugin

Use protobuf-gradle-plugin to replace a system dependency
nsacyber · Sep 30, 2023 · 08b0d66 · 08b0d66
2 parents 23d3d61 + b3481f1
commit 08b0d66
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/HIRS_AttestationCA/build.gradle b/HIRS_AttestationCA/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id 'io.spring.dependency-management' version '1.1.0'
+    id 'com.google.protobuf' version '0.9.4'
 }
 
 java {
@@ -50,13 +51,18 @@ dependencies {
     annotationProcessor libs.lombok
 }
 
-task generateProtoBuf(type:Exec) {
-    workingDir 'config'
-
-    commandLine './genJavaProtoBuf.sh'
+protobuf {
+  protoc {
+    artifact = 'com.google.protobuf:protoc:3.24.3'
+  }
+}
+sourceSets {
+  main {
+    proto {
+      srcDir '../HIRS_ProvisionerTPM2/src'
+    }
+  }
 }
-
-compileJava.dependsOn generateProtoBuf
 
 test {
     useJUnitPlatform()