Skip to content

Commit 5cd1b05

Browse files
committed
Merge branch 'bugfix/duplicate-dependencies-gradle-template' of https://github.com/googlesamples/unity-jar-resolver into bugfix/duplicate-dependencies-gradle-template
2 parents f4b84d1 + a1992c4 commit 5cd1b05

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/Assets/ExternalDependencyManager/Editor/TestAdditionalDuplicateDependencies.template

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<androidPackage spec="com.google.android.gms:play-services-base:18.0.1" />
55
<!-- Duplicate entry for package with a different version (lower). -->
66
<androidPackage spec="com.google.android.gms:play-services-base:12.0.1" />
7+
<!-- Duplicate entry for package with a different version (wildcard). -->
8+
<androidPackage spec="com.google.firebase:firebase-app-unity:5.+"/>
79
<!-- Duplicate entry for package with the exact same version. -->
810
<androidPackage spec="com.android.support:support-annotations:26.1.0"/>
911
</androidPackages>

source/AndroidResolver/test/AndroidResolverIntegrationTestsUnityProject/ExpectedArtifacts/NoExport/GradleTemplateDuplicatePackages/mainTemplate.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ dependencies {
5050
// compile 'com.google.android.gms:play-services-base:12.0.1' // Assets/ExternalDependencyManager/Editor/TestAdditionalDuplicateDependencies.xml:6
5151
// compile 'com.google.android.gms:play-services-base:15.0.1' // Assets/ExternalDependencyManager/Editor/TestAdditionalDependencies.xml:3
5252
compile 'com.google.android.gms:play-services-base:18.0.1' // Assets/ExternalDependencyManager/Editor/TestAdditionalDuplicateDependencies.xml:4
53+
// compile 'com.google.firebase:firebase-app-unity:5.+' // Assets/ExternalDependencyManager/Editor/TestAdditionalDuplicateDependencies.xml:6
5354
compile 'com.google.firebase:firebase-app-unity:5.1.1' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:10
5455
compile 'com.google.firebase:firebase-common:16.0.0' // Google.AndroidResolverIntegrationTests.SetupDependencies
5556
compile 'org.test.psr:classifier:1.0.1:foo@aar' // Assets/ExternalDependencyManager/Editor/TestDependencies.xml:12

0 commit comments

Comments
 (0)