Merge pull request #117 from jkasnicki/jkasnicki_fix_105

Fix #105 by che…
google · Jan 10, 2020 · 81f8272 · 81f8272
2 parents d10b99a + 31b09ba
commit 81f8272
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/...s-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/DependencyTask.groovy b/...s-plugin/src/main/groovy/com/google/android/gms/oss/licenses/plugin/DependencyTask.groovy
@@ -163,6 +163,12 @@ class DependencyTask extends DefaultTask {
  boolean isPackagedDependency = PACKAGED_DEPENDENCIES_PREFIXES.any {
  configuration.name.startsWith(it)
  }
+ configuration.hierarchy.each {
+ String configurationHierarchyName = it.name
+ isPackagedDependency |= PACKAGED_DEPENDENCIES_PREFIXES.any {
+ configurationHierarchyName.startsWith(it)
+ }
+ }
 
  return isPackagedDependency
  }

diff --git a/...s-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/DependencyTaskTest.java b/...s-plugin/src/test/java/com/google/android/gms/oss/licenses/plugin/DependencyTaskTest.java
@@ -180,6 +180,26 @@ public void testGetResolvedArtifacts_isPackagedCompile() {
  assertThat(dependencyTask.getResolvedArtifacts(configuration), is(artifactSet));
  }
 
+ @Test
+ public void testGetResolvedArtifacts_isPackagedInHierachy() {
+ Set<ResolvedArtifact> artifactSet = (Set<ResolvedArtifact>) mock(Set.class);
+ ResolvedConfiguration resolvedConfiguration = mock(ResolvedConfiguration.class);
+ when(resolvedConfiguration.getResolvedArtifacts()).thenReturn(artifactSet);
+
+ Configuration configuration = mock(Configuration.class);
+ when(configuration.getName()).thenReturn("random");
+ when(configuration.isCanBeResolved()).thenReturn(true);
+ when(configuration.getResolvedConfiguration()).thenReturn(resolvedConfiguration);
+
+ Configuration parent = mock(Configuration.class);
+ when(parent.getName()).thenReturn("compile");
+ Set<Configuration> hierarchy = new HashSet<>();
+ hierarchy.add(parent);
+ when(configuration.getHierarchy()).thenReturn(hierarchy);
+
+ assertThat(dependencyTask.getResolvedArtifacts(configuration), is(artifactSet));
+ }
+
 
  @Test
  public void testGetResolvedArtifacts_ResolveException() {