Embed .jar's inside nuget not inside dll (#171)

Redth · mattleibow · commit 1e220ec92b0b · 2019-05-29T06:24:53.000+02:00
* Switch to InputJar for jar files to embed it inside the nuget package via the targets file.
* Add `AndroidXSkipAndroidXMigration` to `AndroidJavaLibrary` and `ProguardConfiguration`
diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml
@@ -96,7 +96,9 @@
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
       if (art.MavenArtifactPackaging == "aar") {
-    <None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" />
+    <None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />
+      } else {
+    <None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" Pack="True" PackagePath="jar\@(art.MavenGroupId).@(art.MavenArtifactId).jar" />
       }
     }   
   </ItemGroup>
@@ -113,7 +115,7 @@
       Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)\libs\*.jar" 
       />
       } else {
-    <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />
+    <InputJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />
       }
     }
   </ItemGroup>
diff --git a/source/AndroidXTargets.cshtml b/source/AndroidXTargets.cshtml
@@ -17,10 +17,13 @@
 }
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   @if (@Model.MavenArtifacts.Count > 0) {
+
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
       if (art.ProguardFile != null) {
-    <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\proguard\proguard.txt" />
+    <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\proguard\proguard.txt">
+      <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>
+    </ProguardConfiguration>
       }
     }
   </ItemGroup>
@@ -29,9 +32,13 @@
   <ItemGroup>
     @foreach (var art in @Model.MavenArtifacts) {
       if (art.MavenArtifactPackaging == "aar") {
-    <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\aar\@(art.MavenArtifactId).aar">
+    <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar">
       <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>
     </AndroidAarLibrary>
+      } else {
+    <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\jar\@(art.MavenGroupId).@(art.MavenArtifactId).jar">
+      <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>
+    </AndroidJavaLibrary>
       }
     }   
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,9 @@`
`96`	`96`	`<ItemGroup>`
`97`	`97`	`@foreach (var art in @Model.MavenArtifacts) {`
`98`	`98`	`if (art.MavenArtifactPackaging == "aar") {`
`99`		`- <None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\" />`
	`99`	`+ <None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).aar" Pack="True" PackagePath="aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar" />`
	`100`	`+ } else {`
	`101`	`+ <None Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" Pack="True" PackagePath="jar\@(art.MavenGroupId).@(art.MavenArtifactId).jar" />`
`100`	`102`	`}`
`101`	`103`	`}`
`102`	`104`	`</ItemGroup>`
`@@ -113,7 +115,7 @@`
`113`	`115`	`Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId)\libs\*.jar"`
`114`	`116`	`/>`
`115`	`117`	`} else {`
`116`		`- <EmbeddedJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />`
	`118`	`+ <InputJar Include="..\..\externals\@(art.MavenGroupId)\@(art.MavenArtifactId).jar" />`
`117`	`119`	`}`
`118`	`120`	`}`
`119`	`121`	`</ItemGroup>`
Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,13 @@`
`17`	`17`	`}`
`18`	`18`	`<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">`
`19`	`19`	`@if (@Model.MavenArtifacts.Count > 0) {`
	`20`	`+`
`20`	`21`	`<ItemGroup>`
`21`	`22`	`@foreach (var art in @Model.MavenArtifacts) {`
`22`	`23`	`if (art.ProguardFile != null) {`
`23`		`- <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\proguard\proguard.txt" />`
	`24`	`+ <ProguardConfiguration Include="$(MSBuildThisFileDirectory)..\proguard\proguard.txt">`
	`25`	`+ <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>`
	`26`	`+ </ProguardConfiguration>`
`24`	`27`	`}`
`25`	`28`	`}`
`26`	`29`	`</ItemGroup>`
`@@ -29,9 +32,13 @@`
`29`	`32`	`<ItemGroup>`
`30`	`33`	`@foreach (var art in @Model.MavenArtifacts) {`
`31`	`34`	`if (art.MavenArtifactPackaging == "aar") {`
`32`		`- <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\aar\@(art.MavenArtifactId).aar">`
	`35`	`+ <AndroidAarLibrary Include="$(MSBuildThisFileDirectory)..\aar\@(art.MavenGroupId).@(art.MavenArtifactId).aar">`
`33`	`36`	`<AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>`
`34`	`37`	`</AndroidAarLibrary>`
	`38`	`+ } else {`
	`39`	`+ <AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\jar\@(art.MavenGroupId).@(art.MavenArtifactId).jar">`
	`40`	`+ <AndroidXSkipAndroidXMigration>true</AndroidXSkipAndroidXMigration>`
	`41`	`+ </AndroidJavaLibrary>`
`35`	`42`	`}`
`36`	`43`	`}`
`37`	`44`	`</ItemGroup>`