update gradle to 8.13, update snapshot library to 4+, update java to 21

remove equals sign from snapshot hash

Author: douira

glsl-preprocessor/build.gradle

@@ -5,8 +5,8 @@ plugins {
   id 'signing'
   id 'org.danilopianini.publish-on-central' version '0.7.5' // a newer version 2.0.6 exists but it's annoying to use
   id 'jacoco'
-	id 'com.adarshr.test-logger' version '3.2.0'
-	// id "com.github.spotbugs" version "5.0.13"
+  id 'com.adarshr.test-logger' version '3.2.0'
+  // id "com.github.spotbugs" version "5.0.13"
 }
 
 repositories {
@@ -18,23 +18,18 @@ group = "io.github.douira"
 version = '1.0.0'
 
 dependencies {
-	implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.6'
+  implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.+'
   implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.7.3'
 
-	testImplementation group: 'io.github.origin-energy', name:'java-snapshot-testing-junit5', version: '3.2.+'
-}
+  testImplementation group: 'io.github.origin-energy', name:'java-snapshot-testing-junit5', version: '4.+'
 
-testing {
-  suites {
-    // Configure the built-in test suite
-    test {
-      // Use JUnit Jupiter test framework
-      useJUnitJupiter('5.9.0')
-    }
-  }
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
+  testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 
 test {
+  useJUnitPlatform()
+  
   // report is always generated after tests run
   finalizedBy jacocoTestReport
   testLogging.showStandardStreams = true
@@ -57,8 +52,6 @@ jacocoTestReport {
   }
 }
 
-sourceCompatibility = 17
-
 publishOnCentral {
   configureMavenCentral.set(true)
   projectDescription.set('GLSL Preprocessing with the C Preprocessor in Java - based on JCPP')

glsl-preprocessor/src/test/java/io/github/douira/glsl_preprocessor/VaArgsPastingTest.java

@@ -19,25 +19,25 @@ public class VaArgsPastingTest {
 
 	@Test
 	public void testWhitespacePasting() {
-		String input = "#define REGULAR_ARGS(x, y) foo(x, y)\n"
-				+ "#define REGULAR_ELLIPSIS(x, y...) foo(x, y)\n"
-				+ "#define REGULAR_VAARGS(x, ...) foo(x, __VA_ARGS__)\n"
-				+ "#define PASTE_ARGS(x, y) foo(x, ## y)\n"
-				+ "#define PASTE_ELLIPSIS(x, y...) foo(x, ## y)\n"
-				+ "#define PASTE_VAARGS(x, ...) foo(x, ## __VA_ARGS__)\n"
-				+ ""
-				+ "REGULAR_ARGS(a, b) // REGULAR_ARGS 2\n"
-				+ "REGULAR_ELLIPSIS(a, b) // REGULAR_ELLIPSIS 2\n"
-				+ "REGULAR_ELLIPSIS(a) // REGULAR_ELLIPSIS 1\n"
-				+ "REGULAR_VAARGS(a, b) // REGULAR_VAARGS 2\n"
-				+ "REGULAR_VAARGS(a) // REGULAR_VAARGS 1\n"
-				+ ""
-				+ "PASTE_ARGS(a, b) // PASTE_ARGS 2\n"
-				+ "PASTE_ELLIPSIS(a, b) // PASTE_ELLIPSIS 2\n"
-				+ "PASTE_ELLIPSIS(a) // PASTE_ELLIPSIS 1\n"
-				+ "PASTE_VAARGS(a, b) // PASTE_VAARGS 2\n"
-				+ "PASTE_VAARGS(a) // PASTE_VAARGS 1\n";
-		LOG.info("Input is:\n" + input);
+		String input = """
+				#define REGULAR_ARGS(x, y) foo(x, y)
+				#define REGULAR_ELLIPSIS(x, y...) foo(x, y)
+				#define REGULAR_VAARGS(x, ...) foo(x, __VA_ARGS__)
+				#define PASTE_ARGS(x, y) foo(x, ## y)
+				#define PASTE_ELLIPSIS(x, y...) foo(x, ## y)
+				#define PASTE_VAARGS(x, ...) foo(x, ## __VA_ARGS__)
+				REGULAR_ARGS(a, b) // REGULAR_ARGS 2
+				REGULAR_ELLIPSIS(a, b) // REGULAR_ELLIPSIS 2
+				REGULAR_ELLIPSIS(a) // REGULAR_ELLIPSIS 1
+				REGULAR_VAARGS(a, b) // REGULAR_VAARGS 2
+				REGULAR_VAARGS(a) // REGULAR_VAARGS 1
+				PASTE_ARGS(a, b) // PASTE_ARGS 2
+				PASTE_ELLIPSIS(a, b) // PASTE_ELLIPSIS 2
+				PASTE_ELLIPSIS(a) // PASTE_ELLIPSIS 1
+				PASTE_VAARGS(a, b) // PASTE_VAARGS 2
+				PASTE_VAARGS(a) // PASTE_VAARGS 1
+				""";
+		LOG.info("Input is:\n{}", input);
 		Preprocessor pp = new Preprocessor();
 		pp.addFeature(Feature.KEEPCOMMENTS);
 		pp.addInput(new StringLexerSource(input, true));
@@ -49,16 +49,18 @@ public void testWhitespacePasting() {
 		} finally {
 			pp.close();
 		}
-		LOG.info("Output is:\n" + output);
-		assertEquals("foo(a, b) // REGULAR_ARGS 2\n"
-				+ "foo(a, b) // REGULAR_ELLIPSIS 2\n"
-				+ "foo(a, ) // REGULAR_ELLIPSIS 1\n"
-				+ "foo(a, b) // REGULAR_VAARGS 2\n"
-				+ "foo(a, ) // REGULAR_VAARGS 1\n"
-				+ "foo(a,b) // PASTE_ARGS 2\n" // cpp outputs a warning and a space after the comma, similar below.
-				+ "foo(a,b) // PASTE_ELLIPSIS 2\n"
-				+ "foo(a) // PASTE_ELLIPSIS 1\n"
-				+ "foo(a,b) // PASTE_VAARGS 2\n"
-				+ "foo(a) // PASTE_VAARGS 1", output);
+		LOG.info("Output is:\n{}", output);
+		// cpp outputs a warning and a space after the comma, similar below.
+		assertEquals("""
+				foo(a, b) // REGULAR_ARGS 2
+				foo(a, b) // REGULAR_ELLIPSIS 2
+				foo(a, ) // REGULAR_ELLIPSIS 1
+				foo(a, b) // REGULAR_VAARGS 2
+				foo(a, ) // REGULAR_VAARGS 1
+				foo(a,b) // PASTE_ARGS 2
+				foo(a,b) // PASTE_ELLIPSIS 2
+				foo(a) // PASTE_ELLIPSIS 1
+				foo(a,b) // PASTE_VAARGS 2
+				foo(a) // PASTE_VAARGS 1""", output);
 	}
 }

glsl-preprocessor/src/test/java/io/github/douira/glsl_preprocessor/__snapshots__/IntegrationTest.snap

@@ -1,4 +1,4 @@
-testPreprocessor[GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH,ARBITRARY_PRAGMAS_uO+aZa+FgyCVAejH6nxTkTt0CWQ=]=[
+testPreprocessor[GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH,ARBITRARY_PRAGMAS_uO+aZa+FgyCVAejH6nxTkTt0CWQ]=[
 #custom fdsaflsj 43lk j43kljgkld "fds" +,--,fds
 #version 330 core
 #pragma foo bar fdafds a
@@ -11,7 +11,7 @@ testPreprocessor[GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH,ARBITRARY_PRAGMAS_uO+a
 ]
 
 
-testPreprocessor[GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH_WD5wCCQXiHxE57nVQkXoycdQjks=]=[
+testPreprocessor[GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH_WD5wCCQXiHxE57nVQkXoycdQjks]=[
 #version
 #extension
 #custom
@@ -24,7 +24,7 @@ testPreprocessor[GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH_WD5wCCQXiHxE57nVQkXoyc
 ]
 
 
-testPreprocessor[GLSL_PASSTHROUGH_ORQdau2vuA/2h/xeXX1yjDgBKng=]=[
+testPreprocessor[GLSL_PASSTHROUGH_ORQdau2vuA/2h/xeXX1yjDgBKng]=[
 #version 330 core
 foo bar
 #extension foo : bar
@@ -41,7 +41,7 @@ int a = 4;
 ]
 
 
-testPreprocessor[GLSL_PASSTHROUGH_bB149WHJMXASfFOJUlrhhdjem24=]=[
+testPreprocessor[GLSL_PASSTHROUGH_bB149WHJMXASfFOJUlrhhdjem24]=[
 #line 5 324
 #version 330 core
 int a = 4;
@@ -76,7 +76,7 @@ foo bar
 ]
 
 
-testPreprocessor[GLSL_PASSTHROUGH_wyy4x0OaDgyEmuM7w5N5SLtVji8=]=[
+testPreprocessor[GLSL_PASSTHROUGH_wyy4x0OaDgyEmuM7w5N5SLtVji8]=[
 #extension GL_ARB_texture_rectangle : enable
 #extension GL_ARB_texture_rectangle : enable
 #version 330 fjdsal fjsda fisda jfiojfdsaflkds
@@ -109,39 +109,39 @@ if (a == 4) {
 ]
 
 
-testPreprocessor[errors,ARBITRARY_PRAGMAS_tkMavAFBAxEG3RtCGFwG7STeCK4=]=[
+testPreprocessor[errors,ARBITRARY_PRAGMAS_tkMavAFBAxEG3RtCGFwG7STeCK4]=[
 #pragma
 
 <><><><><><><><><><><><><><><><><><><><><><><><><>
 io.github.douira.glsl_preprocessor.LexerException: Warning at 1:7: Empty #pragma
 ]
 
 
-testPreprocessor[errors,GLSL_CUSTOM_PASSTHROUGH_LiielybpiPYMDUxz8pc85kwvnAI=]=[
+testPreprocessor[errors,GLSL_CUSTOM_PASSTHROUGH_LiielybpiPYMDUxz8pc85kwvnAI]=[
 #custom fdskalfjk#fdsfldsj
 
 <><><><><><><><><><><><><><><><><><><><><><><><><>
 io.github.douira.glsl_preprocessor.InternalException: Bad token [#@1,17]:"#"
 ]
 
 
-testPreprocessor[errors,GLSL_CUSTOM_PASSTHROUGH_aDv7vwg7JM7S15pnkSb2Vvu1P7U=]=[
+testPreprocessor[errors,GLSL_CUSTOM_PASSTHROUGH_aDv7vwg7JM7S15pnkSb2Vvu1P7U]=[
 #version
 
 <><><><><><><><><><><><><><><><><><><><><><><><><>
 io.github.douira.glsl_preprocessor.LexerException: GLSL passthrough not enabled
 ]
 
 
-testPreprocessor[errors,GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH_SkPEvQvuleWLKW47WWP78/taGeU=]=[
+testPreprocessor[errors,GLSL_PASSTHROUGH,GLSL_CUSTOM_PASSTHROUGH_SkPEvQvuleWLKW47WWP78/taGeU]=[
 #pragma foo bar fdafds a
 
 <><><><><><><><><><><><><><><><><><><><><><><><><>
 io.github.douira.glsl_preprocessor.LexerException: Warning at 1:8: Unknown #pragma: foo
 ]
 
 
-testPreprocessor[errors,GLSL_PASSTHROUGH_qT/RZ9gQ4GE2a78x7LH4SKT2FWo=]=[
+testPreprocessor[errors,GLSL_PASSTHROUGH_qT/RZ9gQ4GE2a78x7LH4SKT2FWo]=[
 #custom fds
 
 <><><><><><><><><><><><><><><><><><><><><><><><><>

glsl-preprocessor/src/test/java/io/github/douira/glsl_preprocessor/test_util/AssertUtil.java

@@ -12,6 +12,6 @@ public static String getBase64Hash(String content) {
 			throw new RuntimeException(e);
 		}
 		digest.update(content.getBytes());
-		return Base64.getEncoder().encodeToString(digest.digest());
+		return Base64.getEncoder().encodeToString(digest.digest()).replace("=", "");
 	}
 }

glsl-preprocessor/src/test/resources/snapshot.properties

@@ -4,3 +4,4 @@ reporters=au.com.origin.snapshots.reporters.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__
 output-dir=src/test/java
 ci-env-var=CI
+update-snapshot=none

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,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/.
@@ -83,10 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +133,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +200,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

gradlew

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,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 +59,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