Exclude some transitive dependencies of OpenRewrite

Col-E · Nov 24, 2024 · 4950fd2 · 4950fd2
1 parent ea47421
commit 4950fd2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -29,7 +29,7 @@ logback-classic = { strictly = "1.4.11" } # newer releases break in jar releases
 mapping-io = "0.6.1"
 mockito = "5.14.2"
 natural-order = "1.1"
-openrewrite = "8.37.1"
+openrewrite = "8.40.3"
 picocli = "4.7.6"
 procyon = "0.6.0"
 reactfx = { strictly = "2.0-M5" } # won't get updates, dead

diff --git a/recaf-core/build.gradle b/recaf-core/build.gradle
@@ -35,7 +35,14 @@ dependencies {
     api(libs.procyon)
     api(libs.jackson)
     api(libs.jlinker)
-    api(libs.openrewrite)
+    api(libs.openrewrite) {
+        exclude group: 'net.java.dev.jna'
+        exclude group: 'org.latencyutils'
+        exclude group: 'org.openrewrite', module: 'rewrite-yaml'
+        exclude group: 'org.openrewrite', module: 'rewrite-xml'
+        exclude group: 'org.xerial.snappy'
+        exclude group: 'org.yaml'
+    }
     api(libs.regex)
     api(libs.bundles.jasm)
     api(libs.vineflower)

diff --git a/recaf-core/src/main/java/software/coley/recaf/services/source/AstRangeMapper.java b/recaf-core/src/main/java/software/coley/recaf/services/source/AstRangeMapper.java
@@ -93,17 +93,17 @@ public J visit(@Nullable Tree tree, @Nonnull PrintOutputCapture<ExecutionContext
 			}
 
 			@Override
-			protected void visitModifier(@Nonnull J.Modifier modifier, PrintOutputCapture<ExecutionContext> p) {
+			public J visitModifier(@Nonnull J.Modifier modifier, PrintOutputCapture<ExecutionContext> p) {
 				PositionPrintOutputCapture prefix = new PositionPrintOutputCapture(ppoc);
 				spacePrinter.visitSpace(modifier.getPrefix(), Space.Location.ANY, prefix);
 
 				Range.Position startPosition = new Range.Position(prefix.posInBacking, prefix.line, prefix.column);
-				super.visitModifier(modifier, p);
+				J ret = super.visitModifier(modifier, p);
 				Range.Position endPosition = new Range.Position(ppoc.posInBacking, ppoc.line, ppoc.column);
 				Range range = new Range(randomId(), startPosition, endPosition);
 				rangeMap.put(range, modifier);
+				return ret;
 			}
-
 		};
 		printer.visit(tree, ppoc);