Merge branch 'main' into denux/1.x_support

# Conflicts: # gradle/wrapper/gradle-wrapper.properties
DenuxPlays · Jan 11, 2024 · 0065cc6 · 0065cc6
2 parents 5e1090e + 399c49c
commit 0065cc6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 17 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,7 +56,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -69,4 +69,4 @@ jobs:
     #   ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -22,12 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ '11', '17', '20' ]
+        java: [ '11', '17', '21' ]
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up Java
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
         java-version: ${{ matrix.java }}

diff --git a/.github/workflows/javadocs.yml b/.github/workflows/javadocs.yml
@@ -9,6 +9,7 @@ permissions:
   contents: read
   pages: write
   id-token: write
+  actions: read
 
 concurrency:
   group: "pages"
@@ -21,9 +22,9 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 17
           distribution: 'temurin'
@@ -34,9 +35,9 @@ jobs:
         with:
           arguments: javadocJar
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v2
+        uses: actions/upload-pages-artifact@v3
         with:
           path: './build/docs/javadoc'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,7 +7,7 @@ plugins {
 
 group = "dev.denux"
 val archivesBaseName = "dtp"
-version = "1.0.0-alpha.2"
+version = "1.0.0-alpha.3"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_11
@@ -18,11 +18,11 @@ repositories {
     mavenCentral()
 }
 
-val lombokVersion = "1.18.28"
+val lombokVersion = "1.18.30"
 dependencies {
     //Testing stuff
-    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0")
+    testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.1")
 
     //Javax annotations
     compileOnly("com.google.code.findbugs:jsr305:3.0.2")
@@ -121,7 +121,7 @@ publishing {
                     developer {
                         id.set("Denux")
                         name.set("Timon Thomas Klinkert")
-                        email.set("dev@denux.dev")
+                        email.set("timon.klinkert@denux.dev")
                     }
                 }
             }
@@ -164,3 +164,8 @@ tasks.create("release") {
     // Builds all jars for publications
     dependsOn(build)
 }
+
+//Fix for publishing with gradle 8.x
+tasks.withType<PublishToMavenRepository>().configureEach {
+    dependsOn(":signArchives")
+}
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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/java/dev/denux/dtp/internal/writer/TomlWriter.java b/src/main/java/dev/denux/dtp/internal/writer/TomlWriter.java
@@ -54,6 +54,7 @@ public String writeToString() {
                     } catch (InvocationTargetException | NoSuchMethodException e) {
 						throw new RuntimeException(e);
 					}
+                    continue;
 				}
                 if (String.class.equals(clazz)) {
                     handleString(field, fieldObj, builder);