Skip to content

Commit

Permalink
Merge pull request #37 from xamarin/v9.6.1
Browse files Browse the repository at this point in the history
v9.6.1
  • Loading branch information
Redth committed Nov 24, 2016
2 parents 0ea177c + 632025d commit c236efa
Show file tree
Hide file tree
Showing 993 changed files with 22,790 additions and 12,424 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Expand Up @@ -15,6 +15,9 @@ output/
*.xcuserstate
*.xcuserstate

*.nuspec
!*.template.nuspec

Resource.designer.cs
component.yaml
GettingStarted.md
Expand Down
222 changes: 201 additions & 21 deletions GooglePlayServices.sln

Large diffs are not rendered by default.

17 changes: 14 additions & 3 deletions GpsConsts.cs
Expand Up @@ -3,6 +3,17 @@
// https://dl-ssl.google.com/android/repository/addon.xml

static class __GpsConsts {
public const string Url = "https://dl-ssl.google.com/android/repository/google_m2repository_r24.zip";
public const string Version = "8.4.0";
}
public const string Url = "https://dl-ssl.google.com/android/repository/google_m2repository_r36.zip";
public const string Sha1sum = "fa55e43b0175167da7f8cbedea35331cd448cf9b";
public const string Version = "9.6.1";
public const string WearVersion = "1.4.0";
public const string PackageName = "Xamarin.GooglePlayServices";
}

static class __FbConsts
{
public const string PackageName = __GpsConsts.PackageName;
public const string Url = __GpsConsts.Url;
public const string Sha1sum = __GpsConsts.Sha1sum;
public const string Version = __GpsConsts.Version;
}
8 changes: 7 additions & 1 deletion LICENSE.md
@@ -1,3 +1,9 @@

**Xamarin is not responsible for, nor does it grant any licenses to, third-party packages. Some packages may require or install dependencies which are governed by additional licenses.**

This component depends on [Google Play Services Client Library](https://developers.google.com/android/guides/overview), which is subject to the terms of [Android Software Development Kit License Agreement](http://developer.android.com/sdk/terms.html)

### Xamarin Component for Google Play Services Client Library
The MIT License (MIT)

Copyright (c) .NET Foundation Contributors
Expand All @@ -8,4 +14,4 @@ The above copyright notice and this permission notice shall be included in all c

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.

20160427
20160427
21 changes: 21 additions & 0 deletions README.md
Expand Up @@ -68,6 +68,27 @@ You may want to consider passing `--verbosity diagnostic` (or `-Verbosity diagno
Before the `.sln` files will compile in Visual Studio or Xamarin Studio, the external dependencies need to be downloaded. This can be done by running the `build.sh` or `build.ps1` with the target `externals`. After the externals are setup, the `.sln` files should compile in an IDE.


### Versioning

Historically, Component and later NuGet package versions were based on the revision number of the Google Play Services SDK from the SDK Manager, and later based on the Google Play Services Maven Repository (m2repository) version from the SDK Manager. Because of this, the versions of the components and NuGet packages do not match the version strings of Google Play Services releases from Google. Here is a table which shows a translation of versions mapped to Google's version strings:


| NuGet / Component Version | Google m2repository Version | Google Play Services Version |
|---------------------------|------------------------------|------------------------------|
| 25.0 | 19 (GPS SDK 25) | 7.5.0 |
| 26.0 | 21 (GPS SDK 26) | 7.8.0 |
| 27.0 | 22 (GPS SDK 27) | 8.1.0 |
| 29.0 | 24 (GPS SDK 29) | 8.4.0 |
| | 25 | 8.4.0 (no binary changes) |
| | 26 | 9.0.0 |
| 30.0.1.alpha4 | 27 (GPS SDK 30) | 9.0.1 |
| 30.0.2-alpha1 | 28 | 9.0.2 |
| | 29 | 9.2.0 |
| | 30 | (never published) |
| | 31 | 9.2.1 |
| 32.4.0-beta2 | 32 | 9.4.0 |


## License

The license for this repository is specified in
Expand Down
27 changes: 27 additions & 0 deletions ads-lite/nuget/Xamarin.GooglePlayServices.Ads.Lite.template.nuspec
@@ -0,0 +1,27 @@
<?xml version="1.0"?>
<package>
<metadata>
<id>Xamarin.GooglePlayServices.Ads.Lite</id>
<title>Xamarin Google Play Services - Ads Lite</title>
<version>$version$</version>
<authors>Xamarin Inc.</authors>
<owners>Xamarin Inc.</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<summary>Xamarin.Android Bindings for Google Play Services - Ads Lite $aar-version$</summary>
<description>
Xamarin.Android Bindings for Google Play Services - Ads Lite $aar-version$

The Google Mobile Ads SDK is the latest generation in Google mobile advertising, featuring refined ad formats and streamlined APIs for access to mobile ad networks and advertising solutions. The SDK enables mobile app developers to maximize their monetization in native mobile apps.
</description>
<copyright>Copyright © Microsoft Corporation</copyright>
<projectUrl>https://github.com/xamarin/GooglePlayServicesComponents/</projectUrl>
<licenseUrl>https://github.com/xamarin/GooglePlayServicesComponents/blob/master/LICENSE.md</licenseUrl>
<iconUrl>https://raw.githubusercontent.com/xamarin/GooglePlayServicesComponents/master/icons/play-services-ads-lite_128x128.png</iconUrl>
<dependencies>
<dependency id="Xamarin.GooglePlayServices.Basement" version="[$version$]" />
</dependencies>
</metadata>
<files>
<file src="output/Xamarin.GooglePlayServices.Ads.Lite.dll" target="lib/MonoAndroid70" />
</files>
</package>
File renamed without changes.
75 changes: 75 additions & 0 deletions ads-lite/source/Ads.Lite.csproj
@@ -0,0 +1,75 @@
<?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>
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{ECB1F68B-B588-4F3B-9A86-510CF4AAA784}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>GooglePlayServices.Ads.Lite</RootNamespace>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
<AssemblyName>Xamarin.GooglePlayServices.Ads.Lite</AssemblyName>
<TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
<AndroidClassParser>class-parse</AndroidClassParser>
<DroidDocPaths>..\..\externals\docs\reference</DroidDocPaths>
</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>
<AndroidLinkMode>None</AndroidLinkMode>
<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>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<ConsolePause>false</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Mono.Android" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\..\GpsConsts.cs">
<Link>Properties\GpsConsts.cs</Link>
</Compile>
<Compile Include="Additions\Manifest.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Additions\AboutAdditions.txt" />
<None Include="Jars\AboutJars.txt" />
</ItemGroup>
<ItemGroup>
<TransformFile Include="Transforms\EnumFields.xml" />
<TransformFile Include="Transforms\EnumMethods.xml" />
<TransformFile Include="Transforms\Metadata.xml" />
<TransformFile Include="Transforms\Metadata.generated.xml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
<ItemGroup>
<ProjectReference Include="..\..\basement\source\Basement.csproj">
<Project>{6A38FACF-F0C5-4A49-8A8A-7CE6634207CE}</Project>
<Name>Basement</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<InputJar Include="..\..\externals\play-services-ads-lite\classes.jar">
<Link>Jars\play-services-ads-lite.jar</Link>
</InputJar>
</ItemGroup>
</Project>
File renamed without changes.
48 changes: 48 additions & 0 deletions ads-lite/source/Properties/AssemblyInfo.cs
@@ -0,0 +1,48 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using Android.App;

// Information about this assembly is defined by the following attributes.
// Change them to the values specific to your project.

[assembly: AssemblyTitle ("Xamarin.GooglePlayServices.Ads.Lite")]
[assembly: AssemblyDescription ("")]
[assembly: AssemblyConfiguration ("")]
[assembly: AssemblyCompany ("Microsoft Corporation")]
[assembly: AssemblyProduct ("")]
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
[assembly: AssemblyTrademark ("")]
[assembly: AssemblyCulture ("")]

// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.

[assembly: AssemblyVersion ("1.0.0")]

// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.

//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]

[assembly: Java.Interop.JavaLibraryReference ("classes.jar",
PackageName = __GpsConsts.PackageName,
SourceUrl = __GpsConsts.Url,
EmbeddedArchive = __Consts.AarPath,
Version = __GpsConsts.Version,
Sha1sum = __GpsConsts.Sha1sum)]
// AppCompat-v7 resources
[assembly: Android.IncludeAndroidResourcesFromAttribute ("./",
PackageName = __GpsConsts.PackageName,
SourceUrl = __GpsConsts.Url,
EmbeddedArchive = __Consts.AarPath,
Version = __GpsConsts.Version,
Sha1sum = __GpsConsts.Sha1sum)]

// Google Addon feed with GPS in it:
// https://dl-ssl.google.com/android/repository/addon.xml

static class __Consts {
public const string AarPath = "m2repository/com/google/android/gms/play-services-ads-lite/" + __GpsConsts.Version + "/play-services-ads-lite-" + __GpsConsts.Version + ".aar";
}
File renamed without changes.
File renamed without changes.

0 comments on commit c236efa

Please sign in to comment.