Prepare 0.6.1 release (#34)

* Update actions/checkout action to v5 (#26)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update actions/setup-java action to v5

* Merge pull request #28 from OneLiteFeatherNET/feature/packageInfo

Overhaul NotNull annotation usage

* Update Gradle to v9.1.0

* Update dependency net.onelitefeather:mycelium-bom to v1.4.4 (#30)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update gradle/actions action to v5 (#31)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Update version from the Aves dependency

* Update dependency net.onelitefeather:mycelium-bom to v1.4.5 (#32)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

* Remove publishdata plugin usage (#33)

* Remove publish data definition

* Remove publish data usage

---------

Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com>

* Update publish trigger

* Bump patch version

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Phillipp Glanz <6745190+TheMeinerLP@users.noreply.github.com>
Co-authored-by: theEvilReaper <theEvilReaper@users.noreply.github.com>

Author: 3 people

.github/workflows/build-pr.yml

@@ -13,9 +13,9 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21

.github/workflows/main-build.yml

@@ -18,11 +18,11 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Validate Gradle Wrapper
-        uses: gradle/actions/wrapper-validation@v4
+        uses: gradle/actions/wrapper-validation@v5
       - name: Setup Java
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 21

.github/workflows/publish.yml

@@ -2,9 +2,8 @@ name: Publish JAR
 
 on:
   push:
-    branches:
-      - master
-      - develop
+    tags:
+      - '**'
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -13,12 +12,14 @@ jobs:
       ONELITEFEATHER_MAVEN_PASSWORD: ${{ secrets.ONELITEFEATHER_MAVEN_PASSWORD }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Set up JDK 21
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: '21'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
       - name: Build with Gradle
         run: ./gradlew build
       - name: Publish to Maven

build.gradle.kts

@@ -3,11 +3,10 @@ plugins {
     jacoco
     `java-library`
     `maven-publish`
-    alias(libs.plugins.publishdata)
 }
 
 group = "net.onelitefeather"
-version = "0.6.0"
+version = "0.6.1"
 
 java {
     toolchain {
@@ -31,13 +30,6 @@ dependencies {
     testRuntimeOnly(libs.junit.engine)
 }
 
-publishData {
-    addMainRepo("https://repo.onelitefeather.dev/onelitefeather-releases")
-    addMasterRepo("https://repo.onelitefeather.dev/onelitefeather-releases")
-    addSnapshotRepo("https://repo.onelitefeather.dev/onelitefeather-snapshots")
-    publishTask("jar")
-}
-
 tasks {
     compileJava {
         options.encoding = "UTF-8"
@@ -60,13 +52,10 @@ tasks {
 }
 
 publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            // configure the publication as defined previously.
-            publishData.configurePublication(this)
-            version = publishData.getVersion(false)
-        }
+    publications.create<MavenPublication>("maven") {
+        from(components["java"])
     }
+
     repositories {
         maven {
             authentication {
@@ -75,11 +64,12 @@ publishing {
                     password = System.getenv("ONELITEFEATHER_MAVEN_PASSWORD")
                 }
             }
-
             name = "OneLiteFeatherRepository"
-            // Get the detected repository from the publish data
-            url = uri(publishData.getRepository())
+            url = if (project.version.toString().contains("SNAPSHOT")) {
+                uri("https://repo.onelitefeather.dev/onelitefeather-snapshots")
+            } else {
+                uri("https://repo.onelitefeather.dev/onelitefeather-releases")
+            }
         }
     }
 }
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -1,12 +1,5 @@
 rootProject.name = "guira"
 
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven("https://eldonexus.de/repository/maven-public/")
-    }
-}
-
 dependencyResolutionManagement {
     repositories {
         mavenCentral()
@@ -28,9 +21,8 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("libs") {
-            version("aves", "1.11.1")
-            version("publishdata", "1.4.0")
-            version("bom", "1.4.3")
+            version("aves", "1.11.2")
+            version("bom", "1.4.5")
 
             library("mycelium.bom", "net.onelitefeather", "mycelium-bom").versionRef("bom")
 
@@ -43,8 +35,6 @@ dependencyResolutionManagement {
             library("junit.engine", "org.junit.jupiter", "junit-jupiter-engine").withoutVersion()
             library("junit.platform.launcher", "org.junit.platform", "junit-platform-launcher").withoutVersion()
             library("jetbrains.annotation", "org.jetbrains", "annotations").withoutVersion()
-
-            plugin("publishdata", "de.chojo.publishdata").versionRef("publishdata")
         }
     }
 }

gradlew.bat

@@ -2,7 +2,6 @@
 
 import net.onelitefeather.guira.data.SetupData;
 import org.jetbrains.annotations.Contract;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
 
@@ -27,7 +26,7 @@ public interface SetupDataService {
      * @return a new instance of SetupDataService
      */
     @Contract(pure = true)
-    static @NotNull SetupDataService create() {
+    static SetupDataService create() {
         return new SetupDataServiceImpl();
     }
 
@@ -50,30 +49,29 @@ public interface SetupDataService {
      * @param uuid the unique identifier for the setup data
      * @param data the setup data to add
      */
-    void add(@NotNull UUID uuid, @NotNull SetupData data);
+    void add(UUID uuid, SetupData data);
 
     /**
      * Removes the setup data associated with the given UUID.
      *
      * @param uuid the unique identifier for the setup data
      * @return an optional containing the removed setup data, or empty if not found
      */
-    @NotNull Optional<@Nullable SetupData> remove(@NotNull UUID uuid);
+    Optional<@Nullable SetupData> remove(UUID uuid);
 
     /**
      * Retrieves the setup data associated with the given UUID.
      *
      * @param uuid the unique identifier for the setup data
      * @return an optional containing the setup data, or empty if not found
      */
-    @NotNull Optional<@Nullable SetupData> get(@NotNull UUID uuid);
+    Optional<@Nullable SetupData> get(UUID uuid);
 
     /**
      * Returns an unmodifiable view of the setup data map.
      *
      * @return an unmodifiable view
      */
-    @NotNull
     @UnmodifiableView
     Map<UUID, SetupData> getView();
 }

settings.gradle.kts

@@ -1,7 +1,6 @@
 package net.onelitefeather.guira;
 
 import net.onelitefeather.guira.data.SetupData;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.UnmodifiableView;
 
 import java.util.Collections;
@@ -51,31 +50,31 @@ public boolean isEmpty() {
      * {@inheritDoc}
      */
     @Override
-    public void add(@NotNull UUID uuid, @NotNull SetupData data) {
+    public void add(UUID uuid, SetupData data) {
         dataMap.put(uuid, data);
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public @NotNull Optional<SetupData> remove(@NotNull UUID uuid) {
+    public Optional<SetupData> remove(UUID uuid) {
         return Optional.ofNullable(this.dataMap.remove(uuid));
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public @NotNull Optional<SetupData> get(@NotNull UUID uuid) {
+    public Optional<SetupData> get(UUID uuid) {
         return Optional.ofNullable(this.dataMap.get(uuid));
     }
 
     /**
      * {@inheritDoc}
      */
     @Override
-    public @NotNull @UnmodifiableView Map<UUID, SetupData> getView() {
+    public @UnmodifiableView Map<UUID, SetupData> getView() {
         return Collections.unmodifiableMap(this.dataMap);
     }
 }