remove guava by using modern java features

Author: douira

glsl-preprocessor/build.gradle

@@ -19,7 +19,6 @@ version = '0.0.1'
 dependencies {
 	api group: 'org.slf4j', name: 'slf4j-simple', version: '2.0.+'
   implementation group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.7.3'
-	testImplementation group: 'com.google.guava', name: 'guava', version: '18.0'
 }
 
 testing {

glsl-preprocessor/src/test/java/org/anarres/cpp/PragmaTest.java

@@ -8,13 +8,11 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.File;
+import java.nio.file.Files;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.*;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.Files;
-
 /**
  *
  * @author shevek
@@ -28,7 +26,7 @@ public void testPragma() throws Exception {
 		assertTrue(file.exists());
 
 		// create a CharSource from a file
-		Preprocessor pp = new Preprocessor(Files.newReader(file, Charsets.UTF_8));
+		Preprocessor pp = new Preprocessor(Files.newBufferedReader(file.toPath()));
 		pp.setListener(new DefaultPreprocessorListener());
 		String output = pp.printToString();
 		pp.close();

glsl-preprocessor/src/test/java/org/anarres/cpp/RegressionTest.java

@@ -8,16 +8,14 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.*;
+import java.nio.file.Files;
 import java.util.Arrays;
 import java.util.stream.Stream;
 
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.*;
 import org.slf4j.*;
 
-import com.google.common.base.Charsets;
-import com.google.common.io.*;
-
 /**
  *
  * @author shevek
@@ -28,23 +26,25 @@ public class RegressionTest {
 
 	public static Stream<Arguments> data() throws Exception {
 		File dir = new File("build/resources/test/regression");
-		return Arrays.stream(dir.listFiles(new PatternFilenameFilter(".*\\.in"))).map(inFile -> {
-			String name = Files.getNameWithoutExtension(inFile.getName());
-			File outFile = new File(dir, name + ".out");
-			return Arguments.of(name, inFile, outFile);
-		});
+		return Arrays.stream(dir.listFiles())
+				.filter(inFile -> inFile.getName().endsWith(".in"))
+				.map(inFile -> {
+					String name = inFile.getName().replace(".in", "");
+					File outFile = new File(dir, name + ".out");
+					return Arguments.of(name, inFile, outFile);
+				});
 	}
 
 	@ParameterizedTest
 	@MethodSource("data")
 	public void testRegression(String name, File inFile, File outFile) throws Exception {
-		String inText = Files.toString(inFile, Charsets.UTF_8);
+		String inText = Files.readString(inFile.toPath());
 		LOG.info("Read " + name + ":\n" + inText);
 		Preprocessor pp = new Preprocessor(new StringReader(inText));
 		String generatedText = pp.printToString();
 		LOG.info("Generated " + name + ":\n" + generatedText);
 		if (outFile.exists()) {
-			String outText = Files.toString(outFile, Charsets.UTF_8);
+			String outText = Files.readString(outFile.toPath());
 			LOG.info("Expected " + name + ":\n" + outText);
 			assertEquals(outText, inText);
 		}