Merge branch 'nightly' into fix/module-dependencies

CloudNetService · Mar 16, 2024 · f644035 · f644035
2 parents dd62dac + 7f8f63e
commit f644035
Show file tree

Hide file tree

Showing 1,289 changed files with 2,137 additions and 2,481 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -17,28 +17,28 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           check-latest: true
           distribution: 'zulu'
 
       - name: Setup gradle cache
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: true
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           tools: latest
           languages: 'java'
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/delete-launchermeta-branch.yml b/.github/workflows/delete-launchermeta-branch.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Setup ssh agent
-        uses: webfactory/ssh-agent@v0.8.0
+        uses: webfactory/ssh-agent@v0.9.0
         with:
           ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}
 

diff --git a/.github/workflows/gradle-release.yml b/.github/workflows/gradle-release.yml
@@ -12,20 +12,20 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           check-latest: true
           distribution: 'zulu'
 
       - name: Setup gradle cache
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: true
 

diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -24,25 +24,25 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           check-latest: true
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
 
       - name: Setup gradle cache
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/nightly' || matrix.java != 17 }}
 
       - name: Setup Loom cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: '.gradle/loom-cache'
           restore-keys: ${{ runner.os }}-gradle-loom-
@@ -59,7 +59,7 @@ jobs:
 
       - name: Get branch name
         id: branch-name
-        uses: tj-actions/branch-names@v6
+        uses: tj-actions/branch-names@v8
 
       - name: Publish updater metadata
         uses: s0/git-publish-subdir-action@develop
@@ -103,7 +103,7 @@ jobs:
           find plugins/ -type f -regex '.*/build/libs/.*\.jar' ! -name '*-javadoc.jar' ! -name '*-sources.jar' -exec cp {} temp/plugins \;
 
       - name: Upload artifacts zip
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/heads/gh-readonly-queue/') && matrix.java == 17 }}
         with:
           name: CloudNet

diff --git a/LICENSE_HEADER b/LICENSE_HEADER
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/bom/build.gradle.kts b/bom/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/build-extensions/build.gradle.kts b/build-extensions/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,6 @@ repositories {
 }
 
 dependencies {
-  implementation("net.kyori", "indra-common", "3.1.2")
+  implementation("net.kyori", "indra-common", "3.1.3")
   implementation("com.google.code.gson", "gson", "2.10.1")
 }
diff --git a/build-extensions/src/main/kotlin/Files.kt b/build-extensions/src/main/kotlin/Files.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/build-extensions/src/main/kotlin/Versions.kt b/build-extensions/src/main/kotlin/Versions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/build-extensions/src/main/kotlin/cloudnet.parent-build-logic.gradle.kts b/build-extensions/src/main/kotlin/cloudnet.parent-build-logic.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/build-extensions/src/main/kotlin/extensions.kt b/build-extensions/src/main/kotlin/extensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -78,7 +78,7 @@ fun snapshotsOnly(repository: MavenArtifactRepository) {
 }
 
 fun Project.exportLanguageFileInformation(): String {
-  val file = project.buildDir.resolve("languages.txt")
+  val file = project.layout.buildDirectory.file("languages.txt").get().asFile
   file.writeText(project.projectDir.resolve("src/main/resources/lang").listFiles()?.joinToString(separator = "\n") { it.name }!!)
 
   return file.absolutePath
@@ -120,7 +120,7 @@ fun Project.exportCnlFile(fileName: String, ignoredDependencyGroups: Array<Strin
   }
 
   // write to the output file
-  val target = project.buildDir.resolve(fileName)
+  val target = project.layout.buildDirectory.file(fileName).get().asFile
   target.writeText(stringBuilder.toString())
 
   return target.absolutePath

diff --git a/build-extensions/src/main/kotlin/publishing-extensions.kt b/build-extensions/src/main/kotlin/publishing-extensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/build-extensions/src/main/kotlin/updater-extensions.kt b/build-extensions/src/main/kotlin/updater-extensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ subprojects {
     "compileOnly"(rootProject.libs.annotations)
     // testing
     "testImplementation"(rootProject.libs.mockito)
+    "testRuntimeOnly"(rootProject.libs.junitLauncher)
     "testImplementation"(rootProject.libs.bundles.junit)
     "testImplementation"(rootProject.libs.bundles.testContainers)
   }
@@ -119,6 +120,13 @@ subprojects {
     toolVersion = rootProject.libs.versions.checkstyleTools.get()
   }
 
+  // checkstyle issue https://github.com/checkstyle/checkstyle/issues/14211
+  configurations.named("checkstyle") {
+    resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
+      select("com.google.guava:guava:0")
+    }
+  }
+
   extensions.configure<SpotlessExtension> {
     java {
       licenseHeaderFile(rootProject.file("LICENSE_HEADER"))
@@ -148,7 +156,7 @@ tasks.register("globalJavaDoc", Javadoc::class) {
   val options = options as? StandardJavadocDocletOptions ?: return@register
 
   title = "CloudNet JavaDocs"
-  setDestinationDir(buildDir.resolve("javadocs"))
+  setDestinationDir(layout.buildDirectory.dir("javadocs").get().asFile)
   // options
   applyDefaultJavadocOptions(options)
   options.windowTitle = "CloudNet JavaDocs"

diff --git a/checkstyle.xml b/checkstyle.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  ~ Copyright 2019-2023 CloudNetService team & contributors
+  ~ Copyright 2019-2024 CloudNetService team & contributors
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/Named.java b/common/src/main/java/eu/cloudnetservice/common/Named.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/column/ColumnEntry.java b/common/src/main/java/eu/cloudnetservice/common/column/ColumnEntry.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/column/ColumnFormatter.java b/common/src/main/java/eu/cloudnetservice/common/column/ColumnFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/column/RowedFormatter.java b/common/src/main/java/eu/cloudnetservice/common/column/RowedFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/concurrent/CountingTask.java b/common/src/main/java/eu/cloudnetservice/common/concurrent/CountingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/concurrent/ListenableTask.java b/common/src/main/java/eu/cloudnetservice/common/concurrent/ListenableTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/concurrent/Task.java b/common/src/main/java/eu/cloudnetservice/common/concurrent/Task.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/hash/HashUtil.java b/common/src/main/java/eu/cloudnetservice/common/hash/HashUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/io/FileUtil.java b/common/src/main/java/eu/cloudnetservice/common/io/FileUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/io/ListenableOutputStream.java b/common/src/main/java/eu/cloudnetservice/common/io/ListenableOutputStream.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/io/ZipUtil.java b/common/src/main/java/eu/cloudnetservice/common/io/ZipUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/jvm/JavaVersion.java b/common/src/main/java/eu/cloudnetservice/common/jvm/JavaVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/language/I18n.java b/common/src/main/java/eu/cloudnetservice/common/language/I18n.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/log/AbstractHandler.java b/common/src/main/java/eu/cloudnetservice/common/log/AbstractHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/log/FallbackLoggerFactory.java b/common/src/main/java/eu/cloudnetservice/common/log/FallbackLoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/log/FallbackPassthroughLogger.java b/common/src/main/java/eu/cloudnetservice/common/log/FallbackPassthroughLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/log/LogManager.java b/common/src/main/java/eu/cloudnetservice/common/log/LogManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/log/LogRecordDispatcher.java b/common/src/main/java/eu/cloudnetservice/common/log/LogRecordDispatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/log/Logger.java b/common/src/main/java/eu/cloudnetservice/common/log/Logger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/common/src/main/java/eu/cloudnetservice/common/log/LoggerFactory.java b/common/src/main/java/eu/cloudnetservice/common/log/LoggerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2023 CloudNetService team & contributors
+ * Copyright 2019-2024 CloudNetService team & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.