Skip to content

Commit 858ade1

Browse files
author
Stewart Miles
committed
Deduplicated warnings when keeping an Android dependency.
Change-Id: Ib7d9f0bb6984d9333a215b1528aa254a756a35a4
1 parent b8ae807 commit 858ade1

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

source/PlayServicesResolver/scripts/download_artifacts.gradle

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -917,11 +917,14 @@ Tuple2<Boolean, Set<PackageSpecifier>> loosenVersionContraintsForConflicts(
917917
requestedPackage.versionRange.matchType ==
918918
VersionExpressionMatchType.ABSOLUTE &&
919919
isConflicting) {
920-
logger.log(LogLevel.WARN,
921-
sprintf("Keeping conflicting package %s as it's explicitly " +
922-
"specified at version %s",
923-
requestedPackage.specString,
924-
requestedPackage.versionExpression))
920+
if (!(requestedPackage.groupArtifactString in
921+
conflictingByGroupArtifact.keySet())) {
922+
logger.log(LogLevel.WARN,
923+
sprintf("Keeping conflicting package %s as it's " +
924+
"explicitly specified at version %s",
925+
requestedPackage.specString,
926+
requestedPackage.versionExpression))
927+
}
925928
addMostRecentPackageToMap(packages, requestedPackage)
926929
return trackConflictState(requestedPackage, false)
927930
}

0 commit comments

Comments
 (0)