feat(node+bukkit+bungeecord): Update to CloudNet 4.0.0-RC11

This patch updates the sample project to target the newly release CloudNet version 4.0.0-RC11. In doing so, this project now requires to be built with Java SDK 23 or newer. In addition, the Gradle samples have moved to a version catalog to ease the management and updates of dependencies and keeps all dependency versions in sync. Due to the latest update, the RPC samples have been updated as well.
MoinCraft · Oct 19, 2024 · 3932a55 · 3932a55
1 parent e40da9e
commit 3932a55
Show file tree

Hide file tree

Showing 16 changed files with 108 additions and 72 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 21
+      - name: Set up JDK 23
         uses: actions/setup-java@v3
         with:
-          java-version: '21'
+          java-version: '23'
           distribution: 'temurin'
           cache: maven
       - name: Build with Maven
@@ -28,10 +28,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Setup up JDK 21
+      - name: Setup up JDK 23
         uses: actions/setup-java@v3
         with:
-          java-version: '21'
+          java-version: '23'
           distribution: 'temurin'
           cache: gradle
       - name: Build with Gradle

diff --git a/gradle/bukkit/plugin/build.gradle.kts b/gradle/bukkit/plugin/build.gradle.kts
@@ -15,17 +15,13 @@ repositories {
 }
 
 dependencies {
-    // Spigot
-    val spigotVersion = "1.21-R0.1-SNAPSHOT"
-    implementation("org.spigotmc", "spigot-api", spigotVersion)
+    // BOMs
+    implementation(platform(libs.cloudnet.bom))
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 
-    // CloudNet
-    val cloudNetVersion = "4.0.0-RC10"
-    implementation(platform("eu.cloudnetservice.cloudnet:bom:$cloudNetVersion"))
-    implementation("eu.cloudnetservice.cloudnet", "bridge")
-    implementation("eu.cloudnetservice.cloudnet", "wrapper-jvm")
-    implementation("eu.cloudnetservice.cloudnet", "platform-inject-api")
-    annotationProcessor("eu.cloudnetservice.cloudnet", "platform-inject-processor", cloudNetVersion)
+    implementation(libs.bundles.spigot.plugin)
+    annotationProcessor(libs.cloudnet.platform.inject.processor)
 }
 
 tasks.test {

diff --git a/gradle/bungeecord/plugin/build.gradle.kts b/gradle/bungeecord/plugin/build.gradle.kts
@@ -19,20 +19,13 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
+    // BOMs
+    implementation(platform(libs.cloudnet.bom))
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
 
-    // BungeeCord
-    val bungeecordVersion = "1.21-R0.1-SNAPSHOT"
-    implementation("net.md-5", "bungeecord-api", bungeecordVersion)
-
-    // CloudNet
-    val cloudNetVersion = "4.0.0-RC10"
-    implementation(platform("eu.cloudnetservice.cloudnet:bom:$cloudNetVersion"))
-    implementation("eu.cloudnetservice.cloudnet", "bridge")
-    implementation("eu.cloudnetservice.cloudnet", "wrapper-jvm")
-    implementation("eu.cloudnetservice.cloudnet", "platform-inject-api")
-    annotationProcessor("eu.cloudnetservice.cloudnet", "platform-inject-processor", cloudNetVersion)
+    implementation(libs.bundles.bungeecord.plugin)
+    annotationProcessor(libs.cloudnet.platform.inject.processor)
 }
 
 tasks.test {

diff --git a/gradle/cloudnet/build.gradle.kts b/gradle/cloudnet/build.gradle.kts
@@ -10,10 +10,4 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
 }
-
-tasks.test {
-    useJUnitPlatform()
-}
diff --git a/gradle/cloudnet/rpc-module/build.gradle.kts b/gradle/cloudnet/rpc-module/build.gradle.kts
@@ -1,6 +1,6 @@
 plugins {
     id("java")
-    id("eu.cloudnetservice.juppiter") version "0.4.0"
+    alias(libs.plugins.juppiter)
 }
 
 group = "com.github.moincraft.gradle.cloudnet"
@@ -31,21 +31,14 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.10.0"))
-    testImplementation("org.junit.jupiter:junit-jupiter")
-
-    compileOnly("org.slf4j", "slf4j-api", "2.0.13")
-
-    // Spigot
-    val spigotVersion = "1.21-R0.1-SNAPSHOT"
-    implementation("org.spigotmc", "spigot-api", spigotVersion)
-
-    // CloudNet
-    val cloudNetVersion = "4.0.0-RC10"
-    implementation(platform("eu.cloudnetservice.cloudnet:bom:$cloudNetVersion"))
-    implementation("eu.cloudnetservice.cloudnet", "node")
-    implementation("eu.cloudnetservice.cloudnet", "platform-inject-api")
-    annotationProcessor("eu.cloudnetservice.cloudnet", "platform-inject-processor", cloudNetVersion)
+    // BOMs
+    implementation(platform(libs.cloudnet.bom))
+    testImplementation(platform(libs.junit.bom))
+    testImplementation(libs.junit.jupiter)
+
+    implementation(libs.bundles.spigot.plugin)
+    implementation(libs.bundles.node.module)
+    annotationProcessor(libs.cloudnet.platform.inject.processor)
 }
 
 tasks.test {

diff --git a/...module/src/main/java/com/github/moincraft/cloudnet/module/platform/PlatformRPCSample.java b/...module/src/main/java/com/github/moincraft/cloudnet/module/platform/PlatformRPCSample.java
@@ -1,7 +1,7 @@
 package com.github.moincraft.cloudnet.module.platform;
 
 import eu.cloudnetservice.driver.network.NetworkClient;
-import eu.cloudnetservice.driver.network.rpc.RPCFactory;
+import eu.cloudnetservice.driver.network.rpc.factory.RPCFactory;
 import eu.cloudnetservice.driver.network.rpc.RPCSender;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
@@ -30,7 +30,7 @@ public PlatformRPCSample(
         @Nonnull RPCFactory rpcFactory,
         @Nonnull NetworkClient networkClient
     ) {
-        this.rpcSender = rpcFactory.providerForClass(networkClient, RPCSample.class);
+        this.rpcSender = rpcFactory.newRPCSenderBuilder(RPCSample.class).targetComponent(networkClient).build();
     }
 
     @Override

diff --git a/...odule/src/main/java/com/github/moincraft/cloudnet/module/platform/node/NodeRPCSample.java b/...odule/src/main/java/com/github/moincraft/cloudnet/module/platform/node/NodeRPCSample.java
@@ -1,8 +1,8 @@
 package com.github.moincraft.cloudnet.module.platform.node;
 
 import com.github.moincraft.cloudnet.module.platform.RPCSample;
-import eu.cloudnetservice.driver.network.rpc.RPCFactory;
-import eu.cloudnetservice.driver.network.rpc.RPCHandlerRegistry;
+import eu.cloudnetservice.driver.network.rpc.factory.RPCFactory;
+import eu.cloudnetservice.driver.network.rpc.handler.RPCHandlerRegistry;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import org.slf4j.Logger;
@@ -30,7 +30,7 @@ public NodeRPCSample(
             @Nonnull RPCHandlerRegistry rpcHandlerRegistry
     ) {
         // Register the RPC handler
-        var rpcHandler = rpcFactory.newHandler(RPCSample.class, this);
+        var rpcHandler = rpcFactory.newRPCHandlerBuilder(RPCSample.class).targetInstance(this).build();
         rpcHandlerRegistry.registerHandler(rpcHandler);
     }
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,51 @@
+[versions]
+cloudnet = "4.0.0-RC11"
+juppiter = "0.4.0"
+
+spigot = "1.21.1-R0.1-SNAPSHOT"
+bungeecord = "1.21-R0.1-SNAPSHOT"
+
+slf4j = "2.0.16"
+junit = "5.11.2"
+
+[libraries]
+cloudnet-bom = { group = "eu.cloudnetservice.cloudnet", name = "bom", version.ref = "cloudnet" }
+cloudnet-bridge = { group = "eu.cloudnetservice.cloudnet", name = "bridge", version.ref = "cloudnet" }
+cloudnet-wrapper-jvm = { group = "eu.cloudnetservice.cloudnet", name = "wrapper-jvm", version.ref = "cloudnet" }
+cloudnet-platform-inject-api = { group = "eu.cloudnetservice.cloudnet", name = "platform-inject-api", version.ref = "cloudnet" }
+cloudnet-platform-inject-processor = { group = "eu.cloudnetservice.cloudnet", name = "platform-inject-processor", version.ref = "cloudnet" }
+cloudnet-node = { group = "eu.cloudnetservice.cloudnet", name = "node", version.ref = "cloudnet" }
+
+spigot-api = { group = "org.spigotmc", name = "spigot-api", version.ref = "spigot" }
+bungeecord-api = { group = "net.md-5", name = "bungeecord-api", version.ref = "bungeecord" }
+
+slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
+
+junit-bom = { group = "org.junit", name = "junit-bom", version.ref = "junit" }
+junit-jupiter = { group = "org.junit.jupiter", name = "junit-jupiter", version.ref = "junit" }
+
+[plugins]
+juppiter = { id = "eu.cloudnetservice.juppiter", version.ref = "juppiter" }
+
+[bundles]
+spigot-plugin = [
+    "cloudnet-bridge",
+    "cloudnet-wrapper-jvm",
+    "cloudnet-platform-inject-api",
+    "spigot-api",
+]
+
+bungeecord-plugin = [
+    "cloudnet-bridge",
+    "cloudnet-wrapper-jvm",
+    "cloudnet-platform-inject-api",
+    "bungeecord-api",
+]
+
+node-module = [
+    "cloudnet-bridge",
+    "cloudnet-node",
+    "cloudnet-wrapper-jvm",
+    "cloudnet-platform-inject-api",
+    "slf4j-api",
+]
diff --git a/gradle/settings.gradle.kts b/gradle/settings.gradle.kts
@@ -5,3 +5,12 @@ include("bungeecord")
 include("bungeecord:plugin")
 include("cloudnet")
 include("cloudnet:rpc-module")
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("libs.versions.toml"))
+        }
+    }
+}
+
diff --git a/maven/bukkit/plugin/pom.xml b/maven/bukkit/plugin/pom.xml
@@ -13,8 +13,8 @@
     <artifactId>maven-bukkit-plugin</artifactId>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>23</maven.compiler.source>
+        <maven.compiler.target>23</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>eu.cloudnetservice.cloudnet</groupId>
                 <artifactId>bom</artifactId>
-                <version>4.0.0-RC10</version>
+                <version>4.0.0-RC11</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <!-- CloudNet v4 -->

diff --git a/maven/bukkit/pom.xml b/maven/bukkit/pom.xml
@@ -17,8 +17,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>23</maven.compiler.source>
+        <maven.compiler.target>23</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/maven/bungeecord/plugin/pom.xml b/maven/bungeecord/plugin/pom.xml
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>eu.cloudnetservice.cloudnet</groupId>
                 <artifactId>bom</artifactId>
-                <version>4.0.0-RC10</version>
+                <version>4.0.0-RC11</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/maven/bungeecord/pom.xml b/maven/bungeecord/pom.xml
@@ -17,8 +17,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>23</maven.compiler.source>
+        <maven.compiler.target>23</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/maven/cloudnet/pom.xml b/maven/cloudnet/pom.xml
@@ -17,8 +17,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>23</maven.compiler.source>
+        <maven.compiler.target>23</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 

diff --git a/maven/cloudnet/rpc-module/pom.xml b/maven/cloudnet/rpc-module/pom.xml
@@ -13,8 +13,8 @@
     <artifactId>rpc-module</artifactId>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>23</maven.compiler.source>
+        <maven.compiler.target>23</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>eu.cloudnetservice.cloudnet</groupId>
                 <artifactId>bom</artifactId>
-                <version>4.0.0-RC10</version>
+                <version>4.0.0-RC11</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -41,13 +41,13 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.21-R0.1-SNAPSHOT</version>
+            <version>1.21.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.13</version>
+            <version>2.0.16</version>
         </dependency>
         <!-- CloudNet v4 -->
         <dependency>

diff --git a/maven/pom.xml b/maven/pom.xml
@@ -15,8 +15,8 @@
     </modules>
 
     <properties>
-        <maven.compiler.source>21</maven.compiler.source>
-        <maven.compiler.target>21</maven.compiler.target>
+        <maven.compiler.source>23</maven.compiler.source>
+        <maven.compiler.target>23</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>