feat: updated dependencies.

Author: jrfaller

gen.css/build.gradle

@@ -7,5 +7,6 @@ description = 'GumTree tree generator for CSS code based on ph-css.'
 
 dependencies {
 	implementation project(':core')
-	implementation 'com.helger:ph-css:7.0.3'
+	implementation 'com.helger:ph-css:8.0.0'
+    implementation 'jakarta.annotation:jakarta.annotation-api:3.0.0'
 }

gen.css/src/main/java/com/github/gumtreediff/gen/css/CssTreeGenerator.java

@@ -25,7 +25,6 @@
 import com.github.gumtreediff.gen.TreeGenerator;
 import com.github.gumtreediff.io.LineReader;
 import com.github.gumtreediff.tree.TreeContext;
-import com.helger.css.ECSSVersion;
 import com.helger.css.decl.CascadingStyleSheet;
 import com.helger.css.decl.visit.CSSVisitor;
 import com.helger.css.handler.CSSHandler;
@@ -47,7 +46,6 @@ public TreeContext generate(Reader r) throws IOException {
         p.setBrowserCompliantMode(false);
         try {
             CascadingStyleSheet sheet = CSSHandler.readCascadingStyleSheetFromNode(
-                    ECSSVersion.LATEST,
                     CSSReader.getDefaultInterpretErrorHandler(),
                     true,
                     p.styleSheet());

gen.css/src/main/java/com/github/gumtreediff/gen/css/GtCssVisitor.java

@@ -30,23 +30,19 @@
 import com.helger.css.decl.*;
 import com.helger.css.decl.visit.ICSSVisitor;
 import com.helger.css.writer.CSSWriterSettings;
+import jakarta.annotation.Nonnull;
 
-import javax.annotation.Nonnull;
-import java.io.IOException;
 import java.util.ArrayDeque;
 
 public class GtCssVisitor implements ICSSVisitor {
-    private TreeContext ctx;
-    private ArrayDeque<Tree> trees;
-    private LineReader lr;
-    private ICSSWriterSettings settings;
+    private final TreeContext ctx;
+    private final ArrayDeque<Tree> trees;
+    private final LineReader lr;
+    private final ICSSWriterSettings settings;
 
-    private CascadingStyleSheet sheet;
-
-    public GtCssVisitor(CascadingStyleSheet sheet, LineReader lr) throws IOException {
+    public GtCssVisitor(CascadingStyleSheet sheet, LineReader lr) {
         this.lr = lr;
         this.settings = new CSSWriterSettings();
-        this.sheet = sheet;
         this.ctx = new TreeContext();
         this.trees = new ArrayDeque<>();
         Tree root = this.ctx.createTree(symbol(sheet), Tree.NO_LABEL);
@@ -173,6 +169,12 @@ public void onBeginSupportsRule(@Nonnull CSSSupportsRule aSupportsRule) {}
     @Override
     public void onEndSupportsRule(@Nonnull CSSSupportsRule aSupportsRule) {}
 
+    @Override
+    public void onBeginLayerRule(@Nonnull CSSLayerRule aLayerRule) {}
+
+    @Override
+    public void onEndLayerRule(@Nonnull CSSLayerRule aLayerRule) {}
+
     @Override
     public void onUnknownRule(@Nonnull CSSUnknownRule aUnknownRule) {}
 

gen.css/src/test/java/com/github/gumtreediff/gen/css/TestCssTreeGenerator.java

@@ -31,23 +31,21 @@
 public class TestCssTreeGenerator {
     @Test
     public void testSimple() throws Exception {
-        Reader r = new StringReader("@import url(\"bluish.css\") projection, tv;\n"
+        String input = "@import url(\"bluish.css\") projection, tv;\n"
                 + "body {\n"
                 + "\tfont-size: 11pt;\n"
                 + "}\n"
                 + "ul li {\n"
                 + "\tbackground-color: black;\n"
-                + "}");
-        TreeContext ctx = new CssTreeGenerator().generateFrom().reader(r);
+                + "}";
+        TreeContext ctx = new CssTreeGenerator().generateFrom().string(input);
         Tree tree = ctx.getRoot();
         assertEquals(10, tree.getMetrics().size);
     }
 
     @Test
-    public void badSyntax() throws IOException {
+    public void badSyntax() {
         String input = ".foo \"toto {\nfont-size: 11pt;\n}";
-        assertThrows(SyntaxException.class, () -> {
-            TreeContext ct = new CssTreeGenerator().generateFrom().string(input);
-        });
+        assertThrows(SyntaxException.class, () -> new CssTreeGenerator().generateFrom().string(input));
     }
 }

gen.javaparser/build.gradle

@@ -7,5 +7,5 @@ description = 'GumTree tree generator for Java code (JavaParser based).'
 
 dependencies {
 	implementation project(':core')
-	implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.26.3'
+	implementation 'com.github.javaparser:javaparser-symbol-solver-core:3.27.0'
 }

gen.jdt/build.gradle

@@ -7,5 +7,5 @@ description = 'GumTree tree generator for Java code (Eclipse JDT based).'
 
 dependencies {
 	implementation project(':core')
-	implementation 'org.eclipse.jdt:org.eclipse.jdt.core:3.38.0'
+	implementation 'org.eclipse.jdt:org.eclipse.jdt.core:3.43.0'
 }

gen.json/build.gradle

@@ -6,5 +6,5 @@ description = 'GumTree tree generator for JSON code (Jackson based).'
 
 dependencies {
     implementation project(':core')
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.18.2'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.20.0'
 }

gen.json/src/main/java/com/github/gumtreediff/gen/json/JsonTreeGenerator.java

@@ -35,11 +35,10 @@
 @Register(id = "json-jackson", accept = {"\\.json"}, priority = Registry.Priority.MAXIMUM)
 public class JsonTreeGenerator extends TreeGenerator {
     private Stack<Tree> trees;
-    private TreeContext ctx;
 
     @Override
     public TreeContext generate(Reader r) throws IOException {
-        ctx = new TreeContext();
+        TreeContext ctx = new TreeContext();
         trees = new Stack<>();
         JsonFactory factory = JsonFactory.builder().build();
         JsonParser p = factory.createParser(r);

gen.json/src/test/java/com/github/gumtreediff/gen/json/TestJsonTreeGenerator.java

@@ -44,21 +44,21 @@ public void testJsonArray() throws IOException {
     }
 
     @Test
-    public void testSyntaxError1() throws IOException {
+    public void testSyntaxError1() {
         String input = "{ \"foo\": \"bar\" ";
         Assertions.assertThrows(SyntaxException.class,
                 () -> new JsonTreeGenerator().generateFrom().string(input));
     }
 
     @Test
-    public void testSyntaxError2() throws IOException {
+    public void testSyntaxError2() {
         String input = "{ foo: \"bar\" }";
         Assertions.assertThrows(SyntaxException.class,
                 () -> new JsonTreeGenerator().generateFrom().string(input));
     }
 
     @Test
-    public void testSyntaxError3() throws IOException {
+    public void testSyntaxError3() {
         String input = "{ \"foo\" = \"bar\" }";
         Assertions.assertThrows(SyntaxException.class,
                 () -> new JsonTreeGenerator().generateFrom().string(input));

gen.xml/build.gradle

@@ -7,5 +7,5 @@ description = 'GumTree tree generator for XML code (JSoup based).'
 
 dependencies {
     implementation project(':core')
-    implementation 'org.jsoup:jsoup:1.18.3'
+    implementation 'org.jsoup:jsoup:1.21.2'
 }