Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 7a2c1be

Browse files
RedthRedth
committed
Bump version and add new lib for binding
1 parent bc0686b commit 7a2c1be

File tree

8 files changed

+215
-4
lines changed

8 files changed

+215
-4
lines changed

‎AndroidSupport.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Arch.Lifecycle.Runtime", "a
7575
EndProject
7676
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core-Utils", "support-core-utils\source\Core-Utils.csproj", "{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}"
7777
EndProject
78+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Content", "support-content\source\Content.csproj", "{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}"
79+
EndProject
7880
Global
7981
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8082
Debug|Any CPU = Debug|Any CPU
@@ -225,6 +227,10 @@ Global
225227
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Debug|Any CPU.Build.0 = Debug|Any CPU
226228
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.ActiveCfg = Release|Any CPU
227229
{BEABEB36-8FFE-4CD9-B6E6-D67686C8BB98}.Release|Any CPU.Build.0 = Release|Any CPU
230+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
231+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Debug|Any CPU.Build.0 = Debug|Any CPU
232+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Release|Any CPU.ActiveCfg = Release|Any CPU
233+
{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}.Release|Any CPU.Build.0 = Release|Any CPU
228234
EndGlobalSection
229235
GlobalSection(NestedProjects) = preSolution
230236
{4C9E1C1E-09C3-469C-B3C2-79651DF13870} = {3AC04D8E-9E4C-401F-AED5-239F226BF9C2}

‎build.cake‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ var BUILD_CONFIG = Argument ("config", "Release");
1414
// Master list of all the packages in the repo:
1515
// https://dl.google.com/dl/android/maven2/master-index.xml
1616

17-
var NUGET_VERSION = "27.0.0-beta1";
18-
var COMPONENT_VERSION = "27.0.0.0";
19-
var AAR_VERSION = "27.0.0";
20-
var DOC_VERSION = "2017-10-30";
17+
var NUGET_VERSION = "27.0.2-beta1";
18+
var COMPONENT_VERSION = "27.0.2.0";
19+
var AAR_VERSION = "27.0.2";
20+
var DOC_VERSION = "2017-12-01";
2121

2222

2323
var SUPPORT_PKG_NAME = "com.android.support";
@@ -66,6 +66,7 @@ var ARTIFACTS = new [] {
6666
new ArtifactInfo (SUPPORT_PKG_NAME, "animated-vector-drawable", "Xamarin.Android.Support.Animated.Vector.Drawable", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
6767
new ArtifactInfo (SUPPORT_PKG_NAME, "support-vector-drawable", "Xamarin.Android.Support.Vector.Drawable", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
6868
new ArtifactInfo (SUPPORT_PKG_NAME, "support-compat", "Xamarin.Android.Support.Compat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
69+
new ArtifactInfo (SUPPORT_PKG_NAME, "support-content", "Xamarin.Android.Support.Content", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
6970
new ArtifactInfo (SUPPORT_PKG_NAME, "support-core-utils", "Xamarin.Android.Support.Core.Utils", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7071
new ArtifactInfo (SUPPORT_PKG_NAME, "support-core-ui", "Xamarin.Android.Support.Core.UI", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7172
new ArtifactInfo (SUPPORT_PKG_NAME, "support-dynamic-animation", "Xamarin.Android.Support.Dynamic.Animation", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),

‎support-content/nuget/template.nuspec‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
<metadata>
4+
<id>Xamarin.Android.Support.Content</id>
5+
<title>Xamarin Android Support Library - Content</title>
6+
<version>$version$</version>
7+
<authors>Xamarin Inc.</authors>
8+
<owners>Xamarin Inc.</owners>
9+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
10+
<description>Content Android Support Library C# bindings for Xamarin</description>
11+
<copyright>Copyright © Microsoft Corporation</copyright>
12+
<projectUrl>https://github.com/xamarin/AndroidSupportComponents/</projectUrl>
13+
<licenseUrl>https://github.com/xamarin/AndroidSupportComponents/blob/master/LICENSE.md</licenseUrl>
14+
<iconUrl>https://raw.githubusercontent.com/xamarin/AndroidSupportComponents/master/icons/support-content_128x128.png</iconUrl>
15+
<dependencies>
16+
<group targetFramework="MonoAndroid80">
17+
<dependency id="Xamarin.Android.Support.Annotations" version="[$version$]" />
18+
<dependency id="Xamarin.Android.Support.Compat" version="[$version$]" />
19+
</group>
20+
</dependencies>
21+
</metadata>
22+
<files>
23+
<file src="support-content/nuget/Xamarin.Android.Support.Content.targets" target="build/MonoAndroid80" />
24+
25+
<file src="output/Xamarin.Android.Support.Content.dll" target="lib/MonoAndroid80" />
26+
27+
<file src="External-Dependency-Info.txt" target="THIRD-PARTY-NOTICES.txt" />
28+
</files>
29+
</package>

‎support-content/source/Content.csproj‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{F38426DC-DF6F-4FB3-8E9B-1F2E2BBEB554}</ProjectGuid>
8+
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
9+
<OutputType>Library</OutputType>
10+
<RootNamespace>Android.Support.Content</RootNamespace>
11+
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
12+
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
13+
<AssemblyName>Xamarin.Android.Support.Content</AssemblyName>
14+
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
15+
<!-- <SignAssembly>true</SignAssembly>
16+
<DelaySign>true</DelaySign>
17+
<AssemblyOriginatorKeyFile>publickey.snk</AssemblyOriginatorKeyFile> -->
18+
<AndroidClassParser>class-parse</AndroidClassParser>
19+
<ProductVersion>8.0.30703</ProductVersion>
20+
<SchemaVersion>2.0</SchemaVersion>
21+
</PropertyGroup>
22+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23+
<DebugSymbols>true</DebugSymbols>
24+
<DebugType>full</DebugType>
25+
<Optimize>false</Optimize>
26+
<OutputPath>bin\Debug</OutputPath>
27+
<DefineConstants>DEBUG;</DefineConstants>
28+
<ErrorReport>prompt</ErrorReport>
29+
<WarningLevel>4</WarningLevel>
30+
<AndroidLinkMode>None</AndroidLinkMode>
31+
<ConsolePause>false</ConsolePause>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34+
<DebugType>full</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>bin\Release</OutputPath>
37+
<ErrorReport>prompt</ErrorReport>
38+
<WarningLevel>4</WarningLevel>
39+
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
40+
<ConsolePause>false</ConsolePause>
41+
</PropertyGroup>
42+
<PropertyGroup>
43+
<!--Docs URL Can be found here: http://dl-ssl.google.com/android/repository/repository-8.xml -->
44+
<DroidDocPaths>..\..\docs\reference</DroidDocPaths>
45+
</PropertyGroup>
46+
<ItemGroup>
47+
<Reference Include="System" />
48+
<Reference Include="System.Xml" />
49+
<Reference Include="System.Core" />
50+
<Reference Include="Mono.Android" />
51+
</ItemGroup>
52+
<ItemGroup>
53+
<Compile Include="Properties\AssemblyInfo.cs" />
54+
</ItemGroup>
55+
<ItemGroup>
56+
<TransformFile Include="Transforms\EnumFields.xml" />
57+
<TransformFile Include="Transforms\EnumMethods.xml" />
58+
<TransformFile Include="Transforms\Metadata.xml" />
59+
<TransformFile Include="..\..\Metadata.generated.xml">
60+
<Link>Transforms\Metadata.generated.xml</Link>
61+
</TransformFile>
62+
<TransformFile Include="..\..\Metadata.common.xml">
63+
<Link>Transforms\Metadata.common.xml</Link>
64+
</TransformFile>
65+
</ItemGroup>
66+
<ItemGroup>
67+
<Folder Include="Additions\" />
68+
<Folder Include="Jars\" />
69+
</ItemGroup>
70+
<ItemGroup>
71+
<LibraryProjectZip Include="..\..\externals\support-content.aar">
72+
<Link>support-content.aar</Link>
73+
</LibraryProjectZip>
74+
</ItemGroup>
75+
<ItemGroup>
76+
<ProjectReference Include="..\..\support-annotations\source\Annotations.csproj">
77+
<Project>{EFC85AD8-90A7-4C98-8CEA-A875213DA5DC}</Project>
78+
<Name>Annotations</Name>
79+
</ProjectReference>
80+
</ItemGroup>
81+
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
82+
</Project>

‎support-content/source/Properties/AssemblyInfo.cs‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using Android.App;
4+
5+
// Information about this assembly is defined by the following attributes.
6+
// Change them to the values specific to your project.
7+
8+
[assembly: AssemblyTitle("Xamarin.Android.Support.Content")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany ("Microsoft Corporation")]
12+
[assembly: AssemblyProduct("")]
13+
[assembly: AssemblyCopyright ("Copyright © Microsoft Corporation")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
18+
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
19+
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
20+
21+
[assembly: AssemblyVersion("1.0.0")]
22+
23+
// The following attributes are used to specify the signing key for the assembly,
24+
// if desired. See the Mono documentation for more information about signing.
25+
26+
//[assembly: AssemblyDelaySign(false)]
27+
//[assembly: AssemblyKeyFile("")]
28+
29+
[assembly: AssemblyMetadata ("BUILD_COMMIT", "{BUILD_COMMIT}")]
30+
[assembly: AssemblyMetadata ("BUILD_NUMBER", "{BUILD_NUMBER}")]
31+
[assembly: AssemblyMetadata ("BUILD_TIMESTAMP", "{BUILD_TIMESTAMP}")]
32+
33+
[assembly: AssemblyInformationalVersion ("{NUGET_VERSION}")]
34+
35+
[assembly: Android.LinkerSafe]

‎support-content/source/Transforms/EnumFields.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<enum-field-mappings>
2+
<!-- <mapping jni-class="android/support/v4/app/FragmentActivity$FragmentTag" clr-enum-type="Android.Support.V4.App.FragmentTagType">
3+
<field jni-name="Fragment_id" clr-name="Id" value="1" />
4+
<field jni-name="Fragment_name" clr-name="Name" value="0" />
5+
<field jni-name="Fragment_tag" clr-name="Tag" value="2" />
6+
</mapping>-->
7+
</enum-field-mappings>

‎support-content/source/Transforms/EnumMethods.xml‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
<enum-method-mappings>
2+
<mapping jni-interface="android/support/v4/app/ActivityCompat$OnRequestPermissionsResultCallback">
3+
<method jni-name="onRequestPermissionsResult" parameter="grantResults" clr-enum-type="Android.Content.PM.Permission[]" />
4+
<method jni-name="onRequestPermissionsResult" parameter="p2" clr-enum-type="Android.Content.PM.Permission[]" />
5+
</mapping>
6+
<!-- Manually did JNI for this as it's not generated properly, but maybe in the future? -->
7+
<!-- <mapping jni-class="android/support/v4/app/FragmentActivity">
8+
<method jni-name="onRequestPermissionsResult" parameter="grantResults" clr-enum-type="Android.Content.PM.Permission" />
9+
</mapping>-->
10+
11+
<mapping jni-class="android/support/v4/content/ContextCompat">
12+
<method jni-name="checkSelfPermission" parameter="return" clr-enum-type="Android.Content.PM.Permission" />
13+
</mapping>
14+
15+
16+
<mapping jni-interface="android/support/v4/internal/view/SupportMenuItem">
17+
<method jni-name="setShowAsAction" parameter="p0" clr-enum-type="Android.Views.ShowAsAction" />
18+
</mapping>
19+
20+
<mapping jni-interface="android/support/v4/internal/view/SupportMenuItem">
21+
<method jni-name="setShowAsActionFlags" parameter="p0" clr-enum-type="Android.Views.ShowAsAction" />
22+
</mapping>
23+
24+
<mapping jni-interface="android/support/v4/view/NestedScrollingChild">
25+
<method jni-name="startNestedScroll" parameter="p0" clr-enum-type="Android.Views.ScrollAxis" />
26+
<method jni-name="startNestedScroll" parameter="axes" clr-enum-type="Android.Views.ScrollAxis" />
27+
</mapping>
28+
29+
<mapping jni-interface="android/support/v4/view/NestedScrollingChild2">
30+
<method jni-name="startNestedScroll" parameter="p0" clr-enum-type="Android.Views.ScrollAxis" />
31+
<method jni-name="startNestedScroll" parameter="axes" clr-enum-type="Android.Views.ScrollAxis" />
32+
</mapping>
33+
34+
<mapping jni-interface="android/support/v4/view/NestedScrollingParent">
35+
<method jni-name="onNestedScrollAccepted" parameter="nestedScrollAxes" clr-enum-type="Android.Views.ScrollAxis" />
36+
<method jni-name="onNestedScrollAccepted" parameter="p2" clr-enum-type="Android.Views.ScrollAxis" />
37+
<method jni-name="onStartNestedScroll" parameter="nestedScrollAxes" clr-enum-type="Android.Views.ScrollAxis" />
38+
<method jni-name="onStartNestedScroll" parameter="p2" clr-enum-type="Android.Views.ScrollAxis" />
39+
<method jni-name="getNestedScrollAxes" parameter="return" clr-enum-type="Android.Views.ScrollAxis" />
40+
</mapping>
41+
42+
<mapping jni-class="android/support/v4/widget/AutoSizeableTextView">
43+
<method jni-name="getAutoSizeTextType" parameter="return" clr-enum-type="Android.Widget.AutoSizeTextType" />
44+
<method jni-name="setAutoSizeTextTypeWithDefaults" parameter="p0" clr-enum-type="Android.Widget.AutoSizeTextType" />
45+
</mapping>
46+
</enum-method-mappings>

‎support-content/source/Transforms/Metadata.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<metadata>
2+
3+
<attr path="/api/package[@name='android.support.content']" name="managedName">Android.Support.Content</attr>
4+
5+
</metadata>

0 commit comments

Comments
 (0)