rework structure for better build.gradle

Author: ajuvercr

.gitmodules

@@ -1,8 +1,152 @@
-allprojects {
-    group = 'io.github.rdf-connect'
-    version = '0.0.3'
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
+}
+
+group = "io.github.rdf-connect"
+version = "0.0.3"
+
+repositories {
+    mavenCentral()
+	maven { url 'https://jitpack.io' }
+}
+
+sourceSets {
+    runner {
+        java.srcDir 'src/runner/java'
+    }
+    types {
+        java.srcDir 'src/types/java'
+    }
+}
+
+// --- Dependencies (generated proto needs protobuf runtime) ---
+dependencies {
+    runnerImplementation sourceSets.types.output
+	runnerImplementation 'com.github.rdf-connect:proto:9700abd'
+
+    runnerImplementation 'com.fasterxml.jackson.core:jackson-core:2.18.3'
+    runnerImplementation 'com.fasterxml.jackson.core:jackson-databind:2.18.3'
+
+    runnerImplementation 'javax.annotation:javax.annotation-api:1.3.2'
+    runnerImplementation 'io.grpc:grpc-netty:1.63.0' // or latest version
+    runnerImplementation 'io.grpc:grpc-protobuf:1.63.0'
+    runnerImplementation 'io.grpc:grpc-stub:1.63.0'
+    runnerImplementation 'io.grpc:grpc-core:1.63.0'
+
+    runnerImplementation 'com.google.protobuf:protobuf-java:4.28.2'
+    typesImplementation 'com.google.protobuf:protobuf-java:4.28.2'
+
+    // For logging, optional
+    implementation 'org.slf4j:slf4j-simple:2.0.12'
+
+}
+
+// --- Utility tasks for sources/javadoc jars ---
+def sourcesJarFor = { SourceSet set, String taskName, String name ->
+    tasks.register("${taskName}SourcesJar", Jar) {
+        archiveBaseName = name
+        archiveClassifier = "sources"
+        from set.allSource
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+}
+
+def javadocJarFor = { SourceSet set, String taskName, String name ->
+    def javadocTask = tasks.register("${taskName}Javadoc", Javadoc) {
+        source = set.allJava
+        classpath = set.compileClasspath
+    }
+
+    tasks.register("${taskName}JavadocJar", Jar) {
+        archiveBaseName = name
+        archiveClassifier = "javadoc"
+        from javadocTask.map { it.destinationDir }
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    }
+}
+
+// Fat jar tasks per source set
+tasks.register('runnerFatJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {
+    archiveClassifier.set('all')
+    from sourceSets.runner.output
+    configurations = [project.configurations.runnerRuntimeClasspath]
+}
+
+// --- Jar tasks ---
+tasks.register("runnerJar", Jar) {
+    archiveBaseName = "jvm-runner"
+    from sourceSets.runner.output
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+tasks.register("typesJar", Jar) {
+    archiveBaseName = "types"
+    from sourceSets.types.output
+}
+tasks.register("descriptorArtifact", Jar) {
+    archiveBaseName = "index"
+    from("index.ttl") { into "" }
+}
+
+// --- Sources/javadoc tasks ---
+sourcesJarFor(sourceSets.runner, "runner", "jvm-runner")
+sourcesJarFor(sourceSets.types, "types", "types")
+
+javadocJarFor(sourceSets.runner, "runner", "jvm-runner")
+javadocJarFor(sourceSets.types, "types", "types")
+
+// --- Publishing ---
+publishing {
+    publications {
+        runner(MavenPublication) {
+            artifact tasks.runnerJar
+            artifact tasks.runnerSourcesJar
+            artifact tasks.runnerJavadocJar
+            groupId = project.group
+            artifactId = "jvm-runner"
+            version = project.version
+
+            pom.withXml {
+                def dependenciesNode = asNode().appendNode('dependencies')
+                configurations.runnerImplementation.allDependencies.each { dep ->
+                    if (dep.group && dep.name && dep.version) {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        dependencyNode.appendNode('groupId', dep.group)
+                        dependencyNode.appendNode('artifactId', dep.name)
+                        dependencyNode.appendNode('version', dep.version)
+                    }
+                }
+            }
+        }
+        types(MavenPublication) {
+            artifact tasks.typesJar
+            artifact tasks.typesSourcesJar
+            artifact tasks.typesJavadocJar
+            groupId = project.group
+            artifactId = "types"
+            version = project.version
+        }
+        descriptor(MavenPublication) {
+            artifact tasks.descriptorArtifact
+            groupId = project.group
+            artifactId = "descriptor"
+            version = project.version
+        }
+    }
 
     repositories {
-        mavenCentral()
+        maven {
+            url = uri("$buildDir/repo") // local repo test
+        }
     }
 }
+
+build {
+    dependsOn runnerJar, typesJar
+    dependsOn runnerFatJar
+    dependsOn runnerSourcesJar, typesSourcesJar // , runnerJavadocJar
+}
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}

app/build.gradle

@@ -1,16 +1,3 @@
-/*
- * This file was generated by the Gradle 'init' task.
- *
- * The settings file is used to specify which projects to include in your build.
- * For more detailed information on multi-project builds, please refer to https://docs.gradle.org/8.14.3/userguide/multi_project_builds.html in the Gradle documentation.
- */
-
-plugins {
-    // Apply the foojay-resolver plugin to allow automatic download of JDKs
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
-}
 
 rootProject.name = 'jvm-runner'
-include('app', 'types')
-project(':types').projectDir = file('types/lib')