Skip to content

Commit 4c7a99d

Browse files
antonargunovantonargunov
authored
Merge pull request #111 from antonargunov/master
version 6.0.0
2 parents e7a200e + 6525a55 commit 4c7a99d

File tree

151 files changed

+15254
-4664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+15254
-4664
lines changed

‎Branch-Xamarin-Lib.Droid/Additions/AboutAdditions.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ this:
1111
public partial class Rectangle
1212
{
1313
public Rectangle (int x, int y, int width, int height)
14-
{
15-
// JNI bindings
16-
}
14+
{
15+
// JNI bindings
16+
}
1717
}
1818

1919
Imagine we want to add a constructor to this class that takes a Point and
@@ -23,9 +23,9 @@ with a partial class containing our new method:
2323
public partial class Rectangle
2424
{
2525
public Rectangle (Point location, Size size) :
26-
this (location.X, location.Y, size.Width, size.Height)
27-
{
28-
}
26+
this (location.X, location.Y, size.Width, size.Height)
27+
{
28+
}
2929
}
3030

3131
At compile time, the additions class will be added to the generated class
@@ -44,5 +44,5 @@ By adding a Point.cs file with this class, it will end up in the binding library
4444
public class Point
4545
{
4646
public int X { get; set; }
47-
public int Y { get; set; }
48-
}
47+
public int Y { get; set; }
48+
}

‎Branch-Xamarin-Lib.Droid/Branch-Xamarin-Lib.Droid.csproj‎

Lines changed: 30 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,67 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.props" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.props')" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
43
<PropertyGroup>
54
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
65
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ProductVersion>8.0.30703</ProductVersion>
7+
<SchemaVersion>2.0</SchemaVersion>
8+
<ProjectGuid>{E25C0C32-FAFA-47E0-957D-00B0F4AA6679}</ProjectGuid>
79
<ProjectTypeGuids>{10368E6C-D01B-4462-8E8B-01FC667A7035};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8-
<ProjectGuid>{9FD07E8E-AD56-4836-8BD2-490EC68F93E8}</ProjectGuid>
10+
<TemplateGuid>{77efb91c-a7e9-4b0e-a7c5-31eeec3c6d46}</TemplateGuid>
911
<OutputType>Library</OutputType>
10-
<RootNamespace>BranchXamarinLib.Droid</RootNamespace>
11-
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
12-
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
12+
<AppDesignerFolder>Properties</AppDesignerFolder>
13+
<RootNamespace>Branch_Xamarin_Lib.Droid</RootNamespace>
1314
<AssemblyName>Branch-Xamarin-Lib.Droid</AssemblyName>
15+
<FileAlignment>512</FileAlignment>
1416
<TargetFrameworkVersion>v9.0</TargetFrameworkVersion>
15-
<AndroidTlsProvider></AndroidTlsProvider>
17+
<AndroidClassParser>class-parse</AndroidClassParser>
18+
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
19+
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
1620
</PropertyGroup>
1721
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1822
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
23+
<DebugType>portable</DebugType>
2024
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug</OutputPath>
22-
<DefineConstants>DEBUG;</DefineConstants>
25+
<OutputPath>bin\Debug\</OutputPath>
26+
<DefineConstants>DEBUG;TRACE</DefineConstants>
2327
<ErrorReport>prompt</ErrorReport>
2428
<WarningLevel>4</WarningLevel>
25-
<AndroidLinkMode>None</AndroidLinkMode>
26-
<ConsolePause>false</ConsolePause>
2729
</PropertyGroup>
2830
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>full</DebugType>
31+
<DebugType>portable</DebugType>
3032
<Optimize>true</Optimize>
31-
<OutputPath>bin\Release</OutputPath>
33+
<OutputPath>bin\Release\</OutputPath>
34+
<DefineConstants>TRACE</DefineConstants>
3235
<ErrorReport>prompt</ErrorReport>
3336
<WarningLevel>4</WarningLevel>
34-
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
35-
<ConsolePause>false</ConsolePause>
3637
</PropertyGroup>
3738
<ItemGroup>
39+
<Reference Include="Mono.Android" />
3840
<Reference Include="System" />
39-
<Reference Include="System.Xml" />
4041
<Reference Include="System.Core" />
41-
<Reference Include="Mono.Android" />
42-
<Reference Include="Xamarin.Android.Support.Annotations">
43-
<HintPath>..\packages\Xamarin.Android.Support.Annotations.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Annotations.dll</HintPath>
44-
</Reference>
45-
<Reference Include="Xamarin.Android.Arch.Core.Common">
46-
<HintPath>..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\lib\MonoAndroid80\Xamarin.Android.Arch.Core.Common.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Xamarin.Android.Arch.Lifecycle.Common">
49-
<HintPath>..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.3\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.dll</HintPath>
50-
</Reference>
51-
<Reference Include="Xamarin.Android.Arch.Lifecycle.Runtime">
52-
<HintPath>..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.3\lib\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.dll</HintPath>
53-
</Reference>
54-
<Reference Include="Xamarin.Android.Support.Compat">
55-
<HintPath>..\packages\Xamarin.Android.Support.Compat.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Compat.dll</HintPath>
56-
</Reference>
57-
<Reference Include="Xamarin.Android.Support.Core.UI">
58-
<HintPath>..\packages\Xamarin.Android.Support.Core.UI.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Core.UI.dll</HintPath>
59-
</Reference>
60-
<Reference Include="Xamarin.Android.Support.Core.Utils">
61-
<HintPath>..\packages\Xamarin.Android.Support.Core.Utils.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Core.Utils.dll</HintPath>
62-
</Reference>
63-
<Reference Include="Xamarin.Android.Support.CustomTabs">
64-
<HintPath>..\packages\Xamarin.Android.Support.CustomTabs.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.CustomTabs.dll</HintPath>
65-
</Reference>
66-
<Reference Include="Xamarin.Android.Support.Fragment">
67-
<HintPath>..\packages\Xamarin.Android.Support.Fragment.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Fragment.dll</HintPath>
68-
</Reference>
69-
<Reference Include="Xamarin.Android.Support.Media.Compat">
70-
<HintPath>..\packages\Xamarin.Android.Support.Media.Compat.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.Media.Compat.dll</HintPath>
71-
</Reference>
72-
<Reference Include="Xamarin.Android.Support.v4">
73-
<HintPath>..\packages\Xamarin.Android.Support.v4.27.0.2\lib\MonoAndroid81\Xamarin.Android.Support.v4.dll</HintPath>
74-
</Reference>
42+
<Reference Include="System.Xml" />
7543
</ItemGroup>
7644
<ItemGroup>
7745
<Compile Include="Properties\AssemblyInfo.cs" />
7846
</ItemGroup>
7947
<ItemGroup>
80-
<None Include="Additions\AboutAdditions.txt" />
8148
<None Include="Jars\AboutJars.txt" />
82-
<None Include="packages.config" />
49+
<None Include="Additions\AboutAdditions.txt" />
8350
</ItemGroup>
8451
<ItemGroup>
52+
<TransformFile Include="Transforms\Metadata.xml" />
8553
<TransformFile Include="Transforms\EnumFields.xml" />
8654
<TransformFile Include="Transforms\EnumMethods.xml" />
87-
<TransformFile Include="Transforms\Metadata.xml" />
8855
</ItemGroup>
8956
<ItemGroup>
90-
<EmbeddedJar Include="Jars\Branch-4.0.0_core.jar" />
57+
<EmbeddedJar Include="Jars\Branch-4.2.0_core.jar" />
9158
</ItemGroup>
9259
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.Bindings.targets" />
93-
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
94-
<Import Project="..\packages\Xamarin.Android.Support.Annotations.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Annotations.targets')" />
95-
<Import Project="..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Core.Common.1.0.0\build\MonoAndroid80\Xamarin.Android.Arch.Core.Common.targets')" />
96-
<Import Project="..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.3\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Common.1.0.3\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Common.targets')" />
97-
<Import Project="..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.3\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets" Condition="Exists('..\packages\Xamarin.Android.Arch.Lifecycle.Runtime.1.0.3\build\MonoAndroid80\Xamarin.Android.Arch.Lifecycle.Runtime.targets')" />
98-
<Import Project="..\packages\Xamarin.Android.Support.Compat.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Compat.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Compat.targets')" />
99-
<Import Project="..\packages\Xamarin.Android.Support.Core.UI.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Core.UI.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.UI.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Core.UI.targets')" />
100-
<Import Project="..\packages\Xamarin.Android.Support.Core.Utils.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Core.Utils.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Core.Utils.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Core.Utils.targets')" />
101-
<Import Project="..\packages\Xamarin.Android.Support.CustomTabs.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.CustomTabs.targets" Condition="Exists('..\packages\Xamarin.Android.Support.CustomTabs.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.CustomTabs.targets')" />
102-
<Import Project="..\packages\Xamarin.Android.Support.Fragment.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Fragment.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Fragment.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Fragment.targets')" />
103-
<Import Project="..\packages\Xamarin.Android.Support.Media.Compat.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Media.Compat.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Media.Compat.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.Media.Compat.targets')" />
104-
<Import Project="..\packages\Xamarin.Android.Support.v4.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.v4.targets" Condition="Exists('..\packages\Xamarin.Android.Support.v4.27.0.2\build\MonoAndroid81\Xamarin.Android.Support.v4.targets')" />
105-
<Import Project="..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.targets" Condition="Exists('..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.targets')" />
60+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
61+
Other similar extension points exist, see Microsoft.Common.targets.
62+
<Target Name="BeforeBuild">
63+
</Target>
64+
<Target Name="AfterBuild">
65+
</Target>
66+
-->
10667
</Project>

‎Branch-Xamarin-Lib.Droid/Jars/AboutJars.txt‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,18 @@
11
This directory is for Android .jars.
22

3-
There are 4 types of jars that are supported:
3+
There are 2 types of jars that are supported:
44

5-
== Input Jar and Embedded Jar ==
5+
== Input Jar ==
66

77
This is the jar that bindings should be generated for.
88

99
For example, if you were binding the Google Maps library, this would
1010
be Google's "maps.jar".
1111

12-
The difference between EmbeddedJar and InputJar is, EmbeddedJar is to be
13-
embedded in the resulting dll as EmbeddedResource, while InputJar is not.
14-
There are couple of reasons you wouldn't like to embed the target jar
15-
in your dll (the ones that could be internally loaded by <uses-library>
16-
feature e.g. maps.jar, or you cannot embed jars that are under some
17-
proprietary license).
18-
1912
Set the build action for these jars in the properties page to "InputJar".
2013

2114

22-
== Reference Jar and Embedded Reference Jar ==
15+
== Reference Jars ==
2316

2417
These are jars that are referenced by the input jar. C# bindings will
2518
not be created for these jars. These jars will be used to resolve
@@ -28,10 +21,4 @@ types used by the input jar.
2821
NOTE: Do not add "android.jar" as a reference jar. It will be added automatically
2922
based on the Target Framework selected.
3023

31-
Set the build action for these jars in the properties page to "ReferenceJar".
32-
33-
"EmbeddedJar" works like "ReferenceJar", but like "EmbeddedJar", it is
34-
embedded in your dll. But at application build time, they are not included
35-
in the final apk, like ReferenceJar files.
36-
37-
24+
Set the build action for these jars in the properties page to "ReferenceJar".

‎Branch-Xamarin-Lib.Droid/Jars/Branch-3.0.1_core.jar‎

-303 KB
Binary file not shown.

‎Branch-Xamarin-Lib.Droid/Jars/Branch-3.0.3_core.jar‎

-303 KB
Binary file not shown.

‎Branch-Xamarin-Lib.Droid/Jars/Branch-4.0.0_core.jar‎

-314 KB
Binary file not shown.

Branch-Xamarin-Lib.Droid/Jars/Branch-4.1.0_core.jar renamed to Branch-Xamarin-Lib.Droid/Jars/Branch-4.2.0_core.jar

325 KB
Binary file not shown.

‎Branch-Xamarin-Lib.Droid/Properties/AssemblyInfo.cs‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
11
using System.Reflection;
22
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
34
using Android.App;
45

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 ("Branch-Xamarin-Lib.Droid")]
9-
[assembly: AssemblyDescription ("")]
10-
[assembly: AssemblyConfiguration ("")]
11-
[assembly: AssemblyCompany ("")]
12-
[assembly: AssemblyProduct ("")]
13-
[assembly: AssemblyCopyright ("antonarhunou")]
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("")]
6+
// General Information about an assembly is controlled through the following
7+
// set of attributes. Change these attribute values to modify the information
8+
// associated with an assembly.
9+
[assembly: AssemblyTitle("Branch_Xamarin_Lib.Droid")]
10+
[assembly: AssemblyDescription("")]
11+
[assembly: AssemblyConfiguration("")]
12+
[assembly: AssemblyCompany("")]
13+
[assembly: AssemblyProduct("Branch_Xamarin_Lib.Droid")]
14+
[assembly: AssemblyCopyright("Copyright © 2019 Branch Metrics, Inc.")]
15+
[assembly: AssemblyTrademark("")]
16+
[assembly: AssemblyCulture("")]
17+
[assembly: ComVisible(false)]
2818

19+
// Version information for an assembly consists of the following four values:
20+
//
21+
// Major Version
22+
// Minor Version
23+
// Build Number
24+
// Revision
25+
//
26+
// You can specify all the values or you can default the Build and Revision Numbers
27+
// by using the '*' as shown below:
28+
// [assembly: AssemblyVersion("1.0.*")]
29+
[assembly: AssemblyVersion("1.0.0.0")]
30+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Branch-Xamarin-Lib.Droid/Transforms/Metadata.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
<attr path="/api/package[@name='io.branch.referral']/interface[@name='NetworkCallback']" name="visibility">public</attr>
88
<attr path="/api/package[@name='io.branch.referral']/class[@name='ServerRequest']/method[@name='getRequestPath']" name="managedName">getRequestPath</attr>
99
<attr path="/api/package[@name='io.branch.referral']/class[@name='Branch']" name="managedName">AndroidNativeBranch</attr>
10-
10+
<remove-node path="/api/package[@name='io.branch.referral.validators']/class[@name='IntegrationValidator']/implements[@name='io.branch.referral.validators.ServerRequestGetAppConfig.IGetAppConfigEvents']" />
1111
</metadata>

‎Branch-Xamarin-Lib.Droid/packages.config‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)