Merge branch 'dev/feature' into feature/additional-module-standardization

Author: APickledWalrus

.gitattributes

@@ -1,53 +1,51 @@
- # .gitattributes snippet to force users to use same line endings for project.
-        #
-        # Handle line endings automatically for files detected as text
-        # and leave all files detected as binary untouched.
-        * text eol=lf
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text eol=lf
 
-        #
-        # The above will handle all files NOT found below
-        # https://help.github.com/articles/dealing-with-line-endings/
-        # https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
+# The above will handle all files NOT found below
+# https://help.github.com/articles/dealing-with-line-endings/
+# https://github.com/Danimoth/gitattributes/blob/master/Web.gitattributes
 
+# These files are text and should be normalized (Convert crlf => lf)
+*.php text
+*.css text
+*.js text
+*.json text
+*.htm text
+*.html text
+*.xml text
+*.txt text
+*.ini text
+*.inc text
+*.pl text
+*.rb text
+*.py text
+*.scm text
+*.sql text
+*.htaccess text
+*.sh text
+*.java text
 
+# These files are Windows-specific and should retain crlf
+*.bat text eol=crlf
 
-        # These files are text and should be normalized (Convert crlf => lf)
-        *.php text
-        *.css text
-        *.js text
-        *.json text
-        *.htm text
-        *.html text
-        *.xml text
-        *.txt text
-        *.ini text
-        *.inc text
-        *.pl text
-        *.rb text
-        *.py text
-        *.scm text
-        *.sql text
-        .htaccess text
-        *.sh text
-        *.java text
-
-        # These files are binary and should be left untouched
-        # (binary is a macro for -text -diff)
-        *.png binary
-        *.jpg binary
-        *.jpeg binary
-        *.gif binary
-        *.ico binary
-        *.mov binary
-        *.mp4 binary
-        *.mp3 binary
-        *.flv binary
-        *.fla binary
-        *.swf binary
-        *.gz binary
-        *.zip binary
-        *.7z binary
-        *.ttf binary
-        *.pyc binary
-	*.jar binary
-	*.class binary
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.mov binary
+*.mp4 binary
+*.mp3 binary
+*.flv binary
+*.fla binary
+*.swf binary
+*.gz binary
+*.zip binary
+*.7z binary
+*.ttf binary
+*.pyc binary
+*.jar binary
+*.class binary

.github/workflows/checkstyle.yml

@@ -16,7 +16,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

.github/workflows/java-21-builds.yml

@@ -28,7 +28,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

.github/workflows/junit-21-builds.yml

@@ -28,7 +28,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

.github/workflows/repo.yml

@@ -12,7 +12,7 @@ jobs:
               with:
                   submodules: recursive
             - name: validate gradle wrapper
-              uses: gradle/actions/wrapper-validation@v5
+              uses: gradle/actions/wrapper-validation@v6
             - name: Set up JDK 21
               uses: actions/setup-java@v5
               with:

.github/workflows/update-gradle-wrapper.yml

@@ -34,7 +34,7 @@ jobs:
           sed -i "s|^distributionUrl=.*$|distributionUrl=${LATEST_GRADLE_DOWNLOAD_URL}|" gradle/wrapper/gradle-wrapper.properties
           ./gradlew wrapper --gradle-version ${LATEST_GRADLE_VERSION}
       - name: Validate gradle wrapper
-        uses: gradle/actions/wrapper-validation@v5
+        uses: gradle/actions/wrapper-validation@v6
       - name: Build Skript and run test scripts
         run: ./gradlew clean quickTest
       - name: Commit and push changes

build.gradle

@@ -4,7 +4,7 @@ import org.apache.tools.ant.filters.ReplaceTokens
 import java.time.LocalTime
 
 plugins {
-	id 'com.gradleup.shadow' version '9.3.1'
+	id 'com.gradleup.shadow' version '9.4.1'
 	id 'maven-publish'
 	id 'java'
 	id 'checkstyle'

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME