diff --git a/Configuration.props b/Configuration.props index e4a6191ec12..41ef052de48 100644 --- a/Configuration.props +++ b/Configuration.props @@ -17,13 +17,13 @@ v2.3 - 27 + 28 $(AndroidLatestStableApiLevel) - v8.1 + v9.0 28 - P - v8.1.99 + 28 + v9.0 $(AndroidLatestStableApiLevel) $(AndroidLatestStablePlatformId) @@ -77,8 +77,8 @@ armeabi;armeabi-v7a;x86 arm64-v8a;x86_64 $(AllSupported32BitTargetAndroidAbis);$(AllSupported64BitTargetAndroidAbis) - 28-rc2 - 28.0.0-rc2 + 28 + 28.0.0 False False $([System.IO.Path]::PathSeparator) diff --git a/build-tools/android-toolchain/android-toolchain.projitems b/build-tools/android-toolchain/android-toolchain.projitems index c83e74d2096..e34657e8d2c 100644 --- a/build-tools/android-toolchain/android-toolchain.projitems +++ b/build-tools/android-toolchain/android-toolchain.projitems @@ -113,17 +113,17 @@ platforms\android-25 - + platforms\android-26 - + platforms\android-27 - + - platforms\android-P + platforms\android-28 diff --git a/build-tools/api-xml-adjuster/Makefile b/build-tools/api-xml-adjuster/Makefile index 2ce506ff5cd..e4b6b1abee4 100644 --- a/build-tools/api-xml-adjuster/Makefile +++ b/build-tools/api-xml-adjuster/Makefile @@ -17,7 +17,7 @@ API_XML_TOOL = $(BUILDBIN)/api-xml-adjuster.exe RUNTIME = mono --debug RUN_CLASS_PARSE = $(RUNTIME) $(CLASS_PARSE) RUN_API_XML_TOOL = $(RUNTIME) $(API_XML_TOOL) -API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 P +API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 XML_OUTPUT_DIR = . diff --git a/build-tools/enumification-helpers/Makefile b/build-tools/enumification-helpers/Makefile index b4b71af94ad..97cf94e0548 100644 --- a/build-tools/enumification-helpers/Makefile +++ b/build-tools/enumification-helpers/Makefile @@ -1,7 +1,7 @@ topdir = ../.. -API_LEVEL = 27 -API_LEVEL_NAME = 27 +API_LEVEL = 28 +API_LEVEL_NAME = 28 CSCOMPILE = csc -debug:portable @@ -17,8 +17,8 @@ all:: map.ext.csv remaining-int-consts.txt remaining-int-methods-filtered.txt generate-const-list-2.exe: generate-const-list-2.cs $(CSCOMPILE) generate-const-list-2.cs -const-list-$(API_LEVEL).xml: generate-const-list-2.exe ../../src/Mono.Android/Profiles/*.xml.in - mono --debug generate-const-list-2.exe ../../src/Mono.Android/Profiles > const-list-$(API_LEVEL).xml || rm const-list-$(API_LEVEL).xml +const-list-$(API_LEVEL).xml: generate-const-list-2.exe ../../bin/Build$(CONFIGURATION)/api/*.xml.in + mono --debug generate-const-list-2.exe ../../bin/Build$(CONFIGURATION)/api > const-list-$(API_LEVEL).xml || rm const-list-$(API_LEVEL).xml generate-const-mapping.exe: $(CONST_MAPPER_SOURCES) $(CSCOMPILE) $(CONST_MAPPER_SOURCES) diff --git a/build-tools/scripts/BuildEverything.mk b/build-tools/scripts/BuildEverything.mk index 7f83f1555c9..836fa8bd1bc 100644 --- a/build-tools/scripts/BuildEverything.mk +++ b/build-tools/scripts/BuildEverything.mk @@ -25,9 +25,9 @@ ZIP_OUTPUT = $(ZIP_OUTPUT_BASENAME).$(ZIP_EXTENSION) # $(ALL_API_LEVELS) and $(ALL_FRAMEWORKS) must be kept in sync w/ each other ALL_API_LEVELS = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 # this was different from ALL_API_LEVELS when API Level 26 was "O". Same could happen in the future. -ALL_PLATFORM_IDS = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 P +ALL_PLATFORM_IDS = 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 # supported api levels -ALL_FRAMEWORKS = _ _ _ _ _ _ _ _ _ v2.3 _ _ _ _ v4.0.3 v4.1 v4.2 v4.3 v4.4 v4.4.87 v5.0 v5.1 v6.0 v7.0 v7.1 v8.0 v8.1 v8.1.99 +ALL_FRAMEWORKS = _ _ _ _ _ _ _ _ _ v2.3 _ _ _ _ v4.0.3 v4.1 v4.2 v4.3 v4.4 v4.4.87 v5.0 v5.1 v6.0 v7.0 v7.1 v8.0 v8.1 v9.0 API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 28 STABLE_API_LEVELS = 10 15 16 17 18 19 20 21 22 23 24 25 26 27 diff --git a/external/mono b/external/mono index a49a68c6d7a..6f9bef3bdb8 160000 --- a/external/mono +++ b/external/mono @@ -1 +1 @@ -Subproject commit a49a68c6d7a48aabd4f24a38bbc93d18e02dd2ca +Subproject commit 6f9bef3bdb83d53578417ea7039081da4e7c9a3d diff --git a/src/Mono.Android/Mono.Android.projitems b/src/Mono.Android/Mono.Android.projitems index c11a16a9693..f8e511a562d 100644 --- a/src/Mono.Android/Mono.Android.projitems +++ b/src/Mono.Android/Mono.Android.projitems @@ -139,10 +139,10 @@ 27 True - - P Preview UNSTABLE + + P 28 - P + 28 False diff --git a/src/Mono.Android/Profiles/api-27.params.txt b/src/Mono.Android/Profiles/api-27.params.txt index 3dfffb568bf..3e56028ae63 100644 --- a/src/Mono.Android/Profiles/api-27.params.txt +++ b/src/Mono.Android/Profiles/api-27.params.txt @@ -9129,6 +9129,8 @@ package android.net.wifi.aware onSubscribeStarted(android.net.wifi.aware.SubscribeDiscoverySession session) class IdentityChangedListener onIdentityChanged(byte[] mac) + class PeerHandle + equals(java.lang.Object o) class PublishConfig equals(java.lang.Object o) writeToParcel(android.os.Parcel dest, int flags) diff --git a/src/Mono.Android/Profiles/api-28.params.txt b/src/Mono.Android/Profiles/api-28.params.txt index c71a577f460..7f7033d265f 100644 --- a/src/Mono.Android/Profiles/api-28.params.txt +++ b/src/Mono.Android/Profiles/api-28.params.txt @@ -2125,26 +2125,20 @@ package android.app.slice addRemoteInput(android.app.RemoteInput remoteInput, java.lang.String subType, java.util.List hints) addSubSlice(android.app.slice.Slice slice, java.lang.String subType) addText(java.lang.CharSequence text, java.lang.String subType, java.util.List hints) - addTimestamp(long time, java.lang.String subType, java.util.List hints) setCallerNeeded(boolean callerNeeded) - setSpec(android.app.slice.SliceSpec spec) #ctor(android.app.slice.Slice.Builder parent) - #ctor(android.net.Uri uri) #ctor(android.net.Uri uri, android.app.slice.SliceSpec spec) class SliceItem hasHint(java.lang.String hint) writeToParcel(android.os.Parcel dest, int flags) class SliceManager - bindSlice(android.content.Intent intent, java.util.List supportedSpecs) bindSlice(android.content.Intent intent, java.util.Set supportedSpecs) - bindSlice(android.net.Uri uri, java.util.List supportedSpecs) bindSlice(android.net.Uri uri, java.util.Set supportedSpecs) checkSlicePermission(android.net.Uri uri, int pid, int uid) getPinnedSpecs(android.net.Uri uri) getSliceDescendants(android.net.Uri uri) grantSlicePermission(java.lang.String toPackage, android.net.Uri uri) mapIntentToUri(android.content.Intent intent) - pinSlice(android.net.Uri uri, java.util.List specs) pinSlice(android.net.Uri uri, java.util.Set specs) revokeSlicePermission(java.lang.String toPackage, android.net.Uri uri) unpinSlice(android.net.Uri uri) @@ -2157,7 +2151,6 @@ package android.app.slice delete(android.net.Uri uri, java.lang.String selection, java.lang.String[] selectionArgs) getType(android.net.Uri uri) insert(android.net.Uri uri, android.content.ContentValues values) - onBindSlice(android.net.Uri sliceUri, java.util.List supportedSpecs) onBindSlice(android.net.Uri sliceUri, java.util.Set supportedSpecs) onCreatePermissionRequest(android.net.Uri sliceUri) onGetSliceDescendants(android.net.Uri uri) @@ -3376,7 +3369,6 @@ package android.content.pm #ctor(android.os.Parcel source) dumpBack(android.util.Printer pw, java.lang.String prefix) dumpFront(android.util.Printer pw, java.lang.String prefix) - loadLabel(android.content.pm.PackageManager pm) writeToParcel(android.os.Parcel dest, int parcelableFlags) class ConfigurationInfo #ctor(android.content.pm.ConfigurationInfo orig) @@ -14207,7 +14199,6 @@ package android.telephony iccTransmitApduLogicalChannel(int channel, int cla, int instruction, int p1, int p2, int p3, java.lang.String data) isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle accountHandle) listen(android.telephony.PhoneStateListener listener, int events) - requestNetworkScan(android.telephony.NetworkScanRequest request, android.telephony.TelephonyScanManager.NetworkScanCallback callback) requestNetworkScan(android.telephony.NetworkScanRequest request, java.util.concurrent.Executor executor, android.telephony.TelephonyScanManager.NetworkScanCallback callback) sendDialerSpecialCode(java.lang.String inputCode) sendEnvelopeWithStatus(java.lang.String content) diff --git a/src/Mono.Android/metadata b/src/Mono.Android/metadata index a76c6e1677c..1525b120dd0 100644 --- a/src/Mono.Android/metadata +++ b/src/Mono.Android/metadata @@ -1407,5 +1407,6 @@ Android.Views.TextClassifiers.Logging + CarrierIdField diff --git a/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/java/com/xamarin/android/MyCanvas.java b/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/java/com/xamarin/android/MyCanvas.java index f4afa88bd93..a7567b512f6 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/java/com/xamarin/android/MyCanvas.java +++ b/tests/CodeGen-Binding/Xamarin.Android.McwGen-Tests/java/com/xamarin/android/MyCanvas.java @@ -10,9 +10,9 @@ public void drawColor (int color) } @Override - public int save (int saveFlags) + public int save () { - return super.save (saveFlags); + return super.save (); } }