Skip to content
This repository has been archived by the owner on Jan 13, 2025. It is now read-only.

[Guava] Add escape hatches for jar includes. #1365

Merged
merged 1 commit into from
Apr 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Android/Guava/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<!-- Uncomment if a $(PackageVersionSuffix) is ever needed -->
<!-- <PackageVersionSuffix>-net6preview04</PackageVersionSuffix> -->
<!-- <PackageVersionSuffix Condition=" '$(BUILD_BUILDID)' != '' ">$(PackageVersionSuffix).$(BUILD_BUILDID)</PackageVersionSuffix> -->
<GuavaNuGetVersion>31.1.0$(PackageVersionSuffix)</GuavaNuGetVersion>
<GuavaNuGetVersion>31.1.0.1$(PackageVersionSuffix)</GuavaNuGetVersion>
<GuavaFailureAccessNuGetVersion>1.0.1.6$(PackageVersionSuffix)</GuavaFailureAccessNuGetVersion>
<GuavaListenableFutureNuGetVersion>1.0.0.6$(PackageVersionSuffix)</GuavaListenableFutureNuGetVersion>
<GuavaListenableFutureNuGetVersion>1.0.0.7$(PackageVersionSuffix)</GuavaListenableFutureNuGetVersion>

<!-- Opt out of C#8 features to maintain compatibility with legacy -->
<AndroidBoundInterfacesContainConstants>false</AndroidBoundInterfacesContainConstants>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition=" '$(AndroidApplication)' == 'true' ">
<ItemGroup Condition=" '$(AndroidApplication)' == 'true' And '$(XamarinGoogleGuavaListenableFutureOptOut)' != 'true' ">
<AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions Android/Guava/source/Guava/Guava.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<EmbeddedReferenceJar Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
<ItemGroup Condition=" '$(AndroidApplication)' == 'true' And '$(XamarinGoogleGuavaOptOut)' != 'true' ">
<AndroidJavaLibrary Include="$(MSBuildThisFileDirectory)..\..\jar\*.jar" />
</ItemGroup>
</Project>