Merge pull request #5692 from kwvanderlinde/refactor/3777-protobuf

Move protobuf messages into a separate subproject

Author: cwisniew

build.gradle

@@ -18,7 +18,6 @@ plugins {
     alias(libs.plugins.git.version)
     alias(libs.plugins.javafx)
     alias(libs.plugins.jpackage.runtime)
-    alias(libs.plugins.protobuf)
     alias(libs.plugins.shadow)
 
     alias(libs.plugins.spotless) apply false
@@ -137,21 +136,6 @@ javafx {
     modules = ['javafx.base', 'javafx.controls', 'javafx.media', 'javafx.swing', 'javafx.web', 'javafx.fxml', 'javafx.graphics']
 }
 
-protobuf {
-    protoc {
-        artifact = libs.protobuf.protoc.get()
-    }
-}
-
-// Inform IDEs like IntelliJ IDEA, Eclipse or NetBeans about the generated code.
-sourceSets {
-    main {
-        java {
-            srcDirs 'build/generated/sources/proto/main/java'
-        }
-    }
-}
-
 run {
     args = ['-v=' + appSemVer]
     // Add -Dlog4j2.debug to see log4j2 details
@@ -363,6 +347,7 @@ def zipJpackageImage = tasks.register('zipJpackageImage', Zip) {
 dependencies {
     implementation project(':common')
     implementation project(':clientserver')
+    implementation project(':messages')
 
     implementation(libs.bundles.log4j)
     implementation(libs.slf4j.simple)
@@ -372,7 +357,6 @@ dependencies {
     implementation(libs.servicediscovery)
     implementation(libs.upnplib)
     implementation(libs.okhttp)
-    implementation(libs.protobuf.java)
 
     implementation(libs.bundles.imageio)
     implementation(libs.batik)

messages/build.gradle

@@ -0,0 +1,37 @@
+buildscript {
+    dependencies {
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
+    }
+}
+
+
+plugins {
+    id "base"
+    id "java-library"
+
+    alias(libs.plugins.protobuf)
+}
+
+apply from: rootProject.file('buildSrc/shared.gradle')
+
+// In this section you declare the dependencies for your production and test code
+dependencies {
+    // Must be `api` so all consumers can access protobuf types.
+    api(libs.protobuf.java)
+}
+
+
+protobuf {
+    protoc {
+        artifact = libs.protobuf.protoc.get()
+    }
+}
+
+// Inform IDEs like IntelliJ IDEA, Eclipse or NetBeans about the generated code.
+sourceSets {
+    main {
+        java {
+            srcDirs layout.buildDirectory.dir('generated/sources/proto/main/java')
+        }
+    }
+}

src/main/proto/data_transfer_objects.proto renamed to messages/src/main/proto/data_transfer_objects.proto

@@ -16,4 +16,4 @@ include 'services:webservice'
 */
 
 rootProject.name = 'MapTool'
-include 'common', ':clientserver'
+include 'common', 'messages', ':clientserver'