Skip to content

Commit 2dc46c6

Browse files
moljacmoljac
authored
Merge pull request #436 from xamarin/wsu-20211202
Weekly Stable Updates 20211202
2 parents a0d9cfb + 65b3726 commit 2dc46c6

File tree

22 files changed

+538
-140
lines changed

22 files changed

+538
-140
lines changed

‎config.json‎

Lines changed: 124 additions & 100 deletions
Large diffs are not rendered by default.

‎mappings/androidx-assemblies.csv‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
Support .NET assembly,AndroidX .NET assembly,Support NuGet,AndroidX NuGet,AndroidX NuGet Version
22
Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,2.1.0.11
33
Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.11
4-
Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.3.1.3
4+
Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.0
55
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.10
6-
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.3.1.3
7-
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.3.1.3
8-
Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.3.1.3
9-
Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.3.1.3
10-
Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.3.1.4
11-
Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.3.1.3
6+
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.0
7+
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.0
8+
Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.0
9+
Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,Xamarin.Android.Arch.Lifecycle.LiveData.Core,Xamarin.AndroidX.Lifecycle.LiveData.Core,2.4.0
10+
Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.0
11+
Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.0
1212
Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.10
1313
Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.10
1414
Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.0.2
1515
Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,2.3.0.4
1616
Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,2.3.0.4
17-
Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,2.7.0
17+
Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,2.7.1
1818
Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,1.1.0.10
1919
Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,2.2.21.3
20-
Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.2.1
21-
Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,1.2.0.3
20+
Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.3
21+
Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,1.3.0
2222
Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,1.2.0.2
23-
Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,22.0.0.3
23+
Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,23.0.0
2424
Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.10
25-
Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.1.0.10
25+
Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.2.0
2626
Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0.3
27-
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.1.1.2
27+
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.1.2
2828
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,7.0.3
2929
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.0.3
3030
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,7.0.3
@@ -36,7 +36,7 @@ Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.And
3636
Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.3.0.8
3737
Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.9
3838
Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,2.2.21.3
39-
Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.2.1
39+
Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.3
4040
Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.1.0.3
4141
Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.4.0.4
4242
Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.5.31.3

‎mappings/androidx-mapping.csv‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -808,7 +808,7 @@ Android.Support.V4.Print,PrintHelper.IOnPrintFinishCallback,AndroidX.Print,Print
808808
Android.Support.V4.Print,PrintHelper.IOnPrintFinishCallbackInvoker,AndroidX.Print,PrintHelper.IOnPrintFinishCallbackInvoker,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,android.support.v4.print,PrintHelper.OnPrintFinishCallback,androidx.print,PrintHelper.OnPrintFinishCallback,
809809
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment.
810810
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment.HolderFragmentManager.
811-
Android.Arch.Lifecycle,ProcessLifecycleOwnerInitializer,AndroidX.Lifecycle,ProcessLifecycleOwnerInitializer,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,android.arch.lifecycle,ProcessLifecycleOwnerInitializer,androidx.lifecycle,ProcessLifecycleOwnerInitializer,
811+
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ProcessLifecycleOwnerInitializer.
812812
Android.Arch.Lifecycle,ServiceLifecycleDispatcher,AndroidX.Lifecycle,ServiceLifecycleDispatcher,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,android.arch.lifecycle,ServiceLifecycleDispatcher,androidx.lifecycle,ServiceLifecycleDispatcher,
813813
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ServiceLifecycleDispatcher.DispatchRunnable.
814814
Android.Arch.Lifecycle,ViewModelStores,AndroidX.Lifecycle,ViewModelStores,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,android.arch.lifecycle,ViewModelStores,androidx.lifecycle,ViewModelStores,

‎mappings/dependencies.json‎

Lines changed: 48 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
{
7575
"id": "Xamarin.AndroidX.Lifecycle.ViewModel",
7676
"dependencies": [
77-
"Xamarin.AndroidX.Annotation"
77+
"Xamarin.AndroidX.Annotation",
78+
"Xamarin.Kotlin.StdLib"
7879
]
7980
},
8081
{
@@ -872,6 +873,38 @@
872873
"Xamarin.AndroidX.Emoji"
873874
]
874875
},
876+
{
877+
"id": "Xamarin.AndroidX.Emoji2",
878+
"dependencies": [
879+
"Xamarin.AndroidX.Annotation",
880+
"Xamarin.AndroidX.Collection",
881+
"Xamarin.AndroidX.Core",
882+
"Xamarin.AndroidX.Lifecycle.Process",
883+
"Xamarin.AndroidX.Startup.StartupRuntime"
884+
]
885+
},
886+
{
887+
"id": "Xamarin.AndroidX.Lifecycle.Process",
888+
"dependencies": [
889+
"Xamarin.AndroidX.Lifecycle.Runtime",
890+
"Xamarin.AndroidX.Startup.StartupRuntime"
891+
]
892+
},
893+
{
894+
"id": "Xamarin.AndroidX.Startup.StartupRuntime",
895+
"dependencies": [
896+
"Xamarin.AndroidX.Annotation",
897+
"Xamarin.AndroidX.Tracing.Tracing"
898+
]
899+
},
900+
{
901+
"id": "Xamarin.AndroidX.Emoji2.ViewsHelper",
902+
"dependencies": [
903+
"Xamarin.AndroidX.Collection",
904+
"Xamarin.AndroidX.Core",
905+
"Xamarin.AndroidX.Emoji2"
906+
]
907+
},
875908
{
876909
"id": "Xamarin.AndroidX.Loader",
877910
"dependencies": [
@@ -1013,12 +1046,6 @@
10131046
"Xamarin.AndroidX.Lifecycle.ViewModel"
10141047
]
10151048
},
1016-
{
1017-
"id": "Xamarin.AndroidX.Lifecycle.Process",
1018-
"dependencies": [
1019-
"Xamarin.AndroidX.Lifecycle.Runtime"
1020-
]
1021-
},
10221049
{
10231050
"id": "Xamarin.AndroidX.Lifecycle.Service",
10241051
"dependencies": [
@@ -1189,14 +1216,7 @@
11891216
"Xamarin.AndroidX.Annotation",
11901217
"Xamarin.AndroidX.Arch.Core.Common",
11911218
"Xamarin.Kotlin.StdLib",
1192-
"Xamarin.KotlinX.Coroutines.Core.Jvm"
1193-
]
1194-
},
1195-
{
1196-
"id": "Xamarin.KotlinX.Coroutines.Core.Jvm",
1197-
"dependencies": [
1198-
"Xamarin.Kotlin.StdLib.Common",
1199-
"Xamarin.Kotlin.StdLib.Jdk8"
1219+
"Xamarin.KotlinX.Coroutines.Core"
12001220
]
12011221
},
12021222
{
@@ -1275,13 +1295,6 @@
12751295
"Xamarin.Kotlin.StdLib"
12761296
]
12771297
},
1278-
{
1279-
"id": "Xamarin.AndroidX.Startup.StartupRuntime",
1280-
"dependencies": [
1281-
"Xamarin.AndroidX.Annotation",
1282-
"Xamarin.AndroidX.Tracing.Tracing"
1283-
]
1284-
},
12851298
{
12861299
"id": "Xamarin.AndroidX.Recommendation",
12871300
"dependencies": [
@@ -1297,6 +1310,12 @@
12971310
"Xamarin.AndroidX.RecyclerView"
12981311
]
12991312
},
1313+
{
1314+
"id": "Xamarin.AndroidX.ResourceInspection.Annotation",
1315+
"dependencies": [
1316+
"Xamarin.AndroidX.Annotation"
1317+
]
1318+
},
13001319
{
13011320
"id": "Xamarin.AndroidX.Room.Common",
13021321
"dependencies": [
@@ -1552,6 +1571,13 @@
15521571
"Xamarin.Kotlin.StdLib"
15531572
]
15541573
},
1574+
{
1575+
"id": "Xamarin.KotlinX.Coroutines.Core.Jvm",
1576+
"dependencies": [
1577+
"Xamarin.Kotlin.StdLib.Common",
1578+
"Xamarin.Kotlin.StdLib.Jdk8"
1579+
]
1580+
},
15551581
{
15561582
"id": "Xamarin.Google.Guava",
15571583
"dependencies": []

‎source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,10 @@
8080
<attr path="/api/package/class[implements[@name='java.lang.Comparable']]/method[@name='compareTo' and count(parameter)=1]/parameter[1]" name="managedType">Java.Lang.Object</attr>
8181
<attr path="/api/package/class[implements[@name='java.lang.Iterable']]/method[@name='iterator' and count(parameter)=0]" name="managedReturn">Java.Util.IIterator</attr>
8282
<attr path="/api/package/class[implements[@name='java.util.Collection']]/method[starts-with(@name,'add-') and count(parameter)=1]/parameter[1]" name="managedType">Java.Lang.Object</attr>
83+
<!--
84+
moved below attempt to solve without remove-node
8385
<remove-node path="/api/package/class[implements[@name='java.util.Collection'] and @final='true']/method[@name='getSize' and count(parameter)=0]" />
86+
-->
8487
<add-node path="/api/package/class[implements[@name='java.lang.Comparable'] and @final='true' and count(method[@name='compareTo'])=0]">
8588
<method abstract="false" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
8689
<parameter name="p0" type="java.lang.Object" />
@@ -177,4 +180,39 @@
177180
<attr path="/api/package/class[substring(@name,string-length(@name)-7)='.Default']" name="managedName">DefaultStatic</attr>
178181
<remove-node path="/api/package/class[substring(@name,string-length(@name)-7)='.Default' and count(method)=0 and count(field)=0]" />
179182

183+
<!--
184+
generated/org.jetbrains.kotlin.kotlin-stdlib/obj/Debug/monoandroid9.0/generated/src/Kotlin.UByteArray.cs(10,69): error CS0535: 'UByteArray' does not implement interface member 'ICollection.Size()' [generated/org.jetbrains.kotlin.kotlin-stdlib/org.jetbrains.kotlin.kotlin-stdlib.csproj]
185+
generated/org.jetbrains.kotlin.kotlin-stdlib/obj/Debug/monoandroid9.0/generated/src/Kotlin.ULongArray.cs(10,69): error CS0535: 'ULongArray' does not implement interface member 'ICollection.Size()' [generated/org.jetbrains.kotlin.kotlin-stdlib/org.jetbrains.kotlin.kotlin-stdlib.csproj]
186+
generated/org.jetbrains.kotlin.kotlin-stdlib/obj/Debug/monoandroid9.0/generated/src/Kotlin.UShortArray.cs(10,70): error CS0535: 'UShortArray' does not implement interface member 'ICollection.Size()' [generated/org.jetbrains.kotlin.kotlin-stdlib/org.jetbrains.kotlin.kotlin-stdlib.csproj]
187+
generated/org.jetbrains.kotlin.kotlin-stdlib/obj/Debug/monoandroid9.0/generated/src/Kotlin.UIntArray.cs(10,68): error CS0535: 'UIntArray' does not implement interface member 'ICollection.Size()' [generated/org.jetbrains.kotlin.kotlin-stdlib/org.jetbrains.kotlin.kotlin-stdlib.csproj]
188+
-->
189+
<!--
190+
<attr
191+
path="/api/package[@name='kotlin']/class[@name='UByteArray']/implements[@name='java.util.Collection']"
192+
name="name-generic-aware"
193+
>java.util.Collection&lt;java.lang.Object&gt;</attr>
194+
<attr
195+
path="/api/package[@name='kotlin']/class[@name='UByteArray']/implements[@name='java.util.Collection']"
196+
name="jni-type"
197+
>Ljava/util/Collection&lt;+Ljava/lang/Object;&gt;;</attr>
198+
-->
199+
200+
<!--
201+
<remove-node
202+
path="/api/package[@name='kotlin']/class[@name='UByteArray']/method[@name='getSize']"
203+
/>
204+
-->
205+
<!--
206+
old
207+
XPath seems to be incorrect
208+
<remove-node path="/api/package/class[implements[@name='java.util.Collection'] and @final='true']/method[@name='getSize' and count(parameter)=0]" />
209+
-->
210+
<!--
211+
<remove-node path="/api/package/class[implements[@name='java.util.Collection']]/method[@name='getSize' and count(parameter)=0]" />
212+
-->
213+
<remove-node path="/api/package/class[@name='UByteArray']/implements[@name='java.util.Collection']" />
214+
<remove-node path="/api/package/class[@name='UIntArray']/implements[@name='java.util.Collection']" />
215+
<remove-node path="/api/package/class[@name='UShortArray']/implements[@name='java.util.Collection']" />
216+
<remove-node path="/api/package/class[@name='ULongArray']/implements[@name='java.util.Collection']" />
217+
180218
</metadata>

‎source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525
>
2626
AndroidX.AppCompat.Widget
2727
</attr>
28-
28+
<attr
29+
path="/api/package[@name='androidx.appcompat.resources']"
30+
name="managedName"
31+
>
32+
AndroidX.AppCompat.Resources
33+
</attr>
2934

3035

3136
</metadata>

‎source/androidx.appcompat/appcompat-resources/Transforms/Metadata.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,23 @@
4242
public
4343
</attr>
4444

45+
<!--
46+
name="managedReturn"
47+
and
48+
Android.Graphics.Color
49+
50+
generated/androidx.appcompat.appcompat-resources/obj/Debug/monoandroid9.0/generated/src/AndroidX.AppCompat.Widget.VectorEnabledTintResources.cs(232,12):
51+
error CS0029:
52+
Cannot implicitly convert type
53+
'int'
54+
to
55+
'Android.Graphics.Color'
56+
-->
57+
<attr
58+
path="/api/package[@name='androidx.appcompat.widget']/class[@name='VectorEnabledTintResources']/method[@name='getColor' and count(parameter)=1 and parameter[1][@type='int']]"
59+
name="return"
60+
>
61+
android.graphics.Color
62+
</attr>
63+
4564
</metadata>

‎source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,11 @@
1414
<attr path="/api/package[@name='androidx.appcompat.view']" name="managedName">AndroidX.AppCompat.View</attr>
1515
<attr path="/api/package[@name='androidx.appcompat.view.menu']" name="managedName">AndroidX.AppCompat.View.Menu</attr>
1616
<attr path="/api/package[@name='androidx.appcompat.widget']" name="managedName">AndroidX.AppCompat.Widget</attr>
17+
18+
<attr
19+
path="/api/package[@name='androidx.appcompat.resources']"
20+
name="managedName"
21+
>
22+
AndroidX.AppCompat.App.Resources
23+
</attr>
1724
</metadata>

‎source/androidx.appcompat/appcompat/Transforms/Metadata.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,4 +223,11 @@
223223
<attr path="/api/package[@name='androidx.appcompat.graphics.drawable']/class[@name='AnimatedStateListDrawableCompat']/method[@name='getChangingConfigurations' and count(parameter)=0]" name="managedReturn">Android.Content.PM.ConfigChanges</attr>
224224
<attr path="/api/package[@name='androidx.appcompat.widget']/class[@name='ActivityChooserModel.ActivityResolveInfo']/method[@name='compareTo' and count(parameter)=1 and parameter[1][@type='androidx.appcompat.widget.ActivityChooserModel.ActivityResolveInfo']]/parameter[1]" name="managedType">Java.Lang.Object</attr>
225225

226+
<attr
227+
path="/api/package[@name='androidx.appcompat.widget']/class/method[@name='readProperties' and count(parameter)=2 and parameter[2][@type='android.view.inspector.PropertyReader']]/parameter[1]"
228+
name="managedType"
229+
>
230+
Java.Lang.Object
231+
</attr>
232+
226233
</metadata>

‎source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using Android.Runtime;
4+
using Java.Interop;

0 commit comments

Comments
 (0)