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

Commit 27be9a5

Browse files
RedthRedth
committed
Fixes for v26 bindings
1 parent a2eb711 commit 27be9a5

File tree

5 files changed

+68
-38
lines changed

5 files changed

+68
-38
lines changed

‎AndroidSupport.sln‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "InstantVideo", "instantvide
6161
EndProject
6262
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wearable", "wearable\source\Wearable.csproj", "{F5E0D83F-81A8-40A9-9EFF-7605213AC743}"
6363
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TV-Provider", "support-tv-provider\source\TV-Provider.csproj", "{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}"
65+
EndProject
66+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-Bundled", "support-emoji-bundled\source\Emoji-Bundled.csproj", "{44CC369D-0196-4C80-88D1-C2016998263F}"
67+
EndProject
68+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji-AppCompat", "support-emoji-appcompat\source\Emoji-AppCompat.csproj", "{6824FF5C-9F50-4DE2-BF34-0314071FF83C}"
69+
EndProject
70+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Emoji", "support-emoji\source\Emoji.csproj", "{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}"
71+
EndProject
6472
Global
6573
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6674
Debug|Any CPU = Debug|Any CPU
@@ -187,5 +195,21 @@ Global
187195
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Debug|Any CPU.Build.0 = Debug|Any CPU
188196
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.ActiveCfg = Release|Any CPU
189197
{F5E0D83F-81A8-40A9-9EFF-7605213AC743}.Release|Any CPU.Build.0 = Release|Any CPU
198+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
199+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
200+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
201+
{0F4287F5-1E32-4E81-88B1-6E37F54BC6A2}.Release|Any CPU.Build.0 = Release|Any CPU
202+
{44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
203+
{44CC369D-0196-4C80-88D1-C2016998263F}.Debug|Any CPU.Build.0 = Debug|Any CPU
204+
{44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.ActiveCfg = Release|Any CPU
205+
{44CC369D-0196-4C80-88D1-C2016998263F}.Release|Any CPU.Build.0 = Release|Any CPU
206+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
207+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Debug|Any CPU.Build.0 = Debug|Any CPU
208+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.ActiveCfg = Release|Any CPU
209+
{6824FF5C-9F50-4DE2-BF34-0314071FF83C}.Release|Any CPU.Build.0 = Release|Any CPU
210+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
211+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
212+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
213+
{B0FA3251-5C9E-4E2E-AB4B-9B53F320C8A6}.Release|Any CPU.Build.0 = Release|Any CPU
190214
EndGlobalSection
191215
EndGlobal

‎build.cake‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,20 @@ LogSystemInfo ();
1717
var TARGET = Argument ("t", Argument ("target", "Default"));
1818
var BUILD_CONFIG = Argument ("config", "Release");
1919

20-
var NUGET_VERSION = "25.4.0.1";
21-
var COMPONENT_VERSION = "25.4.0.0";
22-
var AAR_VERSION = "25.4.0";
23-
var XBD_VERSION = "0.4.6";
20+
var NUGET_VERSION = "26.0.0-beta1";
21+
var COMPONENT_VERSION = "26.0.0.0";
22+
var AAR_VERSION = "26.0.0";
2423

2524
var SUPPORT_PKG_NAME = "com.android.support";
2625

2726
// FROM: https://dl.google.com/android/repository/addon2-1.xml
2827
var MAVEN_REPO_URL = "https://dl.google.com/dl/android/maven2/";
29-
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r26-rc2-macosx.zip";
30-
var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v7.1" : "android-25";
31-
var RENDERSCRIPT_FOLDER = "android-O";
28+
var BUILD_TOOLS_URL = "https://dl-ssl.google.com/android/repository/build-tools_r26-macosx.zip";
29+
var ANDROID_SDK_VERSION = IsRunningOnWindows () ? "v8.0" : "android-26";
30+
var RENDERSCRIPT_FOLDER = "android-8.0.0";
3231

3332
// We grab the previous release's api-info.xml to use as a comparison for this build's generated info to make an api-diff
34-
var BASE_API_INFO_URL = "https://github.com/xamarin/AndroidSupportComponents/releases/download/25.3.1/api-info.xml";
33+
var BASE_API_INFO_URL = "https://github.com/xamarin/AndroidSupportComponents/releases/download/25.4.0.1/api-info.xml";
3534

3635
var CPU_COUNT = System.Environment.ProcessorCount;
3736
var USE_MSBUILD_ON_MAC = true;
@@ -66,14 +65,14 @@ var ARTIFACTS = new [] {
6665
new ArtifactInfo (SUPPORT_PKG_NAME, "support-dynamic-animation", "Xamarin.Android.Support.Dynamic.Animation", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
6766
new ArtifactInfo (SUPPORT_PKG_NAME, "support-media-compat", "Xamarin.Android.Support.Media.Compat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
6867
new ArtifactInfo (SUPPORT_PKG_NAME, "support-fragment", "Xamarin.Android.Support.Fragment", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
69-
//new ArtifactInfo (SUPPORT_PKG_NAME, "support-tv-provider", "Xamarin.Android.Support.TV.Provider", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
68+
new ArtifactInfo (SUPPORT_PKG_NAME, "support-tv-provider", "Xamarin.Android.Support.TV.Provider", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7069
new ArtifactInfo (SUPPORT_PKG_NAME, "transition", "Xamarin.Android.Support.Transition", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7170
new ArtifactInfo (SUPPORT_PKG_NAME, "exifinterface", "Xamarin.Android.Support.Exif", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7271
new ArtifactInfo (SUPPORT_PKG_NAME, "wearable", "Xamarin.Android.Support.Wearable", "26.0.0-alpha1", "26.0.0-alpha1", COMPONENT_VERSION),
7372
new ArtifactInfo (SUPPORT_PKG_NAME, "support-annotations", "Xamarin.Android.Support.Annotations", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION, true),
74-
//new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji", "Xamarin.Android.Support.Emoji", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
75-
//new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-appcompat", "Xamarin.Android.Support.Emoji.AppCompat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
76-
//new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-bundled", "Xamarin.Android.Support.Emoji.Bundled", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
73+
new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji", "Xamarin.Android.Support.Emoji", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
74+
new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-appcompat", "Xamarin.Android.Support.Emoji.AppCompat", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
75+
new ArtifactInfo (SUPPORT_PKG_NAME, "support-emoji-bundled", "Xamarin.Android.Support.Emoji.Bundled", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7776

7877
new ArtifactInfo (SUPPORT_PKG_NAME, "renderscript-v8", "Xamarin.Android.Support.v8.RenderScript", AAR_VERSION, NUGET_VERSION, COMPONENT_VERSION),
7978
};
@@ -366,7 +365,6 @@ Task ("nuget-setup").IsDependentOn ("buildtasks").IsDependentOn ("externals")
366365

367366
// Transform all template.nuspec files
368367
var nuspecText = FileReadText(art.ArtifactId + "/nuget/template.nuspec");
369-
nuspecText = nuspecText.Replace ("$xbdversion$", XBD_VERSION);
370368
var nuspecFile = new FilePath(art.ArtifactId + "/nuget/" + art.NugetId + ".nuspec");
371369
FileWriteText(nuspecFile, nuspecText);
372370
var xNuspec = System.Xml.Linq.XDocument.Load (MakeAbsolute(nuspecFile).FullPath);

‎support-compat/source/Additions/Additions.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ public partial class Action
5252
return _GetRemoteInputs ();
5353
}
5454

55-
//public override global::Android.Support.V4.App.RemoteInputCompatBase.RemoteInput[] GetDataOnlyRemoteInputs()
56-
//{
57-
// return _GetDataOnlyRemoteInputs();
58-
//}
55+
public override global::Android.Support.V4.App.RemoteInputCompatBase.RemoteInput[] GetDataOnlyRemoteInputs()
56+
{
57+
return _GetDataOnlyRemoteInputs();
58+
}
5959

6060
}
6161
}

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<attr path="/api/package[@name='android.support.v4.app']/class[@name='RemoteInputCompatBase']" name="visibility">public</attr>
1616

1717
<attr path="/api/package[@name='android.support.v4.app']/class[@name='NotificationCompat.Action']/method[@name='getExtras' and count(parameter)=0]" name="visibility">protected</attr>
18-
<attr path="/api/package[@name='android.support.v4.app']/class[@name='NotificationCompat.Action']/method[@name='getRemoteInputs']" name="visibility">protected</attr>
18+
<attr path="/api/package[@name='android.support.v4.app']/class[@name='NotificationCompat.Action']/method[@name='getRemoteInputs']" name="visibility">protected</attr>
1919
<attr path="/api/package[@name='android.support.v4.app']/class[@name='RemoteInput']/method[@name='getAllowFreeFormInput' and count(parameter)=0]" name="visibility">protected</attr>
2020
<attr path="/api/package[@name='android.support.v4.app']/class[@name='RemoteInput']/method[@name='getExtras' and count(parameter)=0]" name="visibility">protected</attr>
2121
<attr path="/api/package[@name='android.support.v4.app']/class[@name='RemoteInput']/method[@name='getLabel' and count(parameter)=0]" name="visibility">protected</attr>
@@ -51,4 +51,12 @@
5151
<remove-node path="/api/package[@name='android.support.v4.os']/class[@name='LocaleListCompat.LocaleListCompatBaseImpl']" />
5252

5353
<remove-node path="/api/package[@name='android.support.v4.app']/class[@name='JobIntentService.CommandProcessor']" />
54+
55+
<remove-node path="/api/package[@name='android.support.v4.graphics']/class[@name='TypefaceCompatApi26Impl']" />
56+
57+
<!-- The generator binds both CharSequence and java.lang.String as System.String types so if we have overloads which only differ in java by CharSequence and String, we'll end up with duplicate .net binding overloads, so we remove the extra bindings -->
58+
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=1 and parameter[1][@type='java.lang.CharSequence']]" />
59+
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='boolean']]" />
60+
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=2 and parameter[1][@type='java.lang.String'] and parameter[2][@type='android.support.v4.text.TextDirectionHeuristicCompat']]" />
61+
<remove-node path="/api/package[@name='android.support.v4.text']/class[@name='BidiFormatter']/method[@name='unicodeWrap' and count(parameter)=3 and parameter[1][@type='java.lang.String'] and parameter[2][@type='android.support.v4.text.TextDirectionHeuristicCompat'] and parameter[3][@type='boolean']]" />
5462
</metadata>

‎support-vector-drawable/source/Additions/Additions.cs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33

44
namespace Android.Support.Graphics.Drawable
55
{
6-
public partial class VectorDrawableCommon
7-
{
8-
/*
9-
* Oddly, java_class_handle, class_ref, and ThresholdClass/ThresholdType were not being emitted
10-
* for this class, and since this class subclasses Drawable, it was trying to use the superclass's members
11-
* which are inaccessible. Adding these in manually *seems* to fix the issue
12-
*/
13-
internal static new IntPtr java_class_handle;
14-
internal static new IntPtr class_ref {
15-
get {
16-
return JNIEnv.FindClass ("android/support/graphics/drawable/VectorDrawableCommon", ref java_class_handle);
17-
}
18-
}
6+
//public partial class VectorDrawableCommon
7+
//{
8+
// /*
9+
// * Oddly, java_class_handle, class_ref, and ThresholdClass/ThresholdType were not being emitted
10+
// * for this class, and since this class subclasses Drawable, it was trying to use the superclass's members
11+
// * which are inaccessible. Adding these in manually *seems* to fix the issue
12+
// */
13+
// internal static new IntPtr java_class_handle;
14+
// internal static new IntPtr class_ref {
15+
// get {
16+
// return JNIEnv.FindClass ("android/support/graphics/drawable/VectorDrawableCommon", ref java_class_handle);
17+
// }
18+
// }
1919

20-
protected override IntPtr ThresholdClass {
21-
get { return class_ref; }
22-
}
20+
// protected override IntPtr ThresholdClass {
21+
// get { return class_ref; }
22+
// }
2323

24-
protected override global::System.Type ThresholdType {
25-
get { return typeof (VectorDrawableCommon); }
26-
}
27-
}
24+
// protected override global::System.Type ThresholdType {
25+
// get { return typeof (VectorDrawableCommon); }
26+
// }
27+
//}
2828
}
2929

0 commit comments

Comments
 (0)