forked from facebook/facebook-android-sdk
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request facebook#5 from Redth/android-4.11.0
Android 4.11.0
- Loading branch information
Showing
16 changed files
with
190 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| #!/usr/bin/env bash | ||
| ############################################################### | ||
| # This is the Cake bootstrapper script that is responsible for | ||
| # downloading Cake and all specified tools from NuGet. | ||
| ############################################################### | ||
|
|
||
| # Define directories. | ||
| SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) | ||
| TOOLS_DIR=$SCRIPT_DIR/tools | ||
| NUGET_EXE=$TOOLS_DIR/nuget.exe | ||
| CAKE_EXE=$TOOLS_DIR/Cake/Cake.exe | ||
|
|
||
| # Define default arguments. | ||
| SCRIPT="build.cake" | ||
| TARGET="Default" | ||
| CONFIGURATION="Release" | ||
| VERBOSITY="verbose" | ||
| DRYRUN= | ||
| SHOW_VERSION=false | ||
| SCRIPT_ARGUMENTS=() | ||
|
|
||
| # Parse arguments. | ||
| for i in "$@"; do | ||
| case $1 in | ||
| -s|--script) SCRIPT="$2"; shift ;; | ||
| -t|--target) TARGET="$2"; shift ;; | ||
| -c|--configuration) CONFIGURATION="$2"; shift ;; | ||
| -v|--verbosity) VERBOSITY="$2"; shift ;; | ||
| -d|--dryrun) DRYRUN="-dryrun" ;; | ||
| --version) SHOW_VERSION=true ;; | ||
| --) shift; SCRIPT_ARGUMENTS+=("$@"); break ;; | ||
| *) SCRIPT_ARGUMENTS+=("$1") ;; | ||
| esac | ||
| shift | ||
| done | ||
|
|
||
| # Make sure the tools folder exist. | ||
| if [ ! -d "$TOOLS_DIR" ]; then | ||
| mkdir "$TOOLS_DIR" | ||
| fi | ||
|
|
||
| # Make sure that packages.config exist. | ||
| if [ ! -f "$TOOLS_DIR/packages.config" ]; then | ||
| echo "Downloading packages.config..." | ||
| #curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/bootstrapper/packages | ||
| cp "$SCRIPT_DIR/cake.packages.config" "$TOOLS_DIR/packages.config" | ||
| if [ $? -ne 0 ]; then | ||
| echo "An error occured while downloading packages.config." | ||
| exit 1 | ||
| fi | ||
| fi | ||
|
|
||
| # Download NuGet if it does not exist. | ||
| if [ ! -f "$NUGET_EXE" ]; then | ||
| echo "Downloading NuGet..." | ||
| curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/v2.8.6/nuget.exe | ||
| # v3/Latest URL: https://dist.nuget.org/win-x86-commandline/latest/nuget.exe | ||
| if [ $? -ne 0 ]; then | ||
| echo "An error occured while downloading nuget.exe." | ||
| exit 1 | ||
| fi | ||
| fi | ||
|
|
||
| # Restore tools from NuGet. | ||
| pushd "$TOOLS_DIR" >/dev/null | ||
| mono "$NUGET_EXE" install -ExcludeVersion | ||
| if [ $? -ne 0 ]; then | ||
| echo "Could not restore NuGet packages." | ||
| exit 1 | ||
| fi | ||
| popd >/dev/null | ||
|
|
||
| # Make sure that Cake has been installed. | ||
| if [ ! -f "$CAKE_EXE" ]; then | ||
| echo "Could not find Cake.exe at '$CAKE_EXE'." | ||
| exit 1 | ||
| fi | ||
|
|
||
| # Start Cake | ||
| if $SHOW_VERSION; then | ||
| exec mono "$CAKE_EXE" -version | ||
| else | ||
| exec mono "$CAKE_EXE" $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 8 additions & 7 deletions
15
Facebook.Android/samples/AudienceNetworkSample/packages.config
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="Bolts" version="1.4.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.CardView" version="23.1.1.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.1.1.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.GooglePlayServices.Ads" version="27.0.0.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.GooglePlayServices.AppIndexing" version="27.0.0.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.GooglePlayServices.Basement" version="27.0.0.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v4" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.AppCompat" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.CardView" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.RecyclerView" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.Vector.Drawable" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.GooglePlayServices.Ads" version="29.0.0.2" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.GooglePlayServices.Basement" version="29.0.0.2" targetFramework="MonoAndroid50" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="Bolts" version="1.4.0" targetFramework="MonoAndroid60" /> | ||
| <package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="MonoAndroid60" /> | ||
| <package id="Xamarin.Android.Support.v7.CardView" version="23.1.1.0" targetFramework="MonoAndroid60" /> | ||
| <package id="Xamarin.Android.Support.v4" version="23.2.1" targetFramework="MonoAndroid60" /> | ||
| <package id="Xamarin.Android.Support.v7.CardView" version="23.2.1" targetFramework="MonoAndroid60" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <packages> | ||
| <package id="Bolts" version="1.4.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v4" version="23.1.1.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.AppCompat" version="23.1.1.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.CardView" version="23.1.1.0" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v4" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.AppCompat" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.v7.CardView" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| <package id="Xamarin.Android.Support.Vector.Drawable" version="23.2.1" targetFramework="MonoAndroid50" /> | ||
| </packages> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.