Skip to content

Commit 4c910b9

Browse files
committed
fix: npe on malformed dependencies
1 parent 254bfd6 commit 4c910b9

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

build-tools/build-logic/src/main/java/com/tyron/builder/compiler/dex/D8Task.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
package com.tyron.builder.compiler.dex;
23

34
import com.android.tools.r8.CompilationMode;

dependency-resolver/src/main/java/com/tyron/resolver/DependencyResolver.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,20 @@ private void resolve(Pom pom) {
9797
}
9898

9999
boolean excluded = excludes.stream().filter(Objects::nonNull).anyMatch(ex -> {
100+
if (ex == null) {
101+
return false;
102+
}
103+
if (ex.getGroupId() == null) {
104+
return false;
105+
}
100106
if (!ex.getGroupId().equals(dependency.getGroupId())) {
101107
return false;
102108
}
109+
110+
if (ex.getArtifactId() == null) {
111+
return false;
112+
}
113+
103114
if (!ex.getArtifactId().equals(dependency.getArtifactId())) {
104115
return false;
105116
}

0 commit comments

Comments
 (0)