Resolve merge conflicts 1

Signed-off-by: James Simon <jamsimox@amazon.com>
Change-Id: I414d87b42e6a1182f7ad439a28284efde2c607e0

1 files changed, 31 insertions, 1 deletions

diff --git a/build.gradle b/build.gradle
index 35a2d79..cb383ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -68,4 +68,34 @@ protobuf {
             }
        } 
     }
-    }
\ No newline at end of file
+    }
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.22.0'
+    }
+    plugins {
+        grpc {
+            artifact = 'io.grpc:protoc-gen-grpc-java:1.53.0'
+        }
+        doc { 
+            artifact = "io.github.pseudomuto:protoc-gen-doc:1.5.1"
+        }
+    }
+    generateProtoTasks {
+        processResources() {
+    duplicatesStrategy = 'EXCLUDE'
+}
+        all().each { task -> 
+        task.builtins {
+               java {}
+               cpp {}
+        } 
+        task.plugins{   
+           // grpc {}
+             doc { 
+            //option 'html, index.html'
+            option 'markdown, v2c.md'
+                }
+            }
+       } 
+    }
+    
\ No newline at end of file