Skip to content

Commit fe5884b

Browse files
committed
Fix Maven resolver selecting wrong dependencies
1 parent 6ef8d0e commit fe5884b

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

src/main/java/io/github/bensku/tsbind/binding/EarlyTypeTransformer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,9 @@ public void addMissingOverloads(TypeDefinition type) {
6060
visitSupertypes(type, parent -> {
6161
for (Member member : parent.members) {
6262
if (member instanceof Method && type.hasMember(member.name())) {
63-
if (new MethodId((Method) member).paramTypes.toString().contains("ComponentLike")) {
64-
System.out.println(member.name() + " " + new MethodId((Method) member).paramTypes);
65-
}
6663
// We have a member with same name
6764
// If it has different signature, we need to copy the missing overload
6865
if (!methods.contains(new MethodId((Method) member))) {
69-
System.out.println("add overload: " + member.name() + " " + type.name());
7066
type.members.add(member);
7167
}
7268
}

src/main/java/io/github/bensku/tsbind/cli/MavenResolver.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,9 @@ private List<String> getDependencies(String pomXml) throws IOException, Interrup
136136
List<String> deps = new ArrayList<>();
137137

138138
Document doc = Jsoup.parse(pomXml, "", Parser.xmlParser());
139-
// Select last <dependencies> so we don't hit one under <dependencyManagement>
140-
Element depsTag = doc.selectFirst("project").select("dependencies").last();
139+
// Select <dependencies> directly under project to avoid
140+
// <dependencyManagement> and plugin dependencies
141+
Element depsTag = doc.selectFirst("project").select("> dependencies").first();
141142
if (depsTag == null) {
142143
return deps; // No dependencies
143144
}

0 commit comments

Comments
 (0)