eldoriarpg
diff --git a/‎.github/badges/branches.svg‎
Lines changed: 1 addition & 1 deletion b/‎.github/badges/branches.svg‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/badges/jacoco.svg‎
Lines changed: 1 addition & 1 deletion b/‎.github/badges/jacoco.svg‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/coverage.yml‎
Lines changed: 5 additions & 5 deletions b/‎.github/workflows/coverage.yml‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎.github/workflows/javadocs.yml‎
Lines changed: 5 additions & 5 deletions b/‎.github/workflows/javadocs.yml‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎.github/workflows/publish_to_nexus.yml‎
Lines changed: 9 additions & 12 deletions b/‎.github/workflows/publish_to_nexus.yml‎
Lines changed: 9 additions & 12 deletions
diff --git a/‎.github/workflows/verify.yml‎
Lines changed: 5 additions & 4 deletions b/‎.github/workflows/verify.yml‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎1.16-testing/build.gradle.kts‎
Lines changed: 5 additions & 9 deletions b/‎1.16-testing/build.gradle.kts‎
Lines changed: 5 additions & 9 deletions
diff --git a/‎build.gradle.kts‎
Lines changed: 123 additions & 72 deletions b/‎build.gradle.kts‎
Lines changed: 123 additions & 72 deletions
@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 18
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v5
+      - 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
@@ -48,7 +48,7 @@ jobs:
           branch: dev
 
       - name: Upload JaCoCo coverage report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: jacoco-report
           path: |
 
@@ -10,16 +10,16 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 18
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v5
+      - 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:"
 
@@ -5,9 +5,6 @@ on:
   push:
     branches:
       - main
-      - dev*
-      - feature/*
-      - fix/*
 
 jobs:
   publish-central:
@@ -16,20 +13,20 @@ jobs:
     name: Publish to Maven Central
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 18
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v5
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 18
+          java-version: 21
       - name: Build with Gradle
         run: ./gradlew --build-cache build
       - 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 }}"
@@ -7,12 +7,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 18
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v5
+      - name: Set up JDK 21
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 18
+          java-version: 21
+          architecture: x64
       - name: Build with Gradle
         run: ./gradlew --build-cache build
       - name: Test with Gradle
 
@@ -1,14 +1,10 @@
-repositories {
-    maven("https://eldonexus.de/repository/codemc-nms/")
-}
+
 
 dependencies {
     testImplementation(project(":core"))
-    implementation("com.destroystokyo.paper:paper-api:1.16.5-R0.1-20211218.081530-231")
-    testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml")
-    testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-toml")
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
-    testImplementation("org.assertj:assertj-core:3.24.2")
+    implementation("com.destroystokyo.paper:paper-api:1.16.5-R0.1-SNAPSHOT")
+    testImplementation(libs.bundles.jackson)
+    testImplementation(testlibs.bundles.unittests)
     implementation(project(":testing"))
-    testImplementation("com.github.seeseemelk", "MockBukkit-v1.19", "2.29.0")
+    testImplementation("com.github.seeseemelk", "MockBukkit-v1.19", "3.1.0")
 }
@@ -1,23 +1,21 @@
 import com.diffplug.gradle.spotless.SpotlessPlugin
+import com.vanniktech.maven.publish.JavaLibrary
+import com.vanniktech.maven.publish.JavadocJar
 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.14.2")
     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.34.0"
 }
 publishData {
     useEldoNexusRepos(false)
-    publishingVersion = "1.2.0"
+    publishingVersion = "1.3.0"
 }
 version = publishData.getVersion()
 
@@ -47,9 +45,9 @@ allprojects {
     }
 
     dependencies {
-        api("org.jetbrains", "annotations", "24.0.1")
+        api("org.jetbrains", "annotations", "26.0.2-1")
 
-        api(platform("com.fasterxml.jackson:jackson-bom:2.15.2"))
+        api(platform("com.fasterxml.jackson:jackson-bom:2.20.0"))
         api("com.fasterxml.jackson.core", "jackson-core")
         api("com.fasterxml.jackson.core:jackson-databind")
 
@@ -59,10 +57,16 @@ allprojects {
         testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-toml")
 
         // junit and stuff
-        testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.3")
-        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
-        testImplementation("org.mockito:mockito-core:5.3.1")
-        testImplementation("org.assertj:assertj-core:3.24.2")
+        testImplementation("org.junit.jupiter:junit-jupiter-api:6.0.0")
+        testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.0.0")
+        testImplementation("org.mockito:mockito-core:5.20.0")
+        testImplementation("org.assertj:assertj-core:3.27.6")
+    }
+
+    java {
+        toolchain {
+            languageVersion.set(JavaLanguageVersion.of(21))
+        }
     }
 
     spotless {
@@ -73,7 +77,7 @@ allprojects {
     }
 
     jacoco {
-        toolVersion = "0.8.10"
+        toolVersion = "0.8.13"
     }
 
     tasks {
@@ -129,39 +133,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,45 +145,125 @@ 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>()
         }
+
+        mavenPublishing {
+            publishToMavenCentral()
+            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")
+                    }
+                    developer {
+                        id.set("yannicklamprecht")
+                        name.set("Yannick Lamprecht")
+                        url.set("https://github.com/yannicklamprecht")
+                    }
+                }
+
+                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
+                )
+            )
+        }
+
     }
 }
 
-indra {
-    configureIndra(this)
-}
+mavenPublishing {
+    publishToMavenCentral()
+    signAllPublications()
+
 
-indraSonatype {
-    useAlternateSonatypeOSSHost("s01")
+    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")
+            }
+            developer {
+                id.set("yannicklamprecht")
+                name.set("Yannick Lamprecht")
+                url.set("https://github.com/yannicklamprecht")
+            }
+        }
+
+        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)
-
-        destinationDir = file("${buildDir}/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)
 }