refactor: reorganization

.dockerignore

@@ -1,3 +1,5 @@
 .idea/
 .gradle/
 build/
+java/
+

.mise.toml

@@ -1,7 +1,6 @@
 [tools]
 task = "3.38.0"
 go = "1.22.5"
-protoc = "27.2"
 act = "0.2.64"
-java = "temurin-11.0.24+8"
 "go:github.com/psampaz/go-mod-outdated" = "0.9.0"
+

.gitignore → java/.gitignore

@@ -1,2 +1,3 @@
 .gradle/
 build/
+

java/.mise.toml

@@ -0,0 +1,4 @@
+[tools]
+task = "3.38.0"
+java = "temurin-11.0.24+8"
+go = "1.22.5"

java/build.gradle.kts

@@ -0,0 +1,43 @@
+plugins {
+    `maven-publish`
+    id("com.autonomousapps.dependency-analysis") version "1.32.0"
+    id("com.diffplug.spotless") version "6.25.0"
+    id("com.github.ben-manes.versions") version "0.51.0"
+    id("com.gradleup.nmcp") version "0.0.9"
+    id("se.ascp.gradle.gradle-versions-filter") version "0.1.16"
+}
+
+subprojects {
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.github.ben-manes.versions")
+    apply(plugin = "se.ascp.gradle.gradle-versions-filter")
+
+    publishing {
+        repositories {
+            maven {
+                name = "build"
+                url = uri(rootProject.layout.buildDirectory.dir("repo"))
+            }
+        }
+    }
+
+    versionsFilter {
+        gradleReleaseChannel.set("current")
+        checkConstraints.set(true)
+        outPutFormatter.set("json")
+    }
+}
+
+nmcp {
+    publishAggregation {
+        username = project.properties["mavenCentralUsername"] as String?
+        password = project.properties["mavenCentralPassword"] as String?
+        publicationType = "AUTOMATIC"
+    }
+}
+
+versionsFilter {
+    gradleReleaseChannel.set("current")
+    checkConstraints.set(true)
+    outPutFormatter.set("json")
+}

buildSrc/build.gradle.kts → java/buildSrc/build.gradle.kts

@@ -9,4 +9,4 @@ gradlePlugin {
             implementationClass = "io.github.ngyewch.protoc.plugin.ProtocPlugin"
         }
     }
-}
+}

buildSrc/src/main/java/io/github/ngyewch/protoc/plugin/ProtocPlugin.java → java/buildSrc/src/main/java/io/github/ngyewch/protoc/plugin/ProtocPlugin.java

@@ -104,7 +104,7 @@ public void apply(Project project) {
                           outputAscFile.getParentFile().mkdirs();
                         });
                     task.getOutputs().file(outputExeFile);
-                    task.commandLine("go", "build", "-o", outputExeFile);
+                    task.commandLine("go", "build", "-o", outputExeFile, "../..");
                     task.environment("GOOS", buildParameters.getGoos());
                     task.environment("GOARCH", buildParameters.getGoarch());
                   });

java/gradle.properties

@@ -0,0 +1,2 @@
+group=io.github.ngyewch.twirp
+version=0.1.1

build.gradle.kts → java/protoc-gen-twirp-java/build.gradle.kts

@@ -1,30 +1,12 @@
 plugins {
-    `java-library`
     `maven-publish`
     signing
     id("com.gradleup.nmcp") version "0.0.9"
     id("io.github.ngyewch.protoc.plugin")
-    id("com.autonomousapps.dependency-analysis") version "1.32.0"
-    id("com.diffplug.spotless") version "6.25.0"
-    id("com.github.ben-manes.versions") version "0.51.0"
-    id("se.ascp.gradle.gradle-versions-filter") version "0.1.16"
-}
-
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    api(platform("com.google.protobuf:protobuf-bom:4.27.2"))
-    api(platform("io.helidon:helidon-bom:2.6.7"))
-
-    api("com.google.protobuf:protobuf-java")
-    implementation("com.google.protobuf:protobuf-java-util")
-    api("io.helidon.common:helidon-common-http")
-    implementation("io.helidon.common:helidon-common-reactive")
-    implementation("io.helidon.media:helidon-media-common")
-    implementation("io.helidon.webclient:helidon-webclient")
-    api("io.helidon.webserver:helidon-webserver")
+    //id("com.autonomousapps.dependency-analysis") version "1.32.0"
+    //id("com.diffplug.spotless") version "6.25.0"
+    //id("com.github.ben-manes.versions") version "0.51.0"
+    //id("se.ascp.gradle.gradle-versions-filter") version "0.1.16"
 }
 
 publishing {
@@ -60,23 +42,27 @@ publishing {
             }
         }
     }
+    /*
     repositories {
         maven {
             name = "build"
             url = uri(layout.buildDirectory.dir("repo"))
         }
     }
+    */
 }
 
 signing {
     useGpgCmd()
     sign(publishing.publications["maven"])
 }
 
+/*
 nmcp {
     publishAllPublications {
         username = project.properties["mavenCentralUsername"] as String?
         password = project.properties["mavenCentralPassword"] as String?
         publicationType = "AUTOMATIC"
     }
 }
+*/

java/settings.gradle.kts

@@ -0,0 +1,8 @@
+rootProject.name = "twirp"
+
+rootDir.listFiles()?.filter { f ->
+    f.isDirectory && (f.name != "buildSrc")
+            && (File(f, "build.gradle").isFile || File(f, "build.gradle.kts").isFile)
+}?.forEach { f ->
+    include(f.name)
+}

java/twirp-bom/build.gradle.kts

@@ -0,0 +1,61 @@
+plugins {
+    `java-platform`
+    `maven-publish`
+    signing
+}
+
+javaPlatform {
+    allowDependencies()
+}
+
+dependencies {
+    api(platform("com.google.protobuf:protobuf-bom:4.27.2"))
+    api(platform("io.helidon:helidon-bom:2.6.7"))
+
+    constraints {
+        api(project(":twirp-common"))
+        api(project(":twirp-helidon-common"))
+        api(project(":twirp-helidon-client"))
+        api(project(":twirp-helidon-server"))
+    }
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = project.group as String
+            artifactId = project.name
+            version = project.version as String
+
+            from(components["javaPlatform"])
+
+            pom {
+                name = project.name
+                description = "Twirp BOM."
+                url = "https://github.com/ngyewch/protoc-gen-twirp-java"
+                licenses {
+                    license {
+                        name = "MIT License"
+                        url = "https://github.com/ngyewch/protoc-gen-twirp-java/blob/main/LICENSE"
+                    }
+                }
+                scm {
+                    connection = "scm:git:git@github.com:ngyewch/protoc-gen-twirp-java.git"
+                    developerConnection = "scm:git:git@github.com:ngyewch/protoc-gen-twirp-java.git"
+                    url = "https://github.com/ngyewch/protoc-gen-twirp-java"
+                }
+                developers {
+                    developer {
+                        id.set("ngyewch")
+                        name.set("Nick Ng")
+                    }
+                }
+            }
+        }
+    }
+}
+
+signing {
+    useGpgCmd()
+    sign(publishing.publications["maven"])
+}

java/twirp-common/build.gradle.kts

@@ -0,0 +1,63 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    signing
+    id("com.diffplug.spotless")
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+repositories {
+    mavenCentral()
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = project.group as String
+            artifactId = project.name
+            version = project.version as String
+
+            from(components["java"])
+
+            pom {
+                name = project.name
+                description = "Twirp common."
+                url = "https://github.com/ngyewch/protoc-gen-twirp-java"
+                licenses {
+                    license {
+                        name = "MIT License"
+                        url = "https://github.com/ngyewch/protoc-gen-twirp-java/blob/main/LICENSE"
+                    }
+                }
+                scm {
+                    connection = "scm:git:git@github.com:ngyewch/protoc-gen-twirp-java.git"
+                    developerConnection = "scm:git:git@github.com:ngyewch/protoc-gen-twirp-java.git"
+                    url = "https://github.com/ngyewch/protoc-gen-twirp-java"
+                }
+                developers {
+                    developer {
+                        id.set("ngyewch")
+                        name.set("Nick Ng")
+                    }
+                }
+            }
+        }
+    }
+}
+
+signing {
+    useGpgCmd()
+    sign(publishing.publications["maven"])
+}
+
+spotless {
+    java {
+        googleJavaFormat("1.18.1").reflowLongStrings().skipJavadocFormatting()
+        formatAnnotations()
+        targetExclude("build/**")
+    }
+}

java/twirp-common/src/main/java/io/github/ngyewch/twirp/Constants.java

@@ -0,0 +1,6 @@
+package io.github.ngyewch.twirp;
+
+public class Constants {
+  public static final String PROTOBUF_CONTENT_TYPE = "application/protobuf";
+  public static final String JSON_CONTENT_TYPE = "application/json";
+}

java/twirp-helidon-client/build.gradle.kts

@@ -0,0 +1,75 @@
+plugins {
+    `java-library`
+    `maven-publish`
+    signing
+    id("com.diffplug.spotless")
+}
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    api(platform(project(":twirp-bom")))
+
+    implementation(project(":twirp-helidon-common"))
+
+    api("com.google.protobuf:protobuf-java")
+    implementation("com.google.protobuf:protobuf-java-util")
+    api("io.helidon.common:helidon-common-http")
+    implementation("io.helidon.common:helidon-common-reactive")
+    implementation("io.helidon.webclient:helidon-webclient")
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = project.group as String
+            artifactId = project.name
+            version = project.version as String
+
+            from(components["java"])
+
+            pom {
+                name = project.name
+                description = "Twirp Helidon client."
+                url = "https://github.com/ngyewch/protoc-gen-twirp-java"
+                licenses {
+                    license {
+                        name = "MIT License"
+                        url = "https://github.com/ngyewch/protoc-gen-twirp-java/blob/main/LICENSE"
+                    }
+                }
+                scm {
+                    connection = "scm:git:git@github.com:ngyewch/protoc-gen-twirp-java.git"
+                    developerConnection = "scm:git:git@github.com:ngyewch/protoc-gen-twirp-java.git"
+                    url = "https://github.com/ngyewch/protoc-gen-twirp-java"
+                }
+                developers {
+                    developer {
+                        id.set("ngyewch")
+                        name.set("Nick Ng")
+                    }
+                }
+            }
+        }
+    }
+}
+
+signing {
+    useGpgCmd()
+    sign(publishing.publications["maven"])
+}
+
+spotless {
+    java {
+        googleJavaFormat("1.18.1").reflowLongStrings().skipJavadocFormatting()
+        formatAnnotations()
+        targetExclude("build/**")
+    }
+}