Skip to content

Commit

Permalink
Merge pull request facebook#22 from xamarin/android-4.15
Browse files Browse the repository at this point in the history
Android 4.15
  • Loading branch information
bholmes committed Sep 23, 2016
2 parents a1f3974 + 1e8ab3e commit 9f8aee7
Show file tree
Hide file tree
Showing 23 changed files with 213 additions and 1,262 deletions.
8 changes: 4 additions & 4 deletions Facebook.Android/build.cake
@@ -1,14 +1,14 @@

#load "../common.cake"

var FB_NUGET_VERSION = "4.14.1";
var AN_NUGET_VERSION = "4.14.1";
var FB_NUGET_VERSION = "4.15.0";
var AN_NUGET_VERSION = "4.15.0";

var FB_VERSION = "4.14.1";
var FB_VERSION = "4.15.0";
var FB_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/facebook/android/facebook-android-sdk/{0}/facebook-android-sdk-{0}.aar", FB_VERSION);
var FB_DOCS_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/facebook/android/facebook-android-sdk/{0}/facebook-android-sdk-{0}-javadoc.jar", FB_VERSION);

var AN_VERSION = "4.14.1";
var AN_VERSION = "4.15.0";
var AN_URL = string.Format ("http://search.maven.org/remotecontent?filepath=com/facebook/android/audience-network-sdk/{0}/audience-network-sdk-{0}.aar", AN_VERSION);

var TARGET = Argument ("t", Argument ("target", "Default"));
Expand Down
9 changes: 5 additions & 4 deletions Facebook.Android/component/component.yaml
@@ -1,4 +1,4 @@
version: 4.14.1.0
version: 4.15.0.0
name: Facebook Android SDK
id: facebookandroid
publisher: Xamarin Inc.
Expand All @@ -14,13 +14,14 @@ libraries:
- ../output/Xamarin.Facebook.AudienceNetwork.dll
packages:
android:
- Xamarin.Facebook.Android, Version=4.14.1
- Xamarin.Facebook.AudienceNetwork.Android, Version=4.14.1
- Xamarin.Facebook.Android, Version=4.15.0
- Xamarin.Facebook.AudienceNetwork.Android, Version=4.15.0
- Xamarin.Android.Support.v4, Version=23.4.0.1
- Xamarin.Android.Support.v7.CardView, Version=23.4.0.1
- Xamarin.Android.Support.v7.RecyclerView, Version=23.4.0.1
- Xamarin.Android.Support.v7.AppCompat, Version=23.4.0.1
- Bolts, Version=1.4.0.0
- Xamarin.Android.Support.CustomTabs, Version=23.4.0.1
- Bolts, Version=1.4.0.1
samples:
- name: "Hello Facebook Sample"
path: ../samples/HelloFacebookSample.sln
Expand Down
5 changes: 3 additions & 2 deletions Facebook.Android/nuget/Xamarin.Facebook.Android.nuspec
Expand Up @@ -8,15 +8,16 @@
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>C# bindings for Facebook's official SDK</description>
<copyright>Copyright 2013-2016</copyright>
<copyright>Copyright © Microsoft Corporation</copyright>
<projectUrl>https://components.xamarin.com/view/facebookandroid</projectUrl>
<licenseUrl>https://components.xamarin.com/license/facebookandroid</licenseUrl>
<iconUrl>https://raw.githubusercontent.com/xamarin/FacebookComponents/master/icons/facebook-android_128x128.png</iconUrl>
<dependencies>
<group targetFramework="MonoAndroid403">
<dependency id="Xamarin.Android.Support.v4" version="23.4.0.1"/>
<dependency id="Xamarin.Android.Support.v7.CardView" version="23.4.0.1"/>
<dependency id="Bolts" version="1.4.0.0"/>
<dependency id="Xamarin.Android.Support.CustomTabs" version="23.4.0.1"/>
<dependency id="Bolts" version="1.4.0.1"/>
</group>
</dependencies>
</metadata>
Expand Down
Expand Up @@ -8,7 +8,7 @@
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>C# bindings for Facebook's official Audience Network SDK</description>
<copyright>Copyright 2013-2016</copyright>
<copyright>Copyright © Microsoft Corporation</copyright>
<projectUrl>https://components.xamarin.com/view/facebookandroid</projectUrl>
<licenseUrl>https://components.xamarin.com/license/facebookandroid</licenseUrl>
<iconUrl>https://raw.githubusercontent.com/xamarin/FacebookComponents/master/icons/facebook-audiencenetwork-android_128x128.png</iconUrl>
Expand All @@ -18,6 +18,7 @@
<dependency id="Xamarin.Android.Support.v7.AppCompat" version="23.4.0.1"/>
<dependency id="Xamarin.Android.Support.v7.RecyclerView" version="23.4.0.1"/>
<dependency id="Xamarin.GooglePlayServices.Ads" version="29.0.0.2"/>
<dependency id="Xam.Plugins.Android.ExoPlayer" version="1.5.8"/>
</group>
</dependencies>
</metadata>
Expand Down
Expand Up @@ -17,7 +17,7 @@
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AssemblyName>AudienceNetworkSample</AssemblyName>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -45,12 +45,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Bolts.Tasks">
<HintPath>..\packages\Bolts.1.4.0\lib\MonoAndroid403\Bolts.Tasks.dll</HintPath>
</Reference>
<Reference Include="Bolts.AppLinks">
<HintPath>..\packages\Bolts.1.4.0\lib\MonoAndroid403\Bolts.AppLinks.dll</HintPath>
</Reference>
<Reference Include="Xamarin.GooglePlayServices.Basement">
<HintPath>..\packages\Xamarin.GooglePlayServices.Basement.29.0.0.2\lib\MonoAndroid41\Xamarin.GooglePlayServices.Basement.dll</HintPath>
</Reference>
Expand All @@ -75,6 +69,18 @@
<Reference Include="Xamarin.Android.Support.v7.CardView">
<HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer">
<HintPath>..\packages\Xam.Plugins.Android.ExoPlayer.1.5.8\lib\MonoAndroid\ExoPlayer.dll</HintPath>
</Reference>
<Reference Include="Bolts.AppLinks">
<HintPath>..\packages\Bolts.1.4.0.1\lib\MonoAndroid403\Bolts.AppLinks.dll</HintPath>
</Reference>
<Reference Include="Bolts.Tasks">
<HintPath>..\packages\Bolts.1.4.0.1\lib\MonoAndroid403\Bolts.Tasks.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.CustomTabs">
<HintPath>..\packages\Xamarin.Android.Support.CustomTabs.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.CustomTabs.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle ("MessengerSendSample")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("")]
[assembly: AssemblyCompany ("Microsoft Corporation")]
[assembly: AssemblyProduct ("")]
[assembly: AssemblyCopyright ("redth")]
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]

Expand Down
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bolts" version="1.4.0" targetFramework="MonoAndroid50" />
<package id="Bolts" version="1.4.0.1" targetFramework="monoandroid60" />
<package id="Xam.Plugins.Android.ExoPlayer" version="1.5.8" targetFramework="monoandroid50" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.4.0.1" targetFramework="MonoAndroid50" />
<package id="Xamarin.Android.Support.CustomTabs" version="23.4.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.4.0.1" targetFramework="MonoAndroid50" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.4.0.1" targetFramework="MonoAndroid50" />
<package id="Xamarin.Android.Support.v7.CardView" version="23.4.0.1" targetFramework="MonoAndroid50" />
Expand Down
Expand Up @@ -16,7 +16,7 @@
<AndroidApplication>True</AndroidApplication>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<AssemblyName>HelloFacebookSample</AssemblyName>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
Expand Down Expand Up @@ -45,12 +45,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Bolts.Tasks">
<HintPath>..\packages\Bolts.1.4.0\lib\MonoAndroid403\Bolts.Tasks.dll</HintPath>
</Reference>
<Reference Include="Bolts.AppLinks">
<HintPath>..\packages\Bolts.1.4.0\lib\MonoAndroid403\Bolts.AppLinks.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.CardView">
<HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
</Reference>
Expand All @@ -60,6 +54,12 @@
<Reference Include="Xamarin.Android.Support.CustomTabs">
<HintPath>..\packages\Xamarin.Android.Support.CustomTabs.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.CustomTabs.dll</HintPath>
</Reference>
<Reference Include="Bolts.AppLinks">
<HintPath>..\packages\Bolts.1.4.0.1\lib\MonoAndroid403\Bolts.AppLinks.dll</HintPath>
</Reference>
<Reference Include="Bolts.Tasks">
<HintPath>..\packages\Bolts.1.4.0.1\lib\MonoAndroid403\Bolts.Tasks.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Resources\Resource.designer.cs" />
Expand Down
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle ("HelloFacebookSample")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("")]
[assembly: AssemblyCompany ("Microsoft Corporation")]
[assembly: AssemblyProduct ("")]
[assembly: AssemblyCopyright ("redth")]
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]

Expand Down
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bolts" version="1.4.0" targetFramework="MonoAndroid60" />
<package id="Bolts" version="1.4.0.1" targetFramework="monoandroid70" />
<package id="Xamarin.Android.Support.CustomTabs" version="23.4.0.1" targetFramework="MonoAndroid60" />
<package id="Xamarin.Android.Support.v4" version="23.4.0.1" targetFramework="MonoAndroid60" />
<package id="Xamarin.Android.Support.v7.CardView" version="23.4.0.1" targetFramework="MonoAndroid60" />
Expand Down
Expand Up @@ -17,7 +17,7 @@
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AssemblyName>MessengerSendSample</AssemblyName>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<AndroidSupportedAbis>armeabi;armeabi-v7a;x86;arm64-v8a;x86_64</AndroidSupportedAbis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -45,12 +45,6 @@
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
<Reference Include="Bolts.Tasks">
<HintPath>..\packages\Bolts.1.4.0\lib\MonoAndroid403\Bolts.Tasks.dll</HintPath>
</Reference>
<Reference Include="Bolts.AppLinks">
<HintPath>..\packages\Bolts.1.4.0\lib\MonoAndroid403\Bolts.AppLinks.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Android.Support.v7.CardView">
<HintPath>..\packages\Xamarin.Android.Support.v7.CardView.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.CardView.dll</HintPath>
</Reference>
Expand All @@ -66,6 +60,17 @@
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\packages\Xamarin.Android.Support.v7.AppCompat.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="Bolts.AppLinks">
<HintPath>..\packages\Bolts.1.4.0.1\lib\MonoAndroid403\Bolts.AppLinks.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Bolts.Tasks">
<HintPath>..\packages\Bolts.1.4.0.1\lib\MonoAndroid403\Bolts.Tasks.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Xamarin.Android.Support.CustomTabs">
<HintPath>..\packages\Xamarin.Android.Support.CustomTabs.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.CustomTabs.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle ("MessengerSendSample")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("")]
[assembly: AssemblyCompany ("Microsoft Corporation")]
[assembly: AssemblyProduct ("")]
[assembly: AssemblyCopyright ("redth")]
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]

Expand Down
3 changes: 2 additions & 1 deletion Facebook.Android/samples/MessengerSendSample/packages.config
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bolts" version="1.4.0" targetFramework="MonoAndroid50" />
<package id="Bolts" version="1.4.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.4.0.1" targetFramework="MonoAndroid50" />
<package id="Xamarin.Android.Support.CustomTabs" version="23.4.0.1" targetFramework="monoandroid60" />
<package id="Xamarin.Android.Support.v4" version="23.4.0.1" targetFramework="MonoAndroid50" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.4.0.1" targetFramework="MonoAndroid50" />
<package id="Xamarin.Android.Support.v7.CardView" version="23.4.0.1" targetFramework="MonoAndroid50" />
Expand Down
Expand Up @@ -8,9 +8,9 @@
[assembly: AssemblyTitle ("Xamarin.Facebook.AudienceNetwork")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("")]
[assembly: AssemblyCompany ("Microsoft Corporation")]
[assembly: AssemblyProduct ("")]
[assembly: AssemblyCopyright ("redth")]
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]

Expand Down
Expand Up @@ -2,14 +2,30 @@
<attr path="/api/package[@name='com.facebook.ads']" name="managedName">Xamarin.Facebook.Ads</attr>
<attr path="/api/package[@name='com.facebook.ads.internal']" name="managedName">Xamarin.Facebook.Ads.Internal</attr>
<attr path="/api/package[@name='com.facebook.ads.internal.adapters']" name="managedName">Xamarin.Facebook.Ads.Internal.Adapters</attr>
<attr path="/api/package[@name='com.facebook.ads.internal.dev']" name="managedName">Xamarin.Facebook.Ads.Internal.Dev</attr>
<attr path="/api/package[@name='com.facebook.ads.internal.extra']" name="managedName">Xamarin.Facebook.Ads.Internal.Extra</attr>
<!-- <attr path="/api/package[@name='com.facebook.ads.internal.dev']" name="managedName">Xamarin.Facebook.Ads.Internal.Dev</attr>-->
<!-- <attr path="/api/package[@name='com.facebook.ads.internal.extra']" name="managedName">Xamarin.Facebook.Ads.Internal.Extra</attr>-->
<attr path="/api/package[@name='com.facebook.ads.internal.server']" name="managedName">Xamarin.Facebook.Ads.Internal.Server</attr>
<attr path="/api/package[@name='com.facebook.ads.internal.ssp']" name="managedName">Xamarin.Facebook.Ads.Internal.Ssp</attr>
<!-- <attr path="/api/package[@name='com.facebook.ads.internal.ssp']" name="managedName">Xamarin.Facebook.Ads.Internal.Ssp</attr>-->
<attr path="/api/package[@name='com.facebook.ads.internal.util']" name="managedName">Xamarin.Facebook.Ads.Internal.Util</attr>


<!-- Field in an internal type is unnecessary -->
<remove-node path="/api/package[contains(@name, 'com.facebook.share.internal')]" />
<remove-node path="/api/package[@name='com.facebook.share.internal']/class[@name='LikeActionController']" />
<!-- <remove-node path="/api/package[contains(@name, 'com.facebook.share.internal')]" />-->
<!-- <remove-node path="/api/package[@name='com.facebook.share.internal']/class[@name='LikeActionController']" />-->

<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.b')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.c')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.d')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.e')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.f')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.g')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.h')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.i')]" />

<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.adapters')]" />
<remove-node path="/api/package[contains(@name, 'com.facebook.ads.internal.util')]" />
<remove-node path="/api/package[@name='com.facebook.ads.internal']/class[@name='d']" />
<remove-node path="/api/package[@name='com.facebook.ads.internal']/class[@name='e']" />
<remove-node path="/api/package[@name='com.facebook.ads.internal']/class[@name='f']" />
<remove-node path="/api/package[@name='com.facebook.ads.internal.server']/class[@name='c']" />
</metadata>
Expand Up @@ -14,6 +14,7 @@
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AssemblyName>Xamarin.Facebook.AudienceNetwork</AssemblyName>
<TargetFrameworkVersion>v4.1</TargetFrameworkVersion>
<AndroidClassParser>class-parse</AndroidClassParser>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -61,6 +62,9 @@
<Reference Include="Xamarin.Android.Support.v7.AppCompat">
<HintPath>..\..\packages\Xamarin.Android.Support.v7.AppCompat.23.4.0.1\lib\MonoAndroid403\Xamarin.Android.Support.v7.AppCompat.dll</HintPath>
</Reference>
<Reference Include="ExoPlayer">
<HintPath>..\..\packages\Xam.Plugins.Android.ExoPlayer.1.5.8\lib\MonoAndroid\ExoPlayer.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xam.Plugins.Android.ExoPlayer" version="1.5.8" targetFramework="monoandroid41" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.4.0.1" targetFramework="MonoAndroid41" />
<package id="Xamarin.Android.Support.v4" version="23.4.0.1" targetFramework="MonoAndroid41" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="23.4.0.1" targetFramework="MonoAndroid41" />
Expand Down

0 comments on commit 9f8aee7

Please sign in to comment.