Update dependencies!

Kale-Ko · Jun 1, 2024 · e8823f0 · e8823f0
1 parent 6eb9be7
commit e8823f0
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 44 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -2,9 +2,11 @@ name: Build Test
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - "*"
   pull_request:
-    branches: [ main ]
+    branches:
+      - "*"
 
 jobs:
   build:
@@ -14,21 +16,22 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: temurin
 
-      - name: Build Project
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Build
+        run: ./gradlew build
         env:
+          MAVEN_TYPE: snapshot
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
-          MAVEN_TYPE: release
           GH_PACKAGES_USER: ${{ secrets.GH_PACKAGES_USER }}
           GH_PACKAGES_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,7 +2,8 @@ name: Publish
 
 on:
   push:
-    tags: [ "*" ]
+    tags:
+      - "*"
 
 jobs:
   publish:
@@ -12,42 +13,41 @@ jobs:
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 11
           distribution: temurin
 
-      - name: Build Project
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: build
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Build
+        run: ./gradlew build
         env:
+          MAVEN_TYPE: release
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
-          MAVEN_TYPE: release
           GH_PACKAGES_USER: ${{ secrets.GH_PACKAGES_USER }}
           GH_PACKAGES_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN }}
 
       - name: Publish to GitHub Packages
-        uses: gradle/gradle-build-action@v2
-        with:
-          arguments: publish
+        run: ./gradlew publish
         env:
+          MAVEN_TYPE: release
           MAVEN_USER: ${{ secrets.MAVEN_USER }}
           MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}
-          MAVEN_TYPE: release
           GH_PACKAGES_USER: ${{ secrets.GH_PACKAGES_USER }}
           GH_PACKAGES_TOKEN: ${{ secrets.GH_PACKAGES_TOKEN }}
 
       - name: Publish to Github Pages
         uses: jamesives/github-pages-deploy-action@v4
         with:
-          git-config-name: github-actions[bot]
-          git-config-email: 41898282+github-actions[bot]@users.noreply.github.com
-          commit-message: Update JavaDocs
+          git-config-name: "github-actions[bot]"
+          git-config-email: "41898282+github-actions[bot]@users.noreply.github.com"
+          commit-message: "Update JavaDocs"
           folder: build/docs/javadoc
           branch: pages
           target-folder: docs

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.caching=true
 
 java_version=11
 
-project_version=1.10.6
+project_version=1.10.7
 project_description=A semi-advanced Java data serialization library with features for reducing file sizes.
 
-jackson_version=2.16.0
+jackson_version=2.17.1
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

diff --git a/gradlew.bat b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/src/main/java/io/github/kale_ko/bjsl/parsers/JsonParser.java b/src/main/java/io/github/kale_ko/bjsl/parsers/JsonParser.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.json.JsonWriteFeature;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.core.util.Separators;
 import com.fasterxml.jackson.databind.json.JsonMapper;
 import io.github.kale_ko.bjsl.BJSL;
 import java.io.PrintWriter;
@@ -201,7 +202,12 @@ public boolean getCrlf() {
                 indenter = indenter.withIndent(" ".repeat(this.indentLevel));
                 indenter = indenter.withLinefeed(this.crlf ? "\r\n" : "\n");
 
-                prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withSpacesInObjectEntries();
+                Separators separators = new Separators();
+                separators = separators.withObjectFieldValueSpacing(Separators.Spacing.BOTH);
+                separators = separators.withObjectEntrySpacing(Separators.Spacing.AFTER);
+                separators = separators.withArrayValueSpacing(Separators.Spacing.AFTER);
+
+                prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withSeparators(separators);
 
                 try {
                     Field separatorField = prettyPrinter.getClass().getDeclaredField("_objectFieldValueSeparatorWithSpaces");
@@ -221,7 +227,12 @@ public boolean getCrlf() {
                 indenter = indenter.withIndent("");
                 indenter = indenter.withLinefeed("");
 
-                prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withoutSpacesInObjectEntries();
+                Separators separators = new Separators();
+                separators = separators.withObjectFieldValueSpacing(Separators.Spacing.NONE);
+                separators = separators.withObjectEntrySpacing(Separators.Spacing.NONE);
+                separators = separators.withArrayValueSpacing(Separators.Spacing.NONE);
+
+                prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withSeparators(separators);
             }
 
             return new JsonParser(factory, new JsonMapper(factory), prettyPrinter);

diff --git a/src/main/java/io/github/kale_ko/bjsl/parsers/TomlParser.java b/src/main/java/io/github/kale_ko/bjsl/parsers/TomlParser.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.StreamWriteFeature;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.core.util.Separators;
 import com.fasterxml.jackson.dataformat.toml.TomlFactory;
 import com.fasterxml.jackson.dataformat.toml.TomlFactoryBuilder;
 import com.fasterxml.jackson.dataformat.toml.TomlMapper;
@@ -147,7 +148,12 @@ public boolean getCrlf() {
             indenter = indenter.withIndent(" ".repeat(this.indentLevel));
             indenter = indenter.withLinefeed(this.crlf ? "\r\n" : "\n");
 
-            prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withSpacesInObjectEntries();
+            Separators separators = new Separators();
+            separators = separators.withObjectFieldValueSpacing(Separators.Spacing.BOTH);
+            separators = separators.withObjectEntrySpacing(Separators.Spacing.AFTER);
+            separators = separators.withArrayValueSpacing(Separators.Spacing.AFTER);
+
+            prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withSeparators(separators);
 
             return new TomlParser(factory, new TomlMapper(factory), prettyPrinter);
         }

diff --git a/src/main/java/io/github/kale_ko/bjsl/parsers/YamlParser.java b/src/main/java/io/github/kale_ko/bjsl/parsers/YamlParser.java
@@ -5,6 +5,7 @@
 import com.fasterxml.jackson.core.StreamWriteFeature;
 import com.fasterxml.jackson.core.util.DefaultIndenter;
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
+import com.fasterxml.jackson.core.util.Separators;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactoryBuilder;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
@@ -150,7 +151,12 @@ public boolean getCrlf() {
             indenter = indenter.withIndent(" ".repeat(this.indentLevel));
             indenter = indenter.withLinefeed(this.crlf ? "\r\n" : "\n");
 
-            prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withSpacesInObjectEntries();
+            Separators separators = new Separators();
+            separators = separators.withObjectFieldValueSpacing(Separators.Spacing.BOTH);
+            separators = separators.withObjectEntrySpacing(Separators.Spacing.AFTER);
+            separators = separators.withArrayValueSpacing(Separators.Spacing.AFTER);
+
+            prettyPrinter = prettyPrinter.withObjectIndenter(indenter).withArrayIndenter(indenter).withSeparators(separators);
 
             return new YamlParser(factory, new YAMLMapper(factory), prettyPrinter);
         }

diff --git a/src/main/java/io/github/kale_ko/bjsl/processor/TypeProcessor.java b/src/main/java/io/github/kale_ko/bjsl/processor/TypeProcessor.java
@@ -20,7 +20,7 @@ public interface TypeProcessor {
      *
      * @since 1.0.0
      */
-    @NotNull ParsedElement toElement(@Nullable Object object);
+    public @NotNull ParsedElement toElement(@Nullable Object object);
 
     /**
      * Converts a {@link ParsedElement} into an Object
@@ -31,5 +31,5 @@ public interface TypeProcessor {
      *
      * @since 1.0.0
      */
-    @Nullable Object toObject(@NotNull ParsedElement element);
+    public @Nullable Object toObject(@NotNull ParsedElement element);
 }