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

Commit db85587

Browse files
committed
Name artifacts with maven group id
We were running into issues where the .jar was being embedded as the artifact id which in multiple cases was 'common.jar' and would cause duplicate .jar errors when building in an app. We are renaming them to the full groupid.artifactid instead to make them unique.
1 parent 0be282c commit db85587

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

source/AndroidSupportProject.cshtml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@
3939

4040
<ItemGroup>
4141
@foreach (var art in @Model.MavenArtifacts) {
42-
<TransformFile Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-paramnames.xml" Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-paramnames.xml')" />
42+
<TransformFile Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)-paramnames.xml" Condition="Exists('..\..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)-paramnames.xml')" />
4343
}
4444
</ItemGroup>
4545

4646
@*<ItemGroup>
4747
@foreach (var art in @Model.MavenArtifacts) {
48-
<JavaSourceJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar" Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar')" />
48+
<JavaSourceJar Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)-sources.jar" Condition="Exists('..\..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)-sources.jar')" />
4949
}
5050
</ItemGroup>*@
5151

5252

5353
<ItemGroup>
5454
@foreach (var art in @Model.MavenArtifacts) {
55-
<_AndroidDocumentationPath Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-paramnames.txt" Condition="Exists('..\..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-paramnames.txt')" />
55+
<_AndroidDocumentationPath Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)-paramnames.txt" Condition="Exists('..\..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)-paramnames.txt')" />
5656
}
5757
</ItemGroup>
5858

@@ -94,7 +94,7 @@
9494
<ItemGroup>
9595
@foreach (var art in @Model.MavenArtifacts) {
9696
if (art.MavenArtifactPackaging == "aar") {
97-
<None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" />
97+
<None Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" />
9898
}
9999
}
100100
</ItemGroup>
@@ -104,14 +104,14 @@
104104
<ItemGroup>
105105
@foreach (var art in @Model.MavenArtifacts) {
106106
if (art.MavenArtifactPackaging == "aar") {
107-
<InputJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)\classes.jar" />
107+
<InputJar Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)\classes.jar" />
108108
<!-- For those artifacts with lib/ folder -->
109109
<InputJar
110-
Condition="Exists('..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)\libs\')"
111-
Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)\libs\*.jar"
110+
Condition="Exists('..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)\libs\')"
111+
Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId)\libs\*.jar"
112112
/>
113113
} else {
114-
<EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />
114+
<EmbeddedJar Include="..\..\externals\@(art.MavenGroupId).@(art.MavenArtifactId).jar" />
115115
}
116116
}
117117
</ItemGroup>

util/binderator.zip

135 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)