Fix publishing

rainbowdashlabs · rainbowdashlabs · commit 2fd15dd55338 · 2025-10-02T21:47:26.000+02:00
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 18
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 18
+          java-version: 21
       - name: Run Test Coverage
         run: ./gradlew jacocoTestReport
       - name: Generate JaCoCo Badge
diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
@@ -11,15 +11,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v5
-      - name: Set up JDK 18
+      - name: Set up JDK 21
         uses: actions/setup-java@v5
         with:
           distribution: adopt
-          java-version: 18
+          java-version: 21
       - name: Build Javadocs
         run: |
           echo "Building javadocs with gradle"
-          ./gradlew clean allJavadocs
+          ./gradlew clean javadoc
           echo "Moving to javadocs directory:"
           cd build/docs/javadoc
           echo "Creating .nojekyll to have Github pages deploy html as is:"
diff --git a/.github/workflows/publish_to_nexus.yml b/.github/workflows/publish_to_nexus.yml
@@ -27,9 +27,9 @@ jobs:
       - name: Test with Gradle
         run: ./gradlew test
       - name: Publish to Maven Central
-        run: ./gradlew publish -PforceSign=true
+        run: ./gradlew publishToMavenCentral --no-configuration-cache
         env:
-          ORG_GRADLE_PROJECT_sonatypeUsername: "${{ secrets.SONATYPE_USERNAME }}"
-          ORG_GRADLE_PROJECT_sonatypePassword: "${{ secrets.SONATYPE_PASSWORD }}"
-          ORG_GRADLE_PROJECT_rainbowdashlabsSigningKey: "${{ secrets.RAINBOWDASHLABS_SIGN_KEY }}"
-          ORG_GRADLE_PROJECT_rainbowdashlabsSigningPassword: "${{ secrets.RAINBOWDASHLABS_GPG_PASSWORD }}"
+          ORG_GRADLE_PROJECT_mavenCentralUsername: "${{ secrets.SONATYPE_USERNAME }}"
+          ORG_GRADLE_PROJECT_mavenCentralPassword: "${{ secrets.SONATYPE_PASSWORD }}"
+          ORG_GRADLE_PROJECT_signingInMemoryKey: "${{ secrets.RAINBOWDASHLABS_SIGN_KEY }}"
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: "${{ secrets.RAINBOWDASHLABS_GPG_PASSWORD }}"
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,19 +1,18 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
+import com.vanniktech.maven.publish.JavaLibrary
+import com.vanniktech.maven.publish.JavadocJar
+import com.vanniktech.maven.publish.SonatypeHost
 import de.chojo.PublishData
-/*import net.kyori.indra.IndraExtension
-import net.kyori.indra.IndraPlugin
-import net.kyori.indra.IndraPublishingPlugin*/
 
 plugins {
+    id("io.freefair.aggregate-javadoc") version("8.12.2.1")
     java
     `maven-publish`
     `java-library`
     alias(libs.plugins.spotless)
     alias(libs.plugins.publishdata)
-   /* alias(libs.plugins.indra.core)
-    alias(libs.plugins.indra.publishing)
-    alias(libs.plugins.indra.sonatype)*/
     jacoco
+    id("com.vanniktech.maven.publish") version "0.30.0"
 }
 publishData {
     useEldoNexusRepos(false)
@@ -65,6 +64,12 @@ allprojects {
         testImplementation("org.assertj:assertj-core:3.27.6")
     }
 
+    java{
+        toolchain{
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
+    }
+
     spotless {
         java {
             licenseHeaderFile(rootProject.file("HEADER.txt"))
@@ -129,39 +134,6 @@ allprojects {
     }
 }
 
-/*fun configureIndra(extension: IndraExtension) {
-    extension.javaVersions {
-        target(17)
-        testWith(17)
-    }
-
-    extension.github("eldoriarpg", "jackson-bukkit") {
-        ci(true)
-    }
-
-    extension.mitLicense()
-
-    extension.signWithKeyFromPrefixedProperties("rainbowdashlabs")
-
-    extension.configurePublications {
-        pom {
-            developers {
-                developer {
-                    id.set("rainbowdashlabs")
-                    name.set("Florian Fülling")
-                    email.set("mail@chojo.dev")
-                    url.set("https://github.com/rainbowdashlabs")
-                }
-                developer {
-                    id.set("yannicklamprecht")
-                    name.set("Yannick Lamprecht")
-                    url.set("https://github.com/yannicklamprecht")
-                }
-            }
-        }
-    }
-
-}*/
 
 subprojects {
     apply {
@@ -174,44 +146,111 @@ subprojects {
     if (project.name in publicProjects) {
         apply {
             plugin<MavenPublishPlugin>()
-            //plugin<IndraPlugin>()
-            //plugin<IndraPublishingPlugin>()
             plugin<SigningPlugin>()
         }
 
-        /*indra {
-            configureIndra(this)
-        }*/
     }
-}
+    afterEvaluate {
+        apply {
+            plugin<com.vanniktech.maven.publish.MavenPublishPlugin>()
+        }
 
-/*indra {
-    configureIndra(this)
+        mavenPublishing {
+            publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+            signAllPublications()
+
+            coordinates(groupId = "de.eldoria.jacksonbukkit", artifactId = project.name, version = publishData.getVersion())
+
+            pom {
+                name.set("jackson-bukkit")
+                description.set(project.description)
+                inceptionYear.set("2025")
+                url.set("https://github.com/eldoriarpg/jackson-bukkit")
+                licenses {
+                    license {
+                        name.set("LGPL-3.0")
+                        url.set("https://opensource.org/license/lgpl-3-0")
+                    }
+                }
+
+                developers {
+                    developer {
+                        id.set("rainbowdashlabs")
+                        name.set("Nora Fülling")
+                        email.set("mail@chojo.dev")
+                        url.set("https://github.com/rainbowdashlabs")
+                    }
+                }
+
+                scm {
+                    url.set("https://github.com/eldoriarpg/jackson-bukkit")
+                    connection.set("scm:git:git://github.com/eldoriarpg/jackson-bukkit.git")
+                    developerConnection.set("scm:git:ssh://github.com/eldoriarpg/jackson-bukkit.git")
+                }
+            }
+
+            configure(
+                JavaLibrary(
+                    javadocJar = JavadocJar.Javadoc(),
+                    sourcesJar = true
+                )
+            )
+        }
+
+    }
 }
 
-indraSonatype {
-    useAlternateSonatypeOSSHost("s01")
-}*/
+mavenPublishing {
+    publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+    signAllPublications()
+
+
+    coordinates(groupId = "de.eldoria.jacksonbukkit", artifactId = project.name, version = publishData.getVersion())
+
+    pom {
+        name.set("jackson-bukkit")
+        description.set(project.description)
+        inceptionYear.set("2025")
+        url.set("https://github.com/eldoriarpg/jackson-bukkit")
+        licenses {
+            license {
+                name.set("LGPL-3.0")
+                url.set("https://opensource.org/license/lgpl-3-0")
+            }
+        }
+
+        developers {
+            developer {
+                id.set("rainbowdashlabs")
+                name.set("Nora Fülling")
+                email.set("mail@chojo.dev")
+                url.set("https://github.com/rainbowdashlabs")
+            }
+        }
+
+        scm {
+            url.set("https://github.com/eldoriarpg/jackson-bukkit")
+            connection.set("scm:git:git://github.com/eldoriarpg/jackson-bukkit.git")
+            developerConnection.set("scm:git:ssh://github.com/eldoriarpg/jackson-bukkit.git")
+        }
+    }
+
+    configure(
+        JavaLibrary(
+            javadocJar = JavadocJar.Javadoc(),
+            sourcesJar = true
+        )
+    )
+}
 
 fun applyJavaDocOptions(options: MinimalJavadocOptions) {
     val javaDocOptions = options as StandardJavadocDocletOptions
     javaDocOptions.links(
-            "https://javadoc.io/doc/com.google.code.findbugs/jsr305/latest/",
-            "https://javadoc.io/doc/org.jetbrains/annotations/latest/",
-            "https://docs.oracle.com/en/java/javase/${java.toolchain.languageVersion.get().asInt()}/docs/api/",
-            "https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/latest/",
-            "https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-annotations/latest",
-            "https://javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/latest",
-            "https://jd.papermc.io/paper/1.19/"
+        "https://javadoc.io/doc/org.jetbrains/annotations/latest/",
+        "https://docs.oracle.com/en/java/javase/${java.toolchain.languageVersion.get().asInt()}/docs/api/"
     )
 }
 
-tasks {
-    register<Javadoc>("allJavadocs") {
-        applyJavaDocOptions(options)
-        setDestinationDir(file("${layout.buildDirectory}/docs/javadoc"))
-        val projects = project.rootProject.allprojects.filter { p -> publicProjects.contains(p.name) }
-        setSource(projects.map { p -> p.sourceSets.main.get().allJava })
-        classpath = files(projects.map { p -> p.sourceSets.main.get().compileClasspath })
-    }
+tasks.javadoc.configure {
+    applyJavaDocOptions(options)
 }
diff --git a/core/src/main/java/de/eldoria/jacksonbukkit/builder/ModuleBuilder.java b/core/src/main/java/de/eldoria/jacksonbukkit/builder/ModuleBuilder.java
@@ -19,7 +19,7 @@ public abstract class ModuleBuilder<T, V extends JacksonBukkitModule> {
      * Whether hex colors should be serialized as hex or not.
      */
     protected boolean hexColors = false;
-    protected NamespacedKeySerializer.Format namespacedKeyFormat;
+    protected NamespacedKeySerializer.Format namespacedKeyFormat = NamespacedKeySerializer.Format.OBJECT;
 
     /**
      * Serialize {@link org.bukkit.Color} as hex string.
diff --git a/paper/src/test/java/de/eldoria/jacksonbukkit/deserializer/ComponentGsonDeserializerTest.java b/paper/src/test/java/de/eldoria/jacksonbukkit/deserializer/ComponentGsonDeserializerTest.java
@@ -10,6 +10,7 @@
 import de.eldoria.jacksonbukkit.JacksonPaper;
 import de.eldoria.jacksonbukkit.PaperSerializationTest;
 import de.eldoria.jacksonbukkit.serializer.ComponentGsonSerializer;
+import de.eldoria.jacksonbukkit.serializer.NamespacedKeySerializer;
 import de.eldoria.jacksonbukkit.templates.ComponentTemplate;
 import net.kyori.adventure.text.Component;
 import org.junit.jupiter.api.Test;
@@ -23,7 +24,8 @@ public Module buildModule() {
         return new JacksonPaper(false,
                 false,
                 new ComponentGsonDeserializer(),
-                new ComponentGsonSerializer());
+                new ComponentGsonSerializer(),
+                NamespacedKeySerializer.Format.OBJECT);
     }
 
     @Test
diff --git a/paper/src/test/java/de/eldoria/jacksonbukkit/serializer/ComponentGsonSerializerTest.java b/paper/src/test/java/de/eldoria/jacksonbukkit/serializer/ComponentGsonSerializerTest.java
@@ -22,7 +22,8 @@ public Module buildModule() {
         return new JacksonPaper(false,
                 false,
                 new ComponentGsonDeserializer(),
-                new ComponentGsonSerializer());
+                new ComponentGsonSerializer(),
+                NamespacedKeySerializer.Format.OBJECT);
     }
 
     @Test

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ public Module buildModule() {`
`22`	`22`	`return new JacksonPaper(false,`
`23`	`23`	`false,`
`24`	`24`	`new ComponentGsonDeserializer(),`
`25`		`- new ComponentGsonSerializer());`
	`25`	`+ new ComponentGsonSerializer(),`
	`26`	`+ NamespacedKeySerializer.Format.OBJECT);`
`26`	`27`	`}`
`27`	`28`
`28`	`29`	`@Test`