This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 3e46e3c

committed

Use full path to downloaded artifacts

Avoids .jar name collisions

1 parent 68e0ea0 commit 3e46e3cCopy full SHA for 3e46e3c

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`[{`
`2`	`2`	`"mavenRepositoryType" : "Google",`
`3`	`3`	`"slnFile" : "generated/AndroidSupport.sln",`
	`4`	`+ "downloadExternalsWithFullName" : true,`
`4`	`5`	`"additionalProjects": [`
`5`	`6`	`"source/buildtasks/support-annotations/Support-Annotations-BuildTasks.csproj",`
`6`	`7`	`"source/buildtasks/support-annotations-tests/Support-Annotations-BuildTasks-Tests.csproj",`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@`
`73`	`73`	`<ItemGroup>`
`74`	`74`	`@foreach (var art in @Model.MavenArtifacts) {`
`75`	`75`	`if (art.MavenArtifactPackaging == "aar") {`
`76`		`- <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" />`
	`76`	`+ <LibraryProjectZip Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`	`</ItemGroup>`
`@@ -119,7 +119,7 @@`
`119`	`119`	`Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)\libs\*.jar"`
`120`	`120`	`/>`
`121`	`121`	`} else {`
`122`		`- <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />`
	`122`	`+ <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenGroupId).@(art.MavenArtifactId).jar" />`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`</ItemGroup>`

Comments

(0)