Merge pull request #6462 from alvasw/gradle_move_protoc_build_logic_i…

…nto_own_build_gradle_file Gradle: Move protoc build-logic into its own build.gradle
bisq-network · Dec 18, 2022 · 959ac9a · 959ac9a
2 parents 51c7e40 + 5d30d44
commit 959ac9a
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 41 deletions.
diff --git a/build.gradle b/build.gradle
@@ -128,47 +128,6 @@ configure([project(':cli'),
     }
 }
 
-configure(project(':proto')) {
-    apply plugin: 'com.google.protobuf'
-
-    dependencies {
-        annotationProcessor libs.lombok
-        compileOnly libs.javax.annotation
-        compileOnly libs.lombok
-        implementation libs.logback.classic
-        implementation libs.logback.core
-        implementation libs.google.guava
-        implementation libs.protobuf.java
-        implementation libs.slf4j.api
-        implementation(libs.grpc.protobuf) {
-            exclude(module: 'animal-sniffer-annotations')
-            exclude(module: 'guava')
-        }
-        implementation(libs.grpc.stub) {
-            exclude(module: 'animal-sniffer-annotations')
-            exclude(module: 'guava')
-        }
-    }
-
-    sourceSets.main.java.srcDirs += [
-        'build/generated/source/proto/main/grpc',
-        'build/generated/source/proto/main/java'
-    ]
-
-    protobuf {
-        protoc {
-            artifact = "com.google.protobuf:protoc:${protocVersion}"
-        }
-        plugins {
-            grpc {
-                artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
-            }
-        }
-        generateProtoTasks {
-            all()*.plugins { grpc {} }
-        }
-    }
-}
 
 configure(project(':assets')) {
     dependencies {

diff --git a/proto/build.gradle b/proto/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'com.google.protobuf'
+
+dependencies {
+    annotationProcessor libs.lombok
+    compileOnly libs.javax.annotation
+    compileOnly libs.lombok
+    implementation libs.logback.classic
+    implementation libs.logback.core
+    implementation libs.google.guava
+    implementation libs.protobuf.java
+    implementation libs.slf4j.api
+    implementation(libs.grpc.protobuf) {
+        exclude(module: 'animal-sniffer-annotations')
+        exclude(module: 'guava')
+    }
+    implementation(libs.grpc.stub) {
+        exclude(module: 'animal-sniffer-annotations')
+        exclude(module: 'guava')
+    }
+}
+
+sourceSets.main.java.srcDirs += [
+    'build/generated/source/proto/main/grpc',
+    'build/generated/source/proto/main/java'
+]
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:${protocVersion}"
+    }
+    plugins {
+        grpc {
+            artifact = "io.grpc:protoc-gen-grpc-java:${grpcVersion}"
+        }
+    }
+    generateProtoTasks {
+        all()*.plugins { grpc {} }
+    }
+}