Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
0d85c72
Update config.json
moljac Dec 3, 2021
d83bbaf
mappings
moljac Dec 3, 2021
de5f835
metadata new and fixes
moljac Dec 3, 2021
ebf531e
unit tests fixes
moljac Dec 3, 2021
b9a0f4c
Update utilities.cake
moljac Dec 3, 2021
8355b0c
Update dependencies.json
moljac Dec 3, 2021
956a346
Merge branch 'main' into wsu-20211202
moljac Dec 7, 2021
8479065
mappings updates
moljac Dec 13, 2021
737b575
removed apis collection and open in editor
moljac Dec 13, 2021
e69008f
Update dependencies.json
moljac Dec 16, 2021
c1c875e
Update dependencies.json
moljac Dec 17, 2021
c1a12ae
downgraded artifacts that target SDK 31
moljac Dec 19, 2021
845a731
parsing pom and AndroidManifest.xml to detect targetSDKVersion
moljac Dec 19, 2021
670a598
azure-pipelines.yml version bumps
moljac Dec 21, 2021
11f2a10
targetSDKversion and minCompileSDK analysis
moljac Dec 24, 2021
56fdcbc
Merge branch 'main' into wsu-20211202
moljac Dec 24, 2021
9e1332e
Update config.json
moljac Jan 3, 2022
7a8007b
mappings updates
moljac Jan 3, 2022
7fc38dd
Merge branch 'wsu-20211202' of https://github.com/xamarin/AndroidX in…
moljac Jan 3, 2022
12db392
Merge branch 'main' into wsu-20211202
moljac Jan 24, 2022
7961c8a
unit tests fixes
moljac Jan 25, 2022
7b14e4b
mappings updatesa
moljac Jan 25, 2022
af18146
Update dependencies.json
moljac Jan 26, 2022
f32b376
Update DependenciesTests.cs
moljac Jan 26, 2022
75ba724
reverting some bumps
moljac Jan 30, 2022
8ca8c1a
Update androidx-assemblies.csv
moljac Jan 30, 2022
8551dd8
version tuning for lifecycle packages
moljac Jan 30, 2022
62c1b84
Update DependenciesTests.cs
moljac Jan 30, 2022
65b3726
mappings
moljac Jan 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
224 changes: 124 additions & 100 deletions config.json

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions mappings/androidx-assemblies.csv
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
Support .NET assembly,AndroidX .NET assembly,Support NuGet,AndroidX NuGet,AndroidX NuGet Version
Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,2.1.0.11
Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.11
Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.3.1.3
Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.0
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.10
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.3.1.3
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.3.1.3
Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.3.1.3
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
Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.3.1.4
Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.3.1.3
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.0
Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.0
Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.0
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
Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.0
Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.0
Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.10
Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.10
Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.0.2
Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,2.3.0.4
Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,2.3.0.4
Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,2.7.0
Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,2.7.1
Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,1.1.0.10
Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,2.2.21.3
Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.2.1
Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,1.2.0.3
Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.3
Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,1.3.0
Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,1.2.0.2
Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,22.0.0.3
Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,23.0.0
Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.10
Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.1.0.10
Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.2.0
Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0.3
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.1.1.2
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.ConstraintLayout,2.1.2
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,7.0.3
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.0.3
Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,7.0.3
Expand All @@ -36,7 +36,7 @@ Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.And
Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.3.0.8
Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.9
Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,2.2.21.3
Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.2.1
Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.3
Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.1.0.3
Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.4.0.4
Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.5.31.3
Expand Down
2 changes: 1 addition & 1 deletion mappings/androidx-mapping.csv
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ Android.Support.V4.Print,PrintHelper.IOnPrintFinishCallback,AndroidX.Print,Print
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,
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment.
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.HolderFragment.HolderFragmentManager.
Android.Arch.Lifecycle,ProcessLifecycleOwnerInitializer,AndroidX.Lifecycle,ProcessLifecycleOwnerInitializer,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,android.arch.lifecycle,ProcessLifecycleOwnerInitializer,androidx.lifecycle,ProcessLifecycleOwnerInitializer,
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ProcessLifecycleOwnerInitializer.
Android.Arch.Lifecycle,ServiceLifecycleDispatcher,AndroidX.Lifecycle,ServiceLifecycleDispatcher,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,android.arch.lifecycle,ServiceLifecycleDispatcher,androidx.lifecycle,ServiceLifecycleDispatcher,
,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ServiceLifecycleDispatcher.DispatchRunnable.
Android.Arch.Lifecycle,ViewModelStores,AndroidX.Lifecycle,ViewModelStores,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,android.arch.lifecycle,ViewModelStores,androidx.lifecycle,ViewModelStores,
Expand Down
70 changes: 48 additions & 22 deletions mappings/dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
{
"id": "Xamarin.AndroidX.Lifecycle.ViewModel",
"dependencies": [
"Xamarin.AndroidX.Annotation"
"Xamarin.AndroidX.Annotation",
"Xamarin.Kotlin.StdLib"
]
},
{
Expand Down Expand Up @@ -872,6 +873,38 @@
"Xamarin.AndroidX.Emoji"
]
},
{
"id": "Xamarin.AndroidX.Emoji2",
"dependencies": [
"Xamarin.AndroidX.Annotation",
"Xamarin.AndroidX.Collection",
"Xamarin.AndroidX.Core",
"Xamarin.AndroidX.Lifecycle.Process",
"Xamarin.AndroidX.Startup.StartupRuntime"
]
},
{
"id": "Xamarin.AndroidX.Lifecycle.Process",
"dependencies": [
"Xamarin.AndroidX.Lifecycle.Runtime",
"Xamarin.AndroidX.Startup.StartupRuntime"
]
},
{
"id": "Xamarin.AndroidX.Startup.StartupRuntime",
"dependencies": [
"Xamarin.AndroidX.Annotation",
"Xamarin.AndroidX.Tracing.Tracing"
]
},
{
"id": "Xamarin.AndroidX.Emoji2.ViewsHelper",
"dependencies": [
"Xamarin.AndroidX.Collection",
"Xamarin.AndroidX.Core",
"Xamarin.AndroidX.Emoji2"
]
},
{
"id": "Xamarin.AndroidX.Loader",
"dependencies": [
Expand Down Expand Up @@ -1013,12 +1046,6 @@
"Xamarin.AndroidX.Lifecycle.ViewModel"
]
},
{
"id": "Xamarin.AndroidX.Lifecycle.Process",
"dependencies": [
"Xamarin.AndroidX.Lifecycle.Runtime"
]
},
{
"id": "Xamarin.AndroidX.Lifecycle.Service",
"dependencies": [
Expand Down Expand Up @@ -1189,14 +1216,7 @@
"Xamarin.AndroidX.Annotation",
"Xamarin.AndroidX.Arch.Core.Common",
"Xamarin.Kotlin.StdLib",
"Xamarin.KotlinX.Coroutines.Core.Jvm"
]
},
{
"id": "Xamarin.KotlinX.Coroutines.Core.Jvm",
"dependencies": [
"Xamarin.Kotlin.StdLib.Common",
"Xamarin.Kotlin.StdLib.Jdk8"
"Xamarin.KotlinX.Coroutines.Core"
]
},
{
Expand Down Expand Up @@ -1275,13 +1295,6 @@
"Xamarin.Kotlin.StdLib"
]
},
{
"id": "Xamarin.AndroidX.Startup.StartupRuntime",
"dependencies": [
"Xamarin.AndroidX.Annotation",
"Xamarin.AndroidX.Tracing.Tracing"
]
},
{
"id": "Xamarin.AndroidX.Recommendation",
"dependencies": [
Expand All @@ -1297,6 +1310,12 @@
"Xamarin.AndroidX.RecyclerView"
]
},
{
"id": "Xamarin.AndroidX.ResourceInspection.Annotation",
"dependencies": [
"Xamarin.AndroidX.Annotation"
]
},
{
"id": "Xamarin.AndroidX.Room.Common",
"dependencies": [
Expand Down Expand Up @@ -1552,6 +1571,13 @@
"Xamarin.Kotlin.StdLib"
]
},
{
"id": "Xamarin.KotlinX.Coroutines.Core.Jvm",
"dependencies": [
"Xamarin.Kotlin.StdLib.Common",
"Xamarin.Kotlin.StdLib.Jdk8"
]
},
{
"id": "Xamarin.Google.Guava",
"dependencies": []
Expand Down
38 changes: 38 additions & 0 deletions source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,10 @@
<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>
<attr path="/api/package/class[implements[@name='java.lang.Iterable']]/method[@name='iterator' and count(parameter)=0]" name="managedReturn">Java.Util.IIterator</attr>
<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>
<!--
moved below attempt to solve without remove-node
<remove-node path="/api/package/class[implements[@name='java.util.Collection'] and @final='true']/method[@name='getSize' and count(parameter)=0]" />
-->
<add-node path="/api/package/class[implements[@name='java.lang.Comparable'] and @final='true' and count(method[@name='compareTo'])=0]">
<method abstract="false" deprecated="not deprecated" final="false" name="compareTo" native="false" return="int" static="false" synchronized="false" visibility="public">
<parameter name="p0" type="java.lang.Object" />
Expand Down Expand Up @@ -177,4 +180,39 @@
<attr path="/api/package/class[substring(@name,string-length(@name)-7)='.Default']" name="managedName">DefaultStatic</attr>
<remove-node path="/api/package/class[substring(@name,string-length(@name)-7)='.Default' and count(method)=0 and count(field)=0]" />

<!--
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]
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]
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]
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]
-->
<!--
<attr
path="/api/package[@name='kotlin']/class[@name='UByteArray']/implements[@name='java.util.Collection']"
name="name-generic-aware"
>java.util.Collection&lt;java.lang.Object&gt;</attr>
<attr
path="/api/package[@name='kotlin']/class[@name='UByteArray']/implements[@name='java.util.Collection']"
name="jni-type"
>Ljava/util/Collection&lt;+Ljava/lang/Object;&gt;;</attr>
-->

<!--
<remove-node
path="/api/package[@name='kotlin']/class[@name='UByteArray']/method[@name='getSize']"
/>
-->
<!--
old
XPath seems to be incorrect
<remove-node path="/api/package/class[implements[@name='java.util.Collection'] and @final='true']/method[@name='getSize' and count(parameter)=0]" />
-->
<!--
<remove-node path="/api/package/class[implements[@name='java.util.Collection']]/method[@name='getSize' and count(parameter)=0]" />
-->
<remove-node path="/api/package/class[@name='UByteArray']/implements[@name='java.util.Collection']" />
<remove-node path="/api/package/class[@name='UIntArray']/implements[@name='java.util.Collection']" />
<remove-node path="/api/package/class[@name='UShortArray']/implements[@name='java.util.Collection']" />
<remove-node path="/api/package/class[@name='ULongArray']/implements[@name='java.util.Collection']" />

</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
>
AndroidX.AppCompat.Widget
</attr>

<attr
path="/api/package[@name='androidx.appcompat.resources']"
name="managedName"
>
AndroidX.AppCompat.Resources
</attr>


</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,23 @@
public
</attr>

<!--
name="managedReturn"
and
Android.Graphics.Color

generated/androidx.appcompat.appcompat-resources/obj/Debug/monoandroid9.0/generated/src/AndroidX.AppCompat.Widget.VectorEnabledTintResources.cs(232,12):
error CS0029:
Cannot implicitly convert type
'int'
to
'Android.Graphics.Color'
-->
<attr
path="/api/package[@name='androidx.appcompat.widget']/class[@name='VectorEnabledTintResources']/method[@name='getColor' and count(parameter)=1 and parameter[1][@type='int']]"
name="return"
>
android.graphics.Color
</attr>

</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,11 @@
<attr path="/api/package[@name='androidx.appcompat.view']" name="managedName">AndroidX.AppCompat.View</attr>
<attr path="/api/package[@name='androidx.appcompat.view.menu']" name="managedName">AndroidX.AppCompat.View.Menu</attr>
<attr path="/api/package[@name='androidx.appcompat.widget']" name="managedName">AndroidX.AppCompat.Widget</attr>

<attr
path="/api/package[@name='androidx.appcompat.resources']"
name="managedName"
>
AndroidX.AppCompat.App.Resources
</attr>
</metadata>
7 changes: 7 additions & 0 deletions source/androidx.appcompat/appcompat/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,11 @@
<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>
<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>

<attr
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]"
name="managedType"
>
Java.Lang.Object
</attr>

</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System;
using System.Collections.Generic;
using Android.Runtime;
using Java.Interop;
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<metadata>
<attr
path="/api/package[@name='androidx.emoji2.viewsintegration']"
name="managedName"
>
AndroidX.Emoji2.ViewsIntegration
</attr>
</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<metadata>

</metadata>
4 changes: 4 additions & 0 deletions source/androidx.emoji2/emoji2/Additions/Additions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System;
using System.Collections.Generic;
using Android.Runtime;
using Java.Interop;
15 changes: 15 additions & 0 deletions source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<metadata>
<attr
path="/api/package[@name='androidx.emoji2.text']"
name="managedName"
>
AndroidX.Emoji2.Text
</attr>
<attr
path="/api/package[@name='androidx.emoji2.text.flatbuffer']"
name="managedName"
>
AndroidX.Emoji2.Text.FlatBuffer
</attr>

</metadata>
Loading