Merge pull request #174 from xamarin/multidex

moljac · web-flow · commit 178f42c126a3 · 2019-06-01T09:08:15.000+02:00
Add bindings for MultiDex
diff --git a/config.json b/config.json
@@ -337,6 +337,13 @@
 			"nugetId" : "Xamarin.AndroidX.MediaRouter",
 			"dependencyOnly" : false
 		}
+		,{
+			"groupId" : "androidx.multidex",
+			"artifactId" : "multidex",
+			"version" : "2.0.1",
+			"nugetId" : "Xamarin.AndroidX.MultiDex",
+			"dependencyOnly" : false
+		}
 		,{
 			"groupId" : "androidx.palette",
 			"artifactId" : "palette",
diff --git a/source/AndroidXTargets.cshtml b/source/AndroidXTargets.cshtml
@@ -31,6 +31,11 @@
 
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
+      if ($"{art.MavenGroupId}.{art.MavenArtifactId}" == "androidx.multidex.multidex") {
+        // multidex is a special case that only includes the aar conditionally
+        continue;
+      }
+
       if (art.MavenArtifactPackaging == "aar") {
     <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar">
       <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>
diff --git a/source/androidx.multidex/multidex/merge.targets b/source/androidx.multidex/multidex/merge.targets
@@ -0,0 +1,24 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup Condition="'$(AndroidEnableMultiDex)' == 'true'">
+    <AndroidApplicationJavaClass Condition="'$(AndroidApplicationJavaClass)' == ''">androidx.multidex.MultiDexApplication</AndroidApplicationJavaClass>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(AndroidEnableMultiDex)' == 'true'">
+    <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\aar\androidx.multidex.multidex.aar">
+      <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>
+    </AndroidAarLibrary>
+  </ItemGroup>
+
+  <Target Name="_AndroidXRemoveBundledMultidexArtifacts"
+          AfterTargets="_AddMultiDexDependencyJars"
+          Condition="'$(AndroidEnableMultiDex)' == 'true'">
+
+    <ItemGroup>
+      <AndroidJavaLibrary Remove="$(MonoAndroidToolsDirectory)\android-support-multidex.jar" />
+    </ItemGroup>
+
+  </Target>
+
+</Project>
diff --git a/source/androidx.multidex/multidex/transforms/EnumFields.xml b/source/androidx.multidex/multidex/transforms/EnumFields.xml
@@ -0,0 +1 @@
+﻿<enum-field-mappings></enum-field-mappings>
diff --git a/source/androidx.multidex/multidex/transforms/EnumMethods.xml b/source/androidx.multidex/multidex/transforms/EnumMethods.xml
@@ -0,0 +1 @@
+﻿<enum-method-mappings></enum-method-mappings>
diff --git a/source/androidx.multidex/multidex/transforms/Metadata.Namespaces.xml b/source/androidx.multidex/multidex/transforms/Metadata.Namespaces.xml
@@ -0,0 +1 @@
+﻿<metadata></metadata>
diff --git a/source/androidx.multidex/multidex/transforms/Metadata.ParameterNames.xml b/source/androidx.multidex/multidex/transforms/Metadata.ParameterNames.xml
@@ -0,0 +1 @@
+﻿<metadata></metadata>
diff --git a/source/androidx.multidex/multidex/transforms/Metadata.xml b/source/androidx.multidex/multidex/transforms/Metadata.xml
@@ -0,0 +1,3 @@
+﻿<metadata>
+    <remove-node path="/api/package[@name='androidx.multidex']" />
+</metadata>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<enum-field-mappings></enum-field-mappings>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<enum-method-mappings></enum-method-mappings>`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<metadata>`
	`2`	`+ <remove-node path="/api/package[@name='androidx.multidex']" />`
	`3`	`+</metadata>`