Prepare for 5.5.0 release

Pante · Mar 12, 2023 · 755f267 · 755f267
1 parent 804bbe3
commit 755f267
Show file tree

Hide file tree

Showing 26 changed files with 128 additions and 101 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -4,17 +4,14 @@ on:
   push:
     branches:
       - master
-  pull_request:
-    branches:
-      - '**'
 
 env:
   SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}
   SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
 
 jobs:
   nightly:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: styfle/cancel-workflow-action@0.9.0
         with:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -0,0 +1,25 @@
+name: Chimera CI/CD
+
+on:
+  pull_request:
+    branches:
+      - '**'
+
+env:
+  SONATYPE_USERNAME: ${{secrets.SONATYPE_USERNAME}}
+  SONATYPE_PASSWORD: ${{secrets.SONATYPE_PASSWORD}}
+
+jobs:
+  nightly:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: styfle/cancel-workflow-action@0.9.0
+        with:
+          access_token: ${{ github.token }}
+      - uses: actions/checkout@v2
+      - uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 17
+      - run: mvn install --settings ci-settings.xml --no-transfer-progress
+      - run: bash <(curl -s https://codecov.io/bash)
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   stable:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: styfle/cancel-workflow-action@0.9.0
         with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 5.5.0 - Everything was beautiful (12/03/2023)
+
+**Compatible Spigot versions: 1.19.3**
+
+This update adds support for Spigot 1.19.3
+
+## Commons
+* Deprecate `WordType.word()` - recent changes in 1.19 makes this unfeasible to fix
+
 ## 5.4.2 - Drip, drop, drip, drop (26/08/2022)
 
 **Compatible Spigot versions: 1.19.1**

diff --git a/MAINTAINANCE.md b/MAINTAINANCE.md
@@ -8,7 +8,7 @@ this properly.
 ## Locally
 
 * Get the latest copy of Spigot via BuildTools.jar
-* Replace the plugins with the section available in `replacement.xml`
+* Replace the plugins of `spigot` artifact with the section available in `replacement.xml`
 * Build Spigot with the `remapped` profile
 * Change dependencies in Chimera projects' poms
 * Test project locally using `typist-example-plugin`

diff --git a/README.md b/README.md
@@ -33,6 +33,7 @@
 
 | Chimera Version | Minecraft Version |
 |-----------------|-------------------|
+| 5.5.0           | 1.19.2 - 1.19.3   |
 | 5.4.2           | 1.19.1            |
 | 5.3.0           | 1.18.2            |
 | 5.2.0           | 1.18.0 - 1.18.1   |
@@ -68,7 +69,7 @@
 <dependency>
     <groupId>com.karuslabs</groupId>
     <artifactId>annotations</artifactId>
-    <version>5.4.2</version>
+    <version>5.5.0</version>
 </dependency>
 ```
 
@@ -81,7 +82,7 @@
 <dependency>
     <groupId>com.karuslabs</groupId>
     <artifactId>commons</artifactId>
-    <version>5.4.2</version>
+    <version>5.5.0</version>
 </dependency>
 ```
 
@@ -94,6 +95,6 @@
 <dependency>
     <groupId>com.karuslabs</groupId>
     <artifactId>typist</artifactId>
-    <version>5.4.2</version>
+    <version>5.5.0</version>
 </dependency>
 ```
diff --git a/annotations/dependency-reduced-pom.xml b/annotations/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>chimera</artifactId>
     <groupId>com.karuslabs</groupId>
-    <version>5.4.2</version>
+    <version>5.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>annotations</artifactId>
@@ -13,7 +13,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.3.1-SNAPSHOT</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <goals>
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.0</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.0</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.9.0</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.6.1</version>
+      <version>5.2.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -100,7 +100,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>4.6.1</version>
+      <version>5.2.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/annotations/pom.xml b/annotations/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.karuslabs</groupId>
         <artifactId>chimera</artifactId>
-        <version>5.4.2</version>
+        <version>5.5.0</version>
     </parent>
 
     <artifactId>annotations</artifactId>

diff --git a/commons/dependency-reduced-pom.xml b/commons/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>chimera</artifactId>
     <groupId>com.karuslabs</groupId>
-    <version>5.4.2</version>
+    <version>5.5.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>commons</artifactId>
@@ -13,7 +13,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.10.1</version>
+        <version>3.11.0</version>
         <configuration>
           <release>${release}</release>
         </configuration>
@@ -30,9 +30,9 @@
               <goal>remap</goal>
             </goals>
             <configuration>
-              <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+              <srgIn>org.spigotmc:minecraft-server:1.19.3-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
               <reverse>true</reverse>
-              <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+              <remappedDependencies>org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
               <remappedArtifactAttached>true</remappedArtifactAttached>
               <remappedClassifierName>remapped-obf</remappedClassifierName>
             </configuration>
@@ -45,15 +45,15 @@
             </goals>
             <configuration>
               <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-              <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-              <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+              <srgIn>org.spigotmc:minecraft-server:1.19.3-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+              <remappedDependencies>org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
             </configuration>
           </execution>
         </executions>
       </plugin>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <goals>
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.spigotmc</groupId>
       <artifactId>spigot</artifactId>
-      <version>1.19.1-R0.1-SNAPSHOT</version>
+      <version>1.19.3-R0.1-SNAPSHOT</version>
       <classifier>remapped-mojang</classifier>
       <scope>provided</scope>
     </dependency>
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.0</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -108,7 +108,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.0</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -124,7 +124,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
-      <version>5.9.0</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -136,7 +136,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>4.6.1</version>
+      <version>5.2.0</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -156,7 +156,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>4.6.1</version>
+      <version>5.2.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/commons/pom.xml b/commons/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.karuslabs</groupId>
         <artifactId>chimera</artifactId>
-        <version>5.4.2</version>
+        <version>5.5.0</version>
     </parent>
 
     <artifactId>commons</artifactId>
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.19.1-R0.1-SNAPSHOT</version>
+            <version>1.19.3-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>
@@ -59,9 +59,9 @@
                         </goals>
                         <id>remap-obf</id>
                         <configuration>
-                            <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <srgIn>org.spigotmc:minecraft-server:1.19.3-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
                             <reverse>true</reverse>
-                            <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedDependencies>org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
                             <remappedClassifierName>remapped-obf</remappedClassifierName>
                         </configuration>
@@ -74,8 +74,8 @@
                         <id>remap-spigot</id>
                         <configuration>
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-                            <srgIn>org.spigotmc:minecraft-server:1.19.1-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-                            <remappedDependencies>org.spigotmc:spigot:1.19.1-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                            <srgIn>org.spigotmc:minecraft-server:1.19.3-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:1.19.3-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/commons/src/main/java/com/karuslabs/commons/command/dispatcher/Dispatcher.java b/commons/src/main/java/com/karuslabs/commons/command/dispatcher/Dispatcher.java
@@ -34,8 +34,8 @@
 import net.minecraft.commands.*;
 import net.minecraft.server.MinecraftServer;
 
-import org.bukkit.craftbukkit.v1_19_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_19_R1.command.CraftCommandMap;
+import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_19_R2.command.CraftCommandMap;
 
 import org.bukkit.Server;
 import org.bukkit.command.CommandSender;

diff --git a/commons/src/main/java/com/karuslabs/commons/command/dispatcher/Exceptions.java b/commons/src/main/java/com/karuslabs/commons/command/dispatcher/Exceptions.java
@@ -36,9 +36,9 @@
 
 import org.apache.logging.log4j.*;
 
-import org.bukkit.craftbukkit.v1_19_R1.CraftServer;
-import org.bukkit.craftbukkit.v1_19_R1.command.*;
-import org.bukkit.craftbukkit.v1_19_R1.entity.*;
+import org.bukkit.craftbukkit.v1_19_R2.CraftServer;
+import org.bukkit.craftbukkit.v1_19_R2.command.*;
+import org.bukkit.craftbukkit.v1_19_R2.entity.*;
 
 import org.bukkit.command.*;
 

diff --git a/commons/src/main/java/com/karuslabs/commons/command/dispatcher/SpigotMap.java b/commons/src/main/java/com/karuslabs/commons/command/dispatcher/SpigotMap.java
@@ -33,7 +33,7 @@
 import org.bukkit.command.*;
 import org.bukkit.plugin.Plugin;
 
-import org.bukkit.craftbukkit.v1_19_R1.command.CraftCommandMap;
+import org.bukkit.craftbukkit.v1_19_R2.command.CraftCommandMap;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 

diff --git a/commons/src/main/java/com/karuslabs/commons/command/types/WordType.java b/commons/src/main/java/com/karuslabs/commons/command/types/WordType.java
@@ -37,13 +37,14 @@ public interface WordType<T> extends Type<T> {
     /**
      * Returns a alternate implementation of {@link StringArgumentType#word()}
      * that supports non-ASCII characters.
-     * <br>
-     * <br>
-     * <b>This should be preferred over {@link StringArgumentType#word()}.</b>
      * 
      * @return an alternate implementation of {@link StringArgumentType#word()} that
      *         supports non-ASCII characters
+     * 
+     * @deprecated This function no longer work due to internal Spigot changes, 
+     * see https://github.com/Pante/chimera/issues/425 for more information.
      */
+    @Deprecated(since = "5.5.0", forRemoval = true)
     static WordType<String> word() {
         return Readers::unquoted;
     }

diff --git a/commons/src/test/java/com/karuslabs/commons/MockServer.java b/commons/src/test/java/com/karuslabs/commons/MockServer.java
@@ -45,7 +45,7 @@
 import org.bukkit.plugin.messaging.Messenger;
 import org.bukkit.profile.PlayerProfile;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.bukkit.scoreboard.ScoreboardManager;
+import org.bukkit.scoreboard.*;
 import org.bukkit.structure.StructureManager;
 import org.bukkit.util.CachedServerIcon;
 
@@ -771,5 +771,10 @@ public int getMaxChainedNeighborUpdates() {
     public <T extends Keyed> Registry<T> getRegistry(Class<T> type) {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+
+    @Override
+    public Criteria getScoreboardCriteria(String string) {
+        throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
+    }
 
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ env: @@
     jobs:
       stable:
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-latest
         steps:
           - uses: styfle/cancel-workflow-action@0.9.0
             with:
@@ Expand Down @@