Skip to content

Commit

Permalink
chore: PR comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Dror Ben-Gai committed Jun 6, 2017
1 parent 960f07e commit 92429bb
Show file tree
Hide file tree
Showing 4 changed files with 3,218 additions and 5 deletions.
6 changes: 4 additions & 2 deletions lib/plugins/gradle/gradle-deps-parse.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function processGradleOutput(text) {
}, [])
.filter(function (element) {
// filter out FAILED dependencies
return !element.endsWith('FAILED');
return element.match(/ FAILED$/) === null;
})
.map(function (element) {
// remove all hierarchy markings, but keep the hierarchy structure
Expand All @@ -44,7 +44,9 @@ function processGradleOutput(text) {
var omitStarSplit = element.split(' (*)');
if (omitStarSplit.length > 1) {
element = omitStarSplit[0];
omittedDeps[element.substring(0, element.lastIndexOf(':')).trim()] = true;
var parts = element.split(':');
// omittedDeps key is 'groupId:artifactId' (without the version)
omittedDeps[parts[0].trim() + ':' + parts[1]] = true;
}

return element;
Expand Down
167 changes: 165 additions & 2 deletions test/fixtures/gradle/gradle-dependencies-output.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@
Root project
------------------------------------------------------------

runtime - Runtime dependencies for source set 'main' (deprecated, use 'runtimeOnly ' instead).
apiElements - API elements for main. (n)
No dependencies

archives - Configuration for archive artifacts.
No dependencies

compile - Dependencies for source set 'main' (deprecated, use 'implementation ' instead).
+--- com.google.guava:guava:18.0
+--- batik:batik-dom:1.6
+--- commons-discovery:commons-discovery:0.2
| \--- commons-logging:commons-logging:1.0.3 -> 1.1.1
+--- failed:failed:1.6999999 FAILED
+--- axis:axis:1.3
| +--- axis:axis-jaxrpc:1.3
| +--- axis:axis-saaj:1.3
Expand Down Expand Up @@ -85,8 +92,164 @@ runtime - Runtime dependencies for source set 'main' (deprecated, use 'runtimeOn
\--- org.ow2.asm:asm-tree:5.0.4
\--- org.ow2.asm:asm:5.0.4

runtime - Runtime dependencies for source set 'main' (deprecated, use 'runtimeOnly ' instead).
+--- com.google.guava:guava:18.0
+--- batik:batik-dom:1.6999999 FAILED
+--- commons-discovery:commons-discovery:0.2
| \--- commons-logging:commons-logging:1.0.3 -> 1.1.1
\--- com.android.tools.build:builder:2.3.0
+--- com.android.tools.build:builder-model:2.3.0
| \--- com.android.tools:annotations:25.3.0
+--- com.android.tools.build:builder-test-api:2.3.0
| \--- com.android.tools.ddms:ddmlib:25.3.0
| +--- com.android.tools:common:25.3.0
| | +--- com.android.tools:annotations:25.3.0
| | \--- com.google.guava:guava:18.0
| \--- net.sf.kxml:kxml2:2.3.0
+--- com.android.tools:sdklib:25.3.0
| +--- com.android.tools.layoutlib:layoutlib-api:25.3.0
| | +--- com.android.tools:common:25.3.0 (*)
| | +--- net.sf.kxml:kxml2:2.3.0
| | +--- com.android.tools:annotations:25.3.0
| | \--- com.intellij:annotations:12.0
| +--- com.android.tools:dvlib:25.3.0
| | \--- com.android.tools:common:25.3.0 (*)
| +--- com.android.tools:repository:25.3.0
| | +--- com.android.tools:common:25.3.0 (*)
| | +--- org.apache.commons:commons-compress:1.8.1
| | \--- com.google.jimfs:jimfs:1.1
| | \--- com.google.guava:guava:18.0
| +--- com.google.code.gson:gson:2.2.4
| +--- org.apache.commons:commons-compress:1.8.1
| +--- org.apache.httpcomponents:httpclient:4.1.1
| | +--- org.apache.httpcomponents:httpcore:4.1
| | +--- commons-logging:commons-logging:1.1.1
| | \--- commons-codec:commons-codec:1.4
| \--- org.apache.httpcomponents:httpmime:4.1
| +--- org.apache.httpcomponents:httpcore:4.1
| \--- commons-logging:commons-logging:1.1.1
+--- com.android.tools:sdk-common:25.3.0
| +--- com.android.tools:sdklib:25.3.0 (*)
| +--- com.android.tools.build:builder-test-api:2.3.0 (*)
| +--- com.android.tools.build:builder-model:2.3.0 (*)
| +--- org.bouncycastle:bcpkix-jdk15on:1.48
| | \--- org.bouncycastle:bcprov-jdk15on:1.48
| \--- org.bouncycastle:bcprov-jdk15on:1.48
+--- com.android.tools:common:25.3.0 (*)
+--- com.android.tools.build:manifest-merger:25.3.0
| +--- com.android.tools:common:25.3.0 (*)
| +--- com.android.tools:sdklib:25.3.0 (*)
| +--- com.android.tools:sdk-common:25.3.0 (*)
| +--- net.sf.kxml:kxml2:2.3.0
| \--- com.google.code.gson:gson:2.2.4
+--- com.android.tools.ddms:ddmlib:25.3.0 (*)
+--- com.android.tools.jack:jack-api:0.13.0
+--- com.android.tools.jill:jill-api:0.10.0
+--- com.android.tools.analytics-library:protos:25.3.0
| \--- com.google.protobuf:protobuf-java:3.0.0
+--- com.android.tools.analytics-library:shared:25.3.0
| +--- com.android.tools.analytics-library:protos:25.3.0 (*)
| +--- com.android.tools:annotations:25.3.0
| +--- com.android.tools:common:25.3.0 (*)
| +--- com.google.guava:guava:18.0
| \--- com.google.code.gson:gson:2.2.4
+--- com.android.tools.analytics-library:tracker:25.3.0
| +--- com.android.tools:annotations:25.3.0
| +--- com.android.tools:common:25.3.0 (*)
| +--- com.android.tools.analytics-library:protos:25.3.0 (*)
| +--- com.android.tools.analytics-library:shared:25.3.0 (*)
| +--- com.google.protobuf:protobuf-java:3.0.0
| \--- com.google.guava:guava:18.0
+--- com.squareup:javawriter:2.5.0
+--- org.bouncycastle:bcpkix-jdk15on:1.48 (*)
+--- org.bouncycastle:bcprov-jdk15on:1.48
+--- org.ow2.asm:asm:5.0.4
\--- org.ow2.asm:asm-tree:5.0.4
\--- org.ow2.asm:asm:5.0.4

testCompile - Dependencies for source set 'test' (deprecated, use 'testImplementation ' instead).
+--- com.google.guava:guava:18.0
+--- batik:batik-dom:1.6999999 FAILED
+--- commons-discovery:commons-discovery:0.2
| \--- commons-logging:commons-logging:1.0.3 -> 1.1.1
+--- com.android.tools.build:builder:2.3.0
| +--- com.android.tools.build:builder-model:2.3.0
| | \--- com.android.tools:annotations:25.3.0
| +--- com.android.tools.build:builder-test-api:2.3.0
| | \--- com.android.tools.ddms:ddmlib:25.3.0
| | +--- com.android.tools:common:25.3.0
| | | +--- com.android.tools:annotations:25.3.0
| | | \--- com.google.guava:guava:18.0
| | \--- net.sf.kxml:kxml2:2.3.0
| +--- com.android.tools:sdklib:25.3.0
| | +--- com.android.tools.layoutlib:layoutlib-api:25.3.0
| | | +--- com.android.tools:common:25.3.0 (*)
| | | +--- net.sf.kxml:kxml2:2.3.0
| | | +--- com.android.tools:annotations:25.3.0
| | | \--- com.intellij:annotations:12.0
| | +--- com.android.tools:dvlib:25.3.0
| | | \--- com.android.tools:common:25.3.0 (*)
| | +--- com.android.tools:repository:25.3.0
| | | +--- com.android.tools:common:25.3.0 (*)
| | | +--- org.apache.commons:commons-compress:1.8.1
| | | \--- com.google.jimfs:jimfs:1.1
| | | \--- com.google.guava:guava:18.0
| | +--- com.google.code.gson:gson:2.2.4
| | +--- org.apache.commons:commons-compress:1.8.1
| | +--- org.apache.httpcomponents:httpclient:4.1.1
| | | +--- org.apache.httpcomponents:httpcore:4.1
| | | +--- commons-logging:commons-logging:1.1.1
| | | \--- commons-codec:commons-codec:1.4
| | \--- org.apache.httpcomponents:httpmime:4.1
| | +--- org.apache.httpcomponents:httpcore:4.1
| | \--- commons-logging:commons-logging:1.1.1
| +--- com.android.tools:sdk-common:25.3.0
| | +--- com.android.tools:sdklib:25.3.0 (*)
| | +--- com.android.tools.build:builder-test-api:2.3.0 (*)
| | +--- com.android.tools.build:builder-model:2.3.0 (*)
| | +--- org.bouncycastle:bcpkix-jdk15on:1.48
| | | \--- org.bouncycastle:bcprov-jdk15on:1.48
| | \--- org.bouncycastle:bcprov-jdk15on:1.48
| +--- com.android.tools:common:25.3.0 (*)
| +--- com.android.tools.build:manifest-merger:25.3.0
| | +--- com.android.tools:common:25.3.0 (*)
| | +--- com.android.tools:sdklib:25.3.0 (*)
| | +--- com.android.tools:sdk-common:25.3.0 (*)
| | +--- net.sf.kxml:kxml2:2.3.0
| | \--- com.google.code.gson:gson:2.2.4
| +--- com.android.tools.ddms:ddmlib:25.3.0 (*)
| +--- com.android.tools.jack:jack-api:0.13.0
| +--- com.android.tools.jill:jill-api:0.10.0
| +--- com.android.tools.analytics-library:protos:25.3.0
| | \--- com.google.protobuf:protobuf-java:3.0.0
| +--- com.android.tools.analytics-library:shared:25.3.0
| | +--- com.android.tools.analytics-library:protos:25.3.0 (*)
| | +--- com.android.tools:annotations:25.3.0
| | +--- com.android.tools:common:25.3.0 (*)
| | +--- com.google.guava:guava:18.0
| | \--- com.google.code.gson:gson:2.2.4
| +--- com.android.tools.analytics-library:tracker:25.3.0
| | +--- com.android.tools:annotations:25.3.0
| | +--- com.android.tools:common:25.3.0 (*)
| | +--- com.android.tools.analytics-library:protos:25.3.0 (*)
| | +--- com.android.tools.analytics-library:shared:25.3.0 (*)
| | +--- com.google.protobuf:protobuf-java:3.0.0
| | \--- com.google.guava:guava:18.0
| +--- com.squareup:javawriter:2.5.0
| +--- org.bouncycastle:bcpkix-jdk15on:1.48 (*)
| +--- org.bouncycastle:bcprov-jdk15on:1.48
| +--- org.ow2.asm:asm:5.0.4
| \--- org.ow2.asm:asm-tree:5.0.4
| \--- org.ow2.asm:asm:5.0.4
\--- axis:axis:1.3
+--- axis:axis-jaxrpc:1.3
+--- axis:axis-saaj:1.3
+--- wsdl4j:wsdl4j:1.5.1
+--- commons-logging:commons-logging:1.0.4 -> 1.1.1
\--- commons-discovery:commons-discovery:0.2 (*)

(*) - dependencies omitted (listed previously)

BUILD SUCCESSFUL

Total time: 1.102 secs
Total time: 1.7 secs
Loading

0 comments on commit 92429bb

Please sign in to comment.