From 827c04b3f457266a0a7be997dbe55e3ed0b7cb2a Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 18 Jan 2018 12:07:12 -0500 Subject: [PATCH] Bump to xamarin-android-api-compatibility/d15-6/9d71e200 Context: https://github.com/xamarin/xamarin-android/issues/1089 Context: https://github.com/xamarin/xamarin-android/pull/1078 Context: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/823/ Commit 8ff139f9 [broke][0] the [build][1], in a minor way: [0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/824/console [1]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/824/ # reading extras from: inter-api-extra-v2.3-v4.0.3.txt mono --debug /Users/builder/jenkins/workspace/xamarin-android/xamarin-android/bin/BuildDebug/mono-api-html.exe "inter-apis/v2.3/Mono.Android.xml" "inter-apis/v4.0.3/Mono.Android.xml" --ignore-changes-parameter-names --ignore-changes-virtual --ignore-changes-property-setters --ignore-nonbreaking

### API BREAK BETWEEN v2.3 and v4.0.3

...

Namespace Android.Text

Type Changed: Android.Text.ClipboardManager

Modified properties:

	
public abstract bool HasText { get; }
public abstract Java.Lang.ICharSequence TextFormatted { get; set; }
... These are "acceptable" API breakage for now, previously not reported [because the test was broken][6dfb]. The test was fixed on xamarin-android-api-compatibility/master, but we haven't been able to merge to that commit yet (PR #1078). [6dfb]: https://github.com/xamarin/xamarin-android-api-compatibility/commit/6dfba92e571a7c03e2f925fd7aea1bfdb9d3f753 Unfortunately, 8ff139f9 included a bump to xamarin-android-api-compatibility/master, thus introducing the "UNSTABLE" breakage that PR #1078 encountered. For now -- until we can properly fix things -- bump to xamarin-android-api-compatibility/d15-6, which *lacks* the test fixes on master, and thus will allow the API compatibility checks to pass. --- .gitmodules | 2 +- external/xamarin-android-api-compatibility | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6ad93cededd..ac507adcd40 100644 --- a/.gitmodules +++ b/.gitmodules @@ -36,7 +36,7 @@ [submodule "external/xamarin-android-api-compatibility"] path = external/xamarin-android-api-compatibility url = https://github.com/xamarin/xamarin-android-api-compatibility.git - branch = master + branch = d15-6 [submodule "external/xamarin-android-tools"] path = external/xamarin-android-tools url = https://github.com/xamarin/xamarin-android-tools diff --git a/external/xamarin-android-api-compatibility b/external/xamarin-android-api-compatibility index 6874e3f320b..9d71e200708 160000 --- a/external/xamarin-android-api-compatibility +++ b/external/xamarin-android-api-compatibility @@ -1 +1 @@ -Subproject commit 6874e3f320bc263072214c9ae1527ae186e0d51d +Subproject commit 9d71e2007086737881c8085afd91fc0a5c9a1e6c