diff --git a/pom.xml b/pom.xml index 6480176..723dc30 100755 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ An ANTLR4-based parser and grammar for Visual Basic 6.0 io.github.uwol proleap-vb6-parser - 2.3.0 + 3.0.0 jar @@ -19,8 +19,8 @@ UTF-8 UTF-8 - 1.8 - 1.8 + 11 + 11 4.7.2 1.7.28 diff --git a/src/main/java/io/proleap/vb6/asg/runner/impl/VbParserRunnerImpl.java b/src/main/java/io/proleap/vb6/asg/runner/impl/VbParserRunnerImpl.java index a08ed70..165c8ab 100755 --- a/src/main/java/io/proleap/vb6/asg/runner/impl/VbParserRunnerImpl.java +++ b/src/main/java/io/proleap/vb6/asg/runner/impl/VbParserRunnerImpl.java @@ -11,13 +11,13 @@ package io.proleap.vb6.asg.runner.impl; import java.io.File; import java.io.IOException; import java.nio.charset.Charset; +import java.nio.file.Files; import java.util.ArrayList; import java.util.List; import java.util.Scanner; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -253,7 +253,7 @@ public class VbParserRunnerImpl implements VbParserRunner { LOG.info("Parsing file {} with charset {}.", vbFile.getName(), charset); - final String vbCode = FileUtils.readFileToString(vbFile, charset); + final String vbCode = Files.readString(vbFile.toPath(), charset); // determine the module name final String moduleName = getModuleName(vbFile); diff --git a/src/test/java/io/proleap/vb6/runner/impl/VbParseTestRunnerImpl.java b/src/test/java/io/proleap/vb6/runner/impl/VbParseTestRunnerImpl.java index 72fb1ce..9cf7b5d 100644 --- a/src/test/java/io/proleap/vb6/runner/impl/VbParseTestRunnerImpl.java +++ b/src/test/java/io/proleap/vb6/runner/impl/VbParseTestRunnerImpl.java @@ -16,11 +16,11 @@ import java.io.IOException; import java.io.InputStream; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import org.antlr.v4.runtime.CharStreams; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.Trees; -import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; @@ -56,7 +56,7 @@ public class VbParseTestRunnerImpl implements VbParseTestRunner { protected void doCompareParseTree(final File treeFile, final StartRuleContext startRule, final VisualBasic6Parser parser) throws IOException { - final String treeFileData = FileUtils.readFileToString(treeFile, StandardCharsets.UTF_8); + final String treeFileData = Files.readString(treeFile.toPath(), StandardCharsets.UTF_8); if (!StringUtils.isEmpty(treeFileData)) { LOG.info("Comparing parse tree with file {}.", treeFile.getName());