Skip to content

Commit

Permalink
[bundletool] bump to 0.10.0 (#3318)
Browse files Browse the repository at this point in the history
Context: https://github.com/google/bundletool/releases/tag/0.10.0
Context: https://mvnrepository.com/artifact/com.android.tools.build/bundletool
Context: https://ossmsft.visualstudio.com/_oss?requestId=1728210&_a=progress

`bundletool` has had a few releases lately, we should update the
version we are shipping with Xamarin.Android.

I also noticed we were shipping:

	bundletool-all-0.8.0-jar

I think we could just use `bundletool.jar`. It would be useful to have
a static filename as versions change release to release. This matches
up with other things we ship, such as `r8.jar`.

You can query the version of `bundletool` with:

	$ java -jar bundletool.jar version
	0.10.0

So we don't need to encode the version in the filename.
  • Loading branch information
jonathanpeppers authored and jonpryor committed Jul 22, 2019
1 parent 22986fc commit 89a633c
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Configuration.props
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<XAPlatformToolsVersion>29.0.1</XAPlatformToolsVersion>
<XAIntegratedTests Condition="'$(XAIntegratedTests)' == ''">False</XAIntegratedTests>
<XAIncludeProprietaryBits Condition="'$(XAIncludeProprietaryBits)' == ''">False</XAIncludeProprietaryBits>
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">0.8.0</XABundleToolVersion>
<XABundleToolVersion Condition="'$(XABundleToolVersion)' == ''">0.10.0</XABundleToolVersion>
<PathSeparator>$([System.IO.Path]::PathSeparator)</PathSeparator>
<_TestsAotName Condition=" '$(AotAssemblies)' == 'true' ">-Aot</_TestsAotName>
<_TestsProfiledAotName Condition=" '$(AndroidEnableProfiledAot)' == 'true' ">-Profiled</_TestsProfiledAotName>
Expand Down Expand Up @@ -144,7 +144,7 @@
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' ">emulator</EmulatorToolExe>
<NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' != 'Windows' ">$(AndroidNdkDirectory)\ndk-build</NdkBuildPath>
<NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' == 'Windows' ">$(AndroidNdkDirectory)\ndk-build.cmd</NdkBuildPath>
<BundleToolJarPath Condition=" '$(BundleToolJarPath)' == '' ">$(XAInstallPrefix)xbuild\Xamarin\Android\bundletool-all-$(XABundleToolVersion).jar</BundleToolJarPath>
<BundleToolJarPath Condition=" '$(BundleToolJarPath)' == '' ">$(XAInstallPrefix)xbuild\Xamarin\Android\bundletool.jar</BundleToolJarPath>
</PropertyGroup>
<!--
"Fixup" $(AndroidSupportedHostJitAbis) so that Condition attributes elsewhere
Expand Down
2 changes: 1 addition & 1 deletion build-tools/installers/create-installers.targets
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<_MSBuildFiles Include="$(MSBuildSrcDir)\startup.aotprofile" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\startup-xf.aotprofile" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\r8.jar" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\bundletool-all-$(XABundleToolVersion).jar" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\bundletool.jar" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\java_runtime.jar" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\java_runtime_fastdev.jar" />
<_MSBuildFiles Include="$(MSBuildSrcDir)\java_runtime.dex" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ because xbuild doesn't support framework reference assemblies.
/>
</CreateProperty>

<CreateProperty Value="$(MonoAndroidToolsDirectory)\bundletool-all-$(BundleToolVersion).jar">
<CreateProperty Value="$(MonoAndroidToolsDirectory)\bundletool.jar">
<Output TaskParameter="Value" PropertyName="AndroidBundleToolJarPath"
Condition="'$(AndroidBundleToolJarPath)' == ''"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/bundletool/bundletool.targets
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<Target Name="_DownloadBundleTool">
<DownloadUri
SourceUris="https://github.com/google/bundletool/releases/download/$(XABundleToolVersion)/bundletool-all-$(XABundleToolVersion).jar"
DestinationFiles="$(AndroidToolchainCacheDirectory)\bundletool-all-$(XABundleToolVersion).jar"
DestinationFiles="$(AndroidToolchainCacheDirectory)\bundletool.jar"
/>
<Copy
SourceFiles="$(AndroidToolchainCacheDirectory)\bundletool-all-$(XABundleToolVersion).jar"
SourceFiles="$(AndroidToolchainCacheDirectory)\bundletool.jar"
DestinationFolder="$(_Destination)"
/>
</Target>
Expand Down

0 comments on commit 89a633c

Please sign in to comment.