Skip to content

Commit

Permalink
Facebook SDK For Unity 7.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
swiese committed Nov 14, 2016
1 parent fb74f8b commit be79942
Show file tree
Hide file tree
Showing 106 changed files with 3,384 additions and 593 deletions.
78 changes: 3 additions & 75 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,81 +64,6 @@ FacebookSettings.asset*
/facebook-android-wrapper/libs/

# MD Plugins
*.StyleCop
*.StyleCop.meta
StyleCop.Cache
StyleCop.Cache.meta

# OSX
*.DS_Store

# built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/
obj/

# Local configuration file (sdk path, etc)
local.properties
local.gradle

# Proguard folder generated by Eclipse
proguard/

# Intellij project files
*.iml
*.ipr
*.iws
.idea/

# Gradle
.gradle
build

# vim temp files
*.swp

# Arc generated
.phutil_module_cache

# Unity3D generated meta files
*.pidb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt

# Unity project version File
ProjectVersion.txt

# Export Folder For SDK Package
/TempGenStaticObjects/
/out/

# MD unit test results
test-results/
unit_test_results.txt
TestResult.xml

# Ignore Plugin Folders which are build by build
/Facebook.Unity/Assets/Plugins/

# Ignore Current Facebook Settings
FacebookSettings.asset*

# Ignore android wrapper lib created by build scripts
/facebook-android-wrapper/libs/

# MD Plugins
*.StyleCop
*.StyleCop.meta
StyleCop.Cache
StyleCop.Cache.meta
Expand All @@ -151,3 +76,6 @@ StyleCop.Cache.meta

# Ignore editor generated user prefs
*.userprefs

# Nuget packages
/packages/
26 changes: 26 additions & 0 deletions Facebook.Unity.Android.StrippingHack/AndroidWrapper.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
* copy, modify, and distribute this software in source code or binary form for use
* in connection with the web services and APIs provided by Facebook.
*
* As with any software that integrates with the Facebook platform, your use of
* this software is subject to the Facebook Developer Principles and Policies
* [http://developers.facebook.com/policy/]. This copyright notice shall be
* included in all copies or substantial portions of the software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

namespace Facebook.Unity.Android
{
public class AndroidWrapper
{
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{CDB20BC1-DC6F-46BD-9FBB-7F689E790B1B}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Facebook.Unity.Android.StrippingHack</RootNamespace>
<AssemblyName>Facebook.Unity.Android</AssemblyName>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<ReleaseVersion></ReleaseVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="AndroidWrapper.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Condition=" '$(RunConfiguration)' == 'Default' ">
<StartAction>Project</StartAction>
<ConsolePause>true</ConsolePause>
</PropertyGroup>
</Project>
24 changes: 24 additions & 0 deletions Facebook.Unity.Android.StrippingHack/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
* copy, modify, and distribute this software in source code or binary form for use
* in connection with the web services and APIs provided by Facebook.
*
* As with any software that integrates with the Facebook platform, your use of
* this software is subject to the Facebook Developer Principles and Policies
* [http://developers.facebook.com/policy/]. This copyright notice shall be
* included in all copies or substantial portions of the software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

using System.Reflection;
using System.Runtime.CompilerServices;

[assembly: AssemblyVersion("7.9.0")]
41 changes: 41 additions & 0 deletions Facebook.Unity.Android/AndroidWrapper.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
* copy, modify, and distribute this software in source code or binary form for use
* in connection with the web services and APIs provided by Facebook.
*
* As with any software that integrates with the Facebook platform, your use of
* this software is subject to the Facebook Developer Principles and Policies
* [http://developers.facebook.com/policy/]. This copyright notice shall be
* included in all copies or substantial portions of the software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

namespace Facebook.Unity.Android
{
using Facebook.Unity.Mobile.Android;
using UnityEngine;

internal class AndroidWrapper : IAndroidWrapper
{
private const string FacebookJavaClassName = "com.facebook.unity.FB";
private AndroidJavaClass facebookJavaClass = new AndroidJavaClass(FacebookJavaClassName);

public T CallStatic<T>(string methodName)
{
return this.facebookJavaClass.CallStatic<T>(methodName);
}

public void CallStatic(string methodName, params object[] args)
{
this.facebookJavaClass.CallStatic(methodName, args);
}
}
}
49 changes: 49 additions & 0 deletions Facebook.Unity.Android/Facebook.Unity.Android.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D3DF5151-7271-4CBA-8F91-85B7845E2FBD}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Facebook.Unity.Android</RootNamespace>
<AssemblyName>Facebook.Unity.Android</AssemblyName>
<ReleaseVersion>
</ReleaseVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>\Applications\Unity\Unity.app\Contents\Managed\UnityEngine.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="AndroidWrapper.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\Facebook.Unity\Facebook.Unity.csproj">
<Project>{3DFF6C0C-BB04-405D-A23F-95999630E7F8}</Project>
<Name>Facebook.Unity</Name>
</ProjectReference>
</ItemGroup>
</Project>
24 changes: 24 additions & 0 deletions Facebook.Unity.Android/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/**
* Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
*
* You are hereby granted a non-exclusive, worldwide, royalty-free license to use,
* copy, modify, and distribute this software in source code or binary form for use
* in connection with the web services and APIs provided by Facebook.
*
* As with any software that integrates with the Facebook platform, your use of
* this software is subject to the Facebook Developer Principles and Policies
* [http://developers.facebook.com/policy/]. This copyright notice shall be
* included in all copies or substantial portions of the software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

using System.Reflection;
using System.Runtime.CompilerServices;

[assembly: AssemblyVersion("7.9.0")]
4 changes: 3 additions & 1 deletion Facebook.Unity.Arcade/ArcadeWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ public void DoPayRequest(
string requestId,
string pricepointId,
string testCurrency,
string developerPayload,
string callbackId,
ArcadeFacebook.OnComplete completeDelegate)
{
Expand All @@ -112,7 +113,8 @@ public void DoPayRequest(
quantityMax,
requestId,
pricepointId,
testCurrency);
testCurrency,
developerPayload);
this.HandleRequest<PayRequest, PayResponse>(
request,
callbackId,
Expand Down
4 changes: 3 additions & 1 deletion Facebook.Unity.Arcade/Facebook.Unity.Arcade.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
Expand All @@ -27,11 +28,12 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<ConsolePause>false</ConsolePause>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="UnityEngine">
<HintPath>\Applications\Unity\Unity.app\Contents\Frameworks\Managed\UnityEngine.dll</HintPath>
<HintPath>\Applications\Unity\Unity.app\Contents\Managed\UnityEngine.dll</HintPath>
</Reference>
<Reference Include="FacebookNamedPipeClient">
<HintPath>Plugins\FacebookNamedPipeClient.dll</HintPath>
Expand Down
Binary file modified Facebook.Unity.Arcade/Plugins/FacebookNamedPipeClient.dll
Binary file not shown.
4 changes: 2 additions & 2 deletions Facebook.Unity.Arcade/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/

using System.Runtime.CompilerServices;
using System.Reflection;
using System.Runtime.CompilerServices;

[assembly: AssemblyVersion("7.8.0")]
[assembly: AssemblyVersion("7.9.0")]
Loading

0 comments on commit be79942

Please sign in to comment.