Merge branch 'main' into mu-20240820

xamarin · Aug 30, 2024 · 3d5b653 · 3d5b653
2 parents 07528db + 0febd63
commit 3d5b653
Show file tree

Hide file tree

Showing 34 changed files with 415 additions and 8,557 deletions.
diff --git a/build/scripts/update-config.csx b/build/scripts/update-config.csx
diff --git a/cgmanifest.json b/cgmanifest.json
diff --git a/config.json b/config.json
diff --git a/docs/artifact-list-with-versions.md b/docs/artifact-list-with-versions.md
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
@@ -50,7 +50,7 @@
 
   <!-- Packaging files -->
   <ItemGroup>
-    @if (Model.ShouldIncludeArtifact) {
+    @if (Model.ShouldIncludeArtifact && Model.Type == AndroidBinderator.BindingType.Targets) {
     <None Include="@(Model.NuGetPackageId).targets" Pack="True" PackagePath="@@(AndroidXNuGetTargetFolders)" />
     }
     <None Include="..\..\source\PackageLicense.md" Pack="True" PackagePath="LICENSE.md" />
@@ -96,6 +96,7 @@
     </TransformFile>
   </ItemGroup>
 
+@if (Model.Type == AndroidBinderator.BindingType.Targets) {
   @if (@Model.MavenArtifacts.Count > 0) {
   <!-- Java artifacts to bind -->
   <ItemGroup>
@@ -138,6 +139,23 @@
       }
     }
   </ItemGroup>
+}
+@if (Model.Type == AndroidBinderator.BindingType.AndroidLibrary) {
+  <ItemGroup>
+      @foreach (var art in @Model.MavenArtifacts)
+      {
+    <AndroidLibrary Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).@(art.MavenArtifactPackaging)" />
+        @if (art.DocumentationType == AndroidBinderator.DocumentationType.JavaDoc)
+        {
+    <JavaDocJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-javadoc.jar" />
+        }
+        @if (art.DocumentationType == AndroidBinderator.DocumentationType.JavaSource)
+        {
+    <JavaSourceJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)-sources.jar" />
+        }
+      }
+  </ItemGroup>
+}
 
   <!-- ProjectReferences -->
   <ItemGroup>

diff --git a/templates/accompanist/External-Dependency-Info.txt b/templates/accompanist/External-Dependency-Info.txt
diff --git a/templates/accompanist/Project.cshtml b/templates/accompanist/Project.cshtml