From 0d85c72650dbd219aeab3c364a527343ff32e4b7 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 3 Dec 2021 17:25:49 +0100 Subject: [PATCH 01/25] Update config.json --- config.json | 204 +++++++++++++++++++++++++++++----------------------- 1 file changed, 114 insertions(+), 90 deletions(-) diff --git a/config.json b/config.json index e0707508c..d0f7725d1 100644 --- a/config.json +++ b/config.json @@ -69,8 +69,8 @@ { "groupId": "androidx.annotation", "artifactId": "annotation", - "version": "1.2.0", - "nugetVersion": "1.2.0.3", + "version": "1.3.0", + "nugetVersion": "1.3.0", "nugetId": "Xamarin.AndroidX.Annotation", "dependencyOnly": false }, @@ -85,16 +85,16 @@ { "groupId": "androidx.appcompat", "artifactId": "appcompat", - "version": "1.3.1", - "nugetVersion": "1.3.1.3", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.AndroidX.AppCompat", "dependencyOnly": false }, { "groupId": "androidx.appcompat", "artifactId": "appcompat-resources", - "version": "1.3.1", - "nugetVersion": "1.3.1.3", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.AndroidX.AppCompat.AppCompatResources", "dependencyOnly": false }, @@ -141,8 +141,8 @@ { "groupId": "androidx.browser", "artifactId": "browser", - "version": "1.3.0", - "nugetVersion": "1.3.0.8", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.AndroidX.Browser", "dependencyOnly": false }, @@ -205,168 +205,168 @@ { "groupId": "androidx.collection", "artifactId": "collection", - "version": "1.1.0", - "nugetVersion": "1.1.0.10", + "version": "1.2.0", + "nugetVersion": "1.2.0", "nugetId": "Xamarin.AndroidX.Collection", "dependencyOnly": false }, { "groupId": "androidx.collection", "artifactId": "collection-ktx", - "version": "1.1.0", - "nugetVersion": "1.1.0.3", + "version": "1.2.0", + "nugetVersion": "1.2.0", "nugetId": "Xamarin.AndroidX.Collection.Ktx", "dependencyOnly": false }, { "groupId": "androidx.compose.animation", "artifactId": "animation", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Animation", "dependencyOnly": false }, { "groupId": "androidx.compose.animation", "artifactId": "animation-core", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Animation.Core", "dependencyOnly": false }, { "groupId": "androidx.compose.foundation", "artifactId": "foundation", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Foundation", "dependencyOnly": false }, { "groupId": "androidx.compose.foundation", "artifactId": "foundation-layout", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Foundation.Layout", "dependencyOnly": false }, { "groupId": "androidx.compose.material", "artifactId": "material", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Material", "dependencyOnly": false }, { "groupId": "androidx.compose.material", "artifactId": "material-icons-core", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Material.Icons.Core", "dependencyOnly": false }, { "groupId": "androidx.compose.material", "artifactId": "material-icons-extended", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Material.Icons.Extended", "dependencyOnly": false }, { "groupId": "androidx.compose.material", "artifactId": "material-ripple", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Material.Ripple", "dependencyOnly": false }, { "groupId": "androidx.compose.runtime", "artifactId": "runtime", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Runtime", "dependencyOnly": false }, { "groupId": "androidx.compose.runtime", "artifactId": "runtime-livedata", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Runtime.LiveData", "dependencyOnly": false }, { "groupId": "androidx.compose.runtime", "artifactId": "runtime-rxjava2", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Runtime.RxJava2", "dependencyOnly": false }, { "groupId": "androidx.compose.runtime", "artifactId": "runtime-saveable", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.Runtime.Saveable", "dependencyOnly": false }, { "groupId": "androidx.compose.ui", "artifactId": "ui", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.UI", "dependencyOnly": false }, { "groupId": "androidx.compose.ui", "artifactId": "ui-geometry", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.UI.Geometry", "dependencyOnly": false }, { "groupId": "androidx.compose.ui", "artifactId": "ui-graphics", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.UI.Graphics", "dependencyOnly": false }, { "groupId": "androidx.compose.ui", "artifactId": "ui-text", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.UI.Text", "dependencyOnly": false }, { "groupId": "androidx.compose.ui", "artifactId": "ui-unit", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.UI.Unit", "dependencyOnly": false }, { "groupId": "androidx.compose.ui", "artifactId": "ui-util", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.UI.Util", "dependencyOnly": false }, { "groupId": "androidx.compose.ui", "artifactId": "ui-viewbinding", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.5", + "nugetVersion": "1.0.5", "nugetId": "Xamarin.AndroidX.Compose.UI.ViewBinding", "dependencyOnly": false }, @@ -381,16 +381,16 @@ { "groupId": "androidx.constraintlayout", "artifactId": "constraintlayout", - "version": "2.1.1", - "nugetVersion": "2.1.1.2", + "version": "2.1.2", + "nugetVersion": "2.1.2", "nugetId": "Xamarin.AndroidX.ConstraintLayout", "dependencyOnly": false }, { "groupId": "androidx.constraintlayout", "artifactId": "constraintlayout-core", - "version": "1.0.1", - "nugetVersion": "1.0.1.2", + "version": "1.0.2", + "nugetVersion": "1.0.2", "nugetId": "Xamarin.AndroidX.ConstraintLayout.Core", "dependencyOnly": false }, @@ -554,6 +554,30 @@ "nugetId": "Xamarin.AndroidX.Emoji.Bundled", "dependencyOnly": false }, + { + "groupId": "androidx.emoji2", + "artifactId": "emoji2", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Emoji2", + "dependencyOnly": false + }, + { + "groupId": "androidx.emoji2", + "artifactId": "emoji2-views-helper", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Emoji2.ViewsHelper", + "dependencyOnly": false + }, + { + "groupId": "androidx.resourceinspection", + "artifactId": "resourceinspection-annotation", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.ResourceInspection.Annotation", + "dependencyOnly": false + }, { "groupId": "androidx.exifinterface", "artifactId": "exifinterface", @@ -565,16 +589,16 @@ { "groupId": "androidx.fragment", "artifactId": "fragment", - "version": "1.3.6", - "nugetVersion": "1.3.6.3", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.AndroidX.Fragment", "dependencyOnly": false }, { "groupId": "androidx.fragment", "artifactId": "fragment-ktx", - "version": "1.3.6", - "nugetVersion": "1.3.6.3", + "version": "1.4.0", + "nugetVersion": "1.4.0", "nugetId": "Xamarin.AndroidX.Fragment.Ktx", "dependencyOnly": false }, @@ -917,48 +941,48 @@ { "groupId": "androidx.paging", "artifactId": "paging-common", - "version": "3.0.1", - "nugetVersion": "3.0.1.3", + "version": "3.1.0", + "nugetVersion": "3.1.0", "nugetId": "Xamarin.AndroidX.Paging.Common", "dependencyOnly": false }, { "groupId": "androidx.paging", "artifactId": "paging-common-ktx", - "version": "3.0.1", - "nugetVersion": "3.0.1.3", + "version": "3.1.0", + "nugetVersion": "3.1.0", "nugetId": "Xamarin.AndroidX.Paging.Common.Ktx", "dependencyOnly": false }, { "groupId": "androidx.paging", "artifactId": "paging-runtime", - "version": "3.0.1", - "nugetVersion": "3.0.1.3", + "version": "3.1.0", + "nugetVersion": "3.1.0", "nugetId": "Xamarin.AndroidX.Paging.Runtime", "dependencyOnly": false }, { "groupId": "androidx.paging", "artifactId": "paging-runtime-ktx", - "version": "3.0.1", - "nugetVersion": "3.0.1.3", + "version": "3.1.0", + "nugetVersion": "3.1.0", "nugetId": "Xamarin.AndroidX.Paging.Runtime.Ktx", "dependencyOnly": false }, { "groupId": "androidx.paging", "artifactId": "paging-rxjava2", - "version": "3.0.1", - "nugetVersion": "3.0.1.3", + "version": "3.1.0", + "nugetVersion": "3.1.0", "nugetId": "Xamarin.AndroidX.Paging.RxJava2", "dependencyOnly": false }, { "groupId": "androidx.paging", "artifactId": "paging-rxjava2-ktx", - "version": "3.0.1", - "nugetVersion": "3.0.1.3", + "version": "3.1.0", + "nugetVersion": "3.1.0", "nugetId": "Xamarin.AndroidX.Paging.RxJava2.Ktx", "dependencyOnly": false }, @@ -1013,8 +1037,8 @@ { "groupId": "androidx.profileinstaller", "artifactId": "profileinstaller", - "version": "1.0.0", - "nugetVersion": "1.0.0", + "version": "1.0.4", + "nugetVersion": "1.0.4", "nugetId": "Xamarin.AndroidX.ProfileInstaller.ProfileInstaller", "dependencyOnly": false }, @@ -1317,16 +1341,16 @@ { "groupId": "androidx.work", "artifactId": "work-runtime", - "version": "2.7.0", - "nugetVersion": "2.7.0", + "version": "2.7.1", + "nugetVersion": "2.7.1", "nugetId": "Xamarin.AndroidX.Work.Runtime", "dependencyOnly": false }, { "groupId": "androidx.work", "artifactId": "work-runtime-ktx", - "version": "2.7.0", - "nugetVersion": "2.7.0", + "version": "2.7.1", + "nugetVersion": "2.7.1", "nugetId": "Xamarin.AndroidX.Work.Work.Runtime.Ktx", "dependencyOnly": false }, @@ -1377,8 +1401,8 @@ { "groupId": "io.reactivex.rxjava3", "artifactId": "rxjava", - "version": "3.1.2", - "nugetVersion": "3.1.2", + "version": "3.1.3", + "nugetVersion": "3.1.3", "nugetId": "Xamarin.Android.ReactiveX.RxJava3.RxJava", "dependencyOnly": false, "templateSet": "rxjava" @@ -1386,8 +1410,8 @@ { "groupId": "org.jetbrains", "artifactId": "annotations", - "version": "22.0.0", - "nugetVersion": "22.0.0.2", + "version": "23.0.0", + "nugetVersion": "23.0.0", "nugetId": "Xamarin.Jetbrains.Annotations", "dependencyOnly": false, "templateSet": "kotlin" @@ -1395,8 +1419,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-reflect", - "version": "1.5.31", - "nugetVersion": "1.5.31.2", + "version": "1.6.0", + "nugetVersion": "1.6.0", "nugetId": "Xamarin.Kotlin.Reflect", "dependencyOnly": false, "templateSet": "kotlin", @@ -1407,8 +1431,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib", - "version": "1.5.31", - "nugetVersion": "1.5.31.2", + "version": "1.6.0", + "nugetVersion": "1.6.0", "nugetId": "Xamarin.Kotlin.StdLib", "dependencyOnly": false, "templateSet": "kotlin" @@ -1416,8 +1440,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib-common", - "version": "1.5.31", - "nugetVersion": "1.5.31.2", + "version": "1.6.0", + "nugetVersion": "1.6.0", "nugetId": "Xamarin.Kotlin.StdLib.Common", "dependencyOnly": false, "templateSet": "kotlin", @@ -1428,8 +1452,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib-jdk7", - "version": "1.5.31", - "nugetVersion": "1.5.31.2", + "version": "1.6.0", + "nugetVersion": "1.6.0", "nugetId": "Xamarin.Kotlin.StdLib.Jdk7", "dependencyOnly": false, "templateSet": "kotlin", @@ -1440,8 +1464,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib-jdk8", - "version": "1.5.31", - "nugetVersion": "1.5.31.2", + "version": "1.6.0", + "nugetVersion": "1.6.0", "nugetId": "Xamarin.Kotlin.StdLib.Jdk8", "dependencyOnly": false, "templateSet": "kotlin", From d83bbaf486c18bd5a3ace51de56782ef3b8bab27 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 3 Dec 2021 17:26:01 +0100 Subject: [PATCH 02/25] mappings --- mappings/androidx-assemblies.csv | 24 +++++----- mappings/dependencies.json | 80 ++++++++++++++++++++++---------- 2 files changed, 68 insertions(+), 36 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 84902eb91..4c75ca943 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -14,17 +14,17 @@ Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework, 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.2 -Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.2 -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.2 +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.7.0 -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 @@ -33,13 +33,13 @@ Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xam Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.11 Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,1.0.0.10 Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,1.0.0.10 -Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.3.0.8 +Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.4.0 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.2 -Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,3.1.2 +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.2 +Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.6.0 Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.10 Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.5 Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.10 @@ -47,7 +47,7 @@ Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,Xamarin.Android.Support.Emo Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,1.1.0.5 Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,1.1.0.5 Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,1.3.3.2 -Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.3.6.3 +Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.4.0 Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,1.0.0.10 Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,1.0.0.10 Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,1.1.0.10 @@ -69,8 +69,8 @@ Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,Xamarin.Android. Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,1.0.0.12 Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,1.0.0.10 Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,1.0.0.10 -Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,1.3.1.3 -Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,1.3.1.3 +Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,1.4.0 +Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,1.4.0 Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,1.0.0.11 Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,1.0.0.10 Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,1.2.5.2 diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 10bc3127e..f29ec5e3d 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -207,9 +207,12 @@ "Xamarin.AndroidX.Core", "Xamarin.AndroidX.CursorAdapter", "Xamarin.AndroidX.DrawerLayout", + "Xamarin.AndroidX.Emoji2.ViewsHelper", + "Xamarin.AndroidX.Emoji2", "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.Lifecycle.ViewModel", + "Xamarin.AndroidX.ResourceInspection.Annotation", "Xamarin.AndroidX.SavedState" ] }, @@ -237,6 +240,24 @@ "Xamarin.AndroidX.CustomView" ] }, + { + "id": "Xamarin.AndroidX.Emoji2.ViewsHelper", + "dependencies": [ + "Xamarin.AndroidX.Collection", + "Xamarin.AndroidX.Core", + "Xamarin.AndroidX.Emoji2" + ] + }, + { + "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.Fragment", "dependencies": [ @@ -244,13 +265,20 @@ "Xamarin.AndroidX.Annotation.Experimental", "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", - "Xamarin.AndroidX.Core", + "Xamarin.AndroidX.Core.Core.Ktx", "Xamarin.AndroidX.Lifecycle.LiveData.Core", "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "Xamarin.AndroidX.Lifecycle.ViewModel", "Xamarin.AndroidX.Loader", "Xamarin.AndroidX.SavedState", - "Xamarin.AndroidX.ViewPager" + "Xamarin.AndroidX.ViewPager", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.ResourceInspection.Annotation", + "dependencies": [ + "Xamarin.AndroidX.Annotation" ] }, { @@ -883,6 +911,20 @@ "Xamarin.AndroidX.Emoji" ] }, + { + "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.Loader", "dependencies": [ @@ -1024,13 +1066,6 @@ "Xamarin.AndroidX.Lifecycle.ViewModel" ] }, - { - "id": "Xamarin.AndroidX.Lifecycle.Process", - "dependencies": [ - "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.AndroidX.Startup.StartupRuntime" - ] - }, { "id": "Xamarin.AndroidX.Lifecycle.Service", "dependencies": [ @@ -1046,13 +1081,6 @@ "Xamarin.KotlinX.Coroutines.Core" ] }, - { - "id": "Xamarin.AndroidX.Startup.StartupRuntime", - "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Tracing.Tracing" - ] - }, { "id": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencies": [ @@ -1121,6 +1149,10 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, + { + "id": "Xamarin.AndroidX.Migration.Tool", + "dependencies": [] + }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ @@ -1208,14 +1240,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" ] }, { @@ -1564,6 +1589,13 @@ "Xamarin.Kotlin.StdLib" ] }, + { + "id": "Xamarin.KotlinX.Coroutines.Core.Jvm", + "dependencies": [ + "Xamarin.Kotlin.StdLib.Common", + "Xamarin.Kotlin.StdLib.Jdk8" + ] + }, { "id": "Xamarin.Google.Guava", "dependencies": [] From de5f83578f5e92f52bd5d4fe819b057ca00974da Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 3 Dec 2021 17:26:23 +0100 Subject: [PATCH 03/25] metadata new and fixes --- .../Transforms/Metadata.xml | 38 +++++++++++++++++++ .../Transforms/Metadata.Namespaces.xml | 7 +++- .../Transforms/Metadata.xml | 19 ++++++++++ .../Transforms/Metadata.Namespaces.xml | 7 ++++ .../appcompat/Transforms/Metadata.xml | 7 ++++ .../Additions/Additions.cs | 4 ++ .../Transforms/Metadata.Namespaces.xml | 8 ++++ .../Transforms/Metadata.xml | 3 ++ .../emoji2/Additions/Additions.cs | 4 ++ .../emoji2/Transforms/Metadata.Namespaces.xml | 15 ++++++++ .../emoji2/Transforms/Metadata.xml | 15 ++++++++ .../Transforms/Metadata.Namespaces.xml | 7 ++++ .../Additions/Additions.cs | 4 ++ .../Transforms/Metadata.Namespaces.xml | 9 +++++ .../Transforms/Metadata.xml | 3 ++ .../Xamarin.AndroidX.Migration.props | 3 ++ 16 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs create mode 100644 source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.xml create mode 100644 source/androidx.emoji2/emoji2/Additions/Additions.cs create mode 100644 source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.emoji2/emoji2/Transforms/Metadata.xml create mode 100644 source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs create mode 100644 source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.xml diff --git a/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml b/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml index 568cf5b79..8141655a1 100644 --- a/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml +++ b/source/Xamarin.Kotlin.StdLib/Transforms/Metadata.xml @@ -80,7 +80,10 @@ Java.Lang.Object Java.Util.IIterator Java.Lang.Object + @@ -177,4 +180,39 @@ DefaultStatic + + + + + + + + + + + diff --git a/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml b/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml index 775280f41..aff6969bf 100644 --- a/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.Namespaces.xml @@ -25,7 +25,12 @@ > AndroidX.AppCompat.Widget - + + AndroidX.AppCompat.Resources + \ No newline at end of file diff --git a/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.xml b/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.xml index 22843f4e4..c74df57ab 100644 --- a/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.xml +++ b/source/androidx.appcompat/appcompat-resources/Transforms/Metadata.xml @@ -42,4 +42,23 @@ public + + + android.graphics.Color + + \ No newline at end of file diff --git a/source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml b/source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml index c97cdcb86..5a36a8743 100644 --- a/source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.appcompat/appcompat/Transforms/Metadata.Namespaces.xml @@ -14,4 +14,11 @@ AndroidX.AppCompat.View AndroidX.AppCompat.View.Menu AndroidX.AppCompat.Widget + + + AndroidX.AppCompat.App.Resources + \ No newline at end of file diff --git a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml index 5953de091..11080c67a 100644 --- a/source/androidx.appcompat/appcompat/Transforms/Metadata.xml +++ b/source/androidx.appcompat/appcompat/Transforms/Metadata.xml @@ -223,4 +223,11 @@ Android.Content.PM.ConfigChanges Java.Lang.Object + + Java.Lang.Object + + \ No newline at end of file diff --git a/source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs b/source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs new file mode 100644 index 000000000..d44eff0e9 --- /dev/null +++ b/source/androidx.emoji2/emoji2-views-helper/Additions/Additions.cs @@ -0,0 +1,4 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; diff --git a/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.Namespaces.xml b/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..4c5dd965c --- /dev/null +++ b/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,8 @@ + + + AndroidX.Emoji2.ViewsIntegration + + \ No newline at end of file diff --git a/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.xml b/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.xml new file mode 100644 index 000000000..13a3d38c7 --- /dev/null +++ b/source/androidx.emoji2/emoji2-views-helper/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.emoji2/emoji2/Additions/Additions.cs b/source/androidx.emoji2/emoji2/Additions/Additions.cs new file mode 100644 index 000000000..d44eff0e9 --- /dev/null +++ b/source/androidx.emoji2/emoji2/Additions/Additions.cs @@ -0,0 +1,4 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; diff --git a/source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml b/source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..1508cefa2 --- /dev/null +++ b/source/androidx.emoji2/emoji2/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,15 @@ + + + AndroidX.Emoji2.Text + + + AndroidX.Emoji2.Text.FlatBuffer + + + \ No newline at end of file diff --git a/source/androidx.emoji2/emoji2/Transforms/Metadata.xml b/source/androidx.emoji2/emoji2/Transforms/Metadata.xml new file mode 100644 index 000000000..2a0a7ec8a --- /dev/null +++ b/source/androidx.emoji2/emoji2/Transforms/Metadata.xml @@ -0,0 +1,15 @@ + + + Java.Lang.Object + + + Java.Lang.Object + + + \ No newline at end of file diff --git a/source/androidx.fragment/fragment/Transforms/Metadata.Namespaces.xml b/source/androidx.fragment/fragment/Transforms/Metadata.Namespaces.xml index b9085cff7..615d92940 100644 --- a/source/androidx.fragment/fragment/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.fragment/fragment/Transforms/Metadata.Namespaces.xml @@ -8,4 +8,11 @@ --> AndroidX.Fragment.App + + + AndroidX.Fragment.App.StrictMode + \ No newline at end of file diff --git a/source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs b/source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs new file mode 100644 index 000000000..d44eff0e9 --- /dev/null +++ b/source/androidx.resourceinspection/resourceinspection-annotation/Additions/Additions.cs @@ -0,0 +1,4 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; diff --git a/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.Namespaces.xml b/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..cceb61026 --- /dev/null +++ b/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,9 @@ + + + AndroidX.ResourceInspection.Annotation + + + \ No newline at end of file diff --git a/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.xml b/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.xml new file mode 100644 index 000000000..13a3d38c7 --- /dev/null +++ b/source/androidx.resourceinspection/resourceinspection-annotation/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props index 061f63c47..f20ef35e1 100644 --- a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props +++ b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props @@ -248,6 +248,8 @@ <_AndroidXMavenArtifact Include="androidx.emoji.emoji" /> <_AndroidXMavenArtifact Include="androidx.emoji.emoji-appcompat" /> <_AndroidXMavenArtifact Include="androidx.emoji.emoji-bundled" /> + <_AndroidXMavenArtifact Include="androidx.emoji2.emoji2" /> + <_AndroidXMavenArtifact Include="androidx.emoji2.emoji2-views-helper" /> <_AndroidXMavenArtifact Include="androidx.exifinterface.exifinterface" /> <_AndroidXMavenArtifact Include="androidx.fragment.fragment" /> <_AndroidXMavenArtifact Include="androidx.fragment.fragment-ktx" /> @@ -309,6 +311,7 @@ <_AndroidXMavenArtifact Include="androidx.recommendation.recommendation" /> <_AndroidXMavenArtifact Include="androidx.recyclerview.recyclerview" /> <_AndroidXMavenArtifact Include="androidx.recyclerview.recyclerview-selection" /> + <_AndroidXMavenArtifact Include="androidx.resourceinspection.resourceinspection-annotation" /> <_AndroidXMavenArtifact Include="androidx.room.room-common" /> <_AndroidXMavenArtifact Include="androidx.room.room-guava" /> <_AndroidXMavenArtifact Include="androidx.room.room-ktx" /> From ebf531ea3e2456d32558d6aaff5019f72d5433c8 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 3 Dec 2021 17:26:38 +0100 Subject: [PATCH 04/25] unit tests fixes --- tests/AndroidXMigrationTests/Tests/DependenciesTests.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs index 49662acca..0c9c1054f 100644 --- a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs +++ b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs @@ -279,11 +279,14 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.ConstraintLayout.Core", "Xamarin.AndroidX.CoordinatorLayout", "Xamarin.AndroidX.Core", + "Xamarin.AndroidX.Core.Core.Ktx", "Xamarin.AndroidX.CursorAdapter", "Xamarin.AndroidX.CustomView", "Xamarin.AndroidX.DocumentFile", "Xamarin.AndroidX.DrawerLayout", "Xamarin.AndroidX.DynamicAnimation", + "Xamarin.AndroidX.Emoji2", + "Xamarin.AndroidX.Emoji2.ViewsHelper", "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.Interpolator", "Xamarin.AndroidX.Legacy.Support.Core.UI", @@ -291,6 +294,7 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.Legacy.Support.V4", "Xamarin.AndroidX.Lifecycle.Common", "Xamarin.AndroidX.Lifecycle.LiveData.Core", + "Xamarin.AndroidX.Lifecycle.Process", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.Lifecycle.ViewModel", "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", @@ -301,8 +305,10 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.MultiDex", "Xamarin.AndroidX.Print", "Xamarin.AndroidX.RecyclerView", + "Xamarin.AndroidX.ResourceInspection.Annotation", "Xamarin.AndroidX.SavedState", "Xamarin.AndroidX.SlidingPaneLayout", + "Xamarin.AndroidX.Startup.StartupRuntime", "Xamarin.AndroidX.SwipeRefreshLayout", "Xamarin.AndroidX.Tracing.Tracing", "Xamarin.AndroidX.Transition", From b9a0f4cd78e39aee745df04e6bab3a9850179c16 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 3 Dec 2021 21:35:44 +0100 Subject: [PATCH 05/25] Update utilities.cake --- utilities.cake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utilities.cake b/utilities.cake index 5bfe72b30..014761096 100644 --- a/utilities.cake +++ b/utilities.cake @@ -201,6 +201,9 @@ Task ("spell-check") "Tink", "PhoneInteractions", "RemoteInteractions", + "Emoji2", + "ViewsHelper", + "ResourceInspection", }; var dictionary_custom = WeCantSpell.Hunspell.WordList.CreateFromWords(words); From 8355b0c42399aaa89ecb9c551a4f81f8cf2a3d30 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 3 Dec 2021 21:35:48 +0100 Subject: [PATCH 06/25] Update dependencies.json --- mappings/dependencies.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mappings/dependencies.json b/mappings/dependencies.json index f29ec5e3d..5e3eee06d 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1149,10 +1149,6 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From 8479065c721fa35ddd42525cb0f93b2ef747f6c0 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 13 Dec 2021 14:25:20 +0100 Subject: [PATCH 07/25] mappings updates --- mappings/androidx-assemblies.csv | 142 +++++++++++++++---------------- mappings/dependencies.json | 4 + 2 files changed, 75 insertions(+), 71 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 4c75ca943..389a171c8 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -1,84 +1,84 @@ 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.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.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.Core.Common,Xamarin.AndroidX.Arch.Core.Common,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,2.1.0.12 +Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.12 +Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.0.1 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.11 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.0.1 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.0.1 +Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.0.1 +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.1 +Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.0.1 +Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.0.1 +Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.11 +Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.11 +Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.0.3 +Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,2.3.0.5 +Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,2.3.0.5 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.2 +Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,1.1.0.11 +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.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.AndroidX.Media2.Widget,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,1.2.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.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.11 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.7.0 +Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.7.0.1 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 -Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,2.0.4.5 -Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,1.1.0.10 -Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.11 -Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,1.0.0.10 -Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,1.0.0.10 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingAdapters,7.0.3.1 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.0.3.1 +Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,7.0.3.1 +Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,2.0.4.6 +Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,1.1.0.11 +Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.12 +Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,1.0.0.11 +Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,1.0.0.11 Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.4.0 -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.2 +Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.10 +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.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.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.1.0.4 +Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.4.0.5 Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.6.0 -Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.10 -Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.5 -Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.10 -Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,1.1.0.5 -Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,1.1.0.5 -Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,1.1.0.5 -Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,1.3.3.2 +Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.11 +Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.6 +Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.11 +Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,1.1.0.6 +Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,1.1.0.6 +Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,1.1.0.6 +Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,1.3.3.3 Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.4.0 -Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,1.0.0.10 -Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,1.0.0.10 -Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,1.1.0.10 -Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,1.0.0.10 -Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,1.4.3 -Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,2.0.1.10 -Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,1.0.0.11 -Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,1.0.0.10 -Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,1.0.0.10 -Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,1.1.0.4 -Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,1.0.0.10 -Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,1.0.0.10 -Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,1.0.0.10 -Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,1.1.0.5 -Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,1.1.0.5 -Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,1.4.1.3 -Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,1.0.0.12 -Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,1.0.0.10 -Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,1.0.0.12 -Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,1.0.0.10 -Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,1.0.0.10 +Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,1.0.0.11 +Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,1.0.0.11 +Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,1.1.0.11 +Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,1.0.0.11 +Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,1.4.3.1 +Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,2.0.1.11 +Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,1.0.0.12 +Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,1.0.0.11 +Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,1.0.0.11 +Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,1.1.0.5 +Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,1.0.0.11 +Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,1.0.0.11 +Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,1.0.0.11 +Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,1.1.0.6 +Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,1.1.0.6 +Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,1.4.1.4 +Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,1.0.0.13 +Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,1.0.0.11 +Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,1.0.0.13 +Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,1.0.0.11 +Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,1.0.0.11 Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,1.4.0 Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,1.4.0 -Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,1.0.0.11 -Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,1.0.0.10 -Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,1.2.5.2 -Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,1.0.0.10 -Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,1.1.1.11 -Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,1.2.1.3 -Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,1.1.0.10 -Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,1.1.1.10 -Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,1.0.0.10 -Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,1.2.0.2 -Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,1.4.0.4 +Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,1.0.0.12 +Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,1.0.0.11 +Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,1.2.5.3 +Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,Xamarin.Android.Support.v7.Palette,Xamarin.AndroidX.Palette,1.0.0.11 +Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,Xamarin.Android.Support.v7.Preference,Xamarin.AndroidX.Preference,1.1.1.12 +Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,Xamarin.Android.Support.v7.RecyclerView,Xamarin.AndroidX.RecyclerView,1.2.1.4 +Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,Xamarin.Android.Support.Vector.Drawable,Xamarin.AndroidX.VectorDrawable,1.1.0.11 +Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,Xamarin.Android.Support.VersionedParcelable,Xamarin.AndroidX.VersionedParcelable,1.1.1.11 +Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,Xamarin.Android.Support.ViewPager,Xamarin.AndroidX.ViewPager,1.0.0.11 +Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,1.2.0.3 +Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,Xamarin.Android.Support.WebKit,Xamarin.AndroidX.WebKit,1.4.0.5 diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 5e3eee06d..f29ec5e3d 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1149,6 +1149,10 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, + { + "id": "Xamarin.AndroidX.Migration.Tool", + "dependencies": [] + }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From 737b575a86bff5ffaeb45dfec5130f81806a4f3f Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 13 Dec 2021 14:26:42 +0100 Subject: [PATCH 08/25] removed apis collection and open in editor --- utilities.cake | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/utilities.cake b/utilities.cake index 014761096..40fe2adea 100644 --- a/utilities.cake +++ b/utilities.cake @@ -7,6 +7,8 @@ #addin nuget:?package=Newtonsoft.Json&version=12.0.3 #addin nuget:?package=Cake.FileHelpers&version=3.2.1 +using System.Collections.Generic; + using Newtonsoft.Json; using Newtonsoft.Json.Linq; @@ -269,6 +271,8 @@ Task ("namespace-check") FilePath[] files_org = GetFiles("./generated/**/Org.*.cs").ToArray(); FilePath[] files_io_1 = GetFiles("./generated/**/Io.*.cs").ToArray(); FilePath[] files_io_2 = GetFiles("./generated/**/IO.*.cs").ToArray(); + FilePath[] files_net = GetFiles("./generated/**/Net.*.cs").ToArray(); + FilePath[] files_kotlin = GetFiles("./generated/**/Kotlin*.cs").ToArray(); FilePath[] files_kotlinx = GetFiles("./generated/**/Kotlinx*.cs").ToArray(); files = files.Concat(files_androidx.ToArray()).ToArray(); @@ -467,6 +471,7 @@ Task ("api-diff-analysis") DirectoryPathCollection directories = GetSubDirectories("./output/api-diff"); Dictionary nugets_modified = new Dictionary(); + Dictionary api_changes_breaking_removed = new Dictionary(); foreach(DirectoryPath d in directories) { @@ -499,7 +504,39 @@ Task ("api-diff-analysis") } } - string[] lines = nugets_modified.Select(kv => kv.Key + Environment.NewLine + "\t" + kv.Value).ToArray(); + FilePathCollection files = GetFiles(@"./output/api-diff/**/*.dll.breaking.md"); + List commands = new List(); + + foreach(FilePath f in files) + { + Information($"file = {f}"); + + string[] lines_in_file = System.IO.File.ReadAllLines(f.ToString()); + List line_numbers = new List(); + + for(int i=0; i pair1.Value.CompareTo(pair2.Value)); + + string[] lines = nugets_modified_ordered + .Select(kv => $"- {kv.Value}" + Environment.NewLine + "\t - " + kv.Key) + .ToArray(); System.IO.File.WriteAllLines("./output/nugets-with-changed-APIs.md", lines); return; @@ -526,6 +563,7 @@ Task ("read-analysis-files") "./output/missing_dotnet_type.csv", "./output/missing_java_type.csv", "./output/nugets-with-changed-APIs.md", + "./output/commands-open-file.sh", }; if ( ! FileExists("./output/spell-errors.txt") ) From e69008f23e39602e3e70c52340aff3256f201f2e Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 16 Dec 2021 08:38:32 +0100 Subject: [PATCH 09/25] Update dependencies.json --- mappings/dependencies.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mappings/dependencies.json b/mappings/dependencies.json index f29ec5e3d..5e3eee06d 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1149,10 +1149,6 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From c1c875ec9f6be4b479ea7ee23c82529cd880b1eb Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 17 Dec 2021 15:57:10 +0100 Subject: [PATCH 10/25] Update dependencies.json --- mappings/dependencies.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 5e3eee06d..f29ec5e3d 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1149,6 +1149,10 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, + { + "id": "Xamarin.AndroidX.Migration.Tool", + "dependencies": [] + }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From c1a12aedb9ff3b1e4b3063bb15f6a64981d01ae5 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 19 Dec 2021 22:00:28 +0100 Subject: [PATCH 11/25] downgraded artifacts that target SDK 31 --- config.json | 96 ++++++++++++++++++++++++++--------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/config.json b/config.json index 8dee62e41..69c7f36cf 100644 --- a/config.json +++ b/config.json @@ -29,16 +29,16 @@ { "groupId": "androidx.activity", "artifactId": "activity", - "version": "1.4.0", - "nugetVersion": "1.4.0.1", + "version": "1.3.1", + "nugetVersion": "1.3.1.3", "nugetId": "Xamarin.AndroidX.Activity", "dependencyOnly": false }, { "groupId": "androidx.activity", "artifactId": "activity-ktx", - "version": "1.4.0", - "nugetVersion": "1.4.0.1", + "version": "1.3.1", + "nugetVersion": "1.3.1.3", "nugetId": "Xamarin.AndroidX.Activity.Ktx", "dependencyOnly": false }, @@ -85,16 +85,16 @@ { "groupId": "androidx.appcompat", "artifactId": "appcompat", - "version": "1.4.0", - "nugetVersion": "1.4.0", + "version": "1.3.1", + "nugetVersion": "1.3.1.3", "nugetId": "Xamarin.AndroidX.AppCompat", "dependencyOnly": false }, { "groupId": "androidx.appcompat", "artifactId": "appcompat-resources", - "version": "1.4.0", - "nugetVersion": "1.4.0", + "version": "1.3.1", + "nugetVersion": "1.3.1.3", "nugetId": "Xamarin.AndroidX.AppCompat.AppCompatResources", "dependencyOnly": false }, @@ -141,8 +141,8 @@ { "groupId": "androidx.browser", "artifactId": "browser", - "version": "1.4.0", - "nugetVersion": "1.4.0", + "version": "1.3.0", + "nugetVersion": "1.3.0.9", "nugetId": "Xamarin.AndroidX.Browser", "dependencyOnly": false }, @@ -421,8 +421,8 @@ { "groupId": "androidx.core", "artifactId": "core", - "version": "1.7.0", - "nugetVersion": "1.7.0.1", + "version": "1.6.0", + "nugetVersion": "1.6.0.4", "nugetId": "Xamarin.AndroidX.Core", "dependencyOnly": false }, @@ -445,8 +445,8 @@ { "groupId": "androidx.core", "artifactId": "core-ktx", - "version": "1.7.0", - "nugetVersion": "1.7.0.1", + "version": "1.6.0", + "nugetVersion": "1.6.0.4", "nugetId": "Xamarin.AndroidX.Core.Core.Ktx", "dependencyOnly": false }, @@ -589,16 +589,16 @@ { "groupId": "androidx.fragment", "artifactId": "fragment", - "version": "1.4.0", - "nugetVersion": "1.4.0", + "version": "1.3.6", + "nugetVersion": "1.3.6.4", "nugetId": "Xamarin.AndroidX.Fragment", "dependencyOnly": false }, { "groupId": "androidx.fragment", "artifactId": "fragment-ktx", - "version": "1.4.0", - "nugetVersion": "1.4.0", + "version": "1.3.6", + "nugetVersion": "1.3.6.4", "nugetId": "Xamarin.AndroidX.Fragment.Ktx", "dependencyOnly": false }, @@ -685,16 +685,16 @@ { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.Common", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common-java8", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.Common.Java8", "dependencyOnly": false }, @@ -709,104 +709,104 @@ { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core-ktx", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-ktx", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-process", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.Process", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams-ktx", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime-ktx", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-service", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.Service", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-ktx", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-savedstate", - "version": "2.4.0", - "nugetVersion": "2.4.0.1", + "version": "2.3.1", + "nugetVersion": "2.3.1.4", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "dependencyOnly": false }, From 845a731c31c5067377d51ba47205f6d20ed5f905 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 19 Dec 2021 22:01:09 +0100 Subject: [PATCH 12/25] parsing pom and AndroidManifest.xml to detect targetSDKVersion --- utilities.cake | 151 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) diff --git a/utilities.cake b/utilities.cake index 40fe2adea..104c96f5a 100644 --- a/utilities.cake +++ b/utilities.cake @@ -320,6 +320,156 @@ Task("binderate-diff") } ); +void RunProcess(FilePath file, string args) +{ + int exit_code = StartProcess(file, args); + if (exit_code != 0) + { + throw new Exception ($"Process {file} exited with code {exit_code}."); + } + + return; +} + +System.Xml.XmlDocument xmldoc = null; +System.Xml.XmlNamespaceManager nsmgr = null; + +Task ("target-sdk-version-check") + .Does + ( + () => + { + FilePath config_file = MakeAbsolute(new FilePath("./config.json")).FullPath; + DirectoryPath base_path = MakeAbsolute(new DirectoryPath ("./")).FullPath; + + // Run the dotnet tool for binderator + RunProcess + ( + "xamarin-android-binderator", + $"--config=\"{config_file}\" --basepath=\"{base_path}\"" + ); + + Dictionary<(string group, string artifact), int> artifacts_target_sdk = null; + Dictionary<(string group, string artifact), string> artifacts_versions = null; + Parallel.Invoke + ( + () => + { + FilePath[] files_android_manifests = GetFiles("./externals/**/AndroidManifest.xml").ToArray(); + foreach(FilePath fp in files_android_manifests) + { + Information($"files_android_manifest = {fp}"); + } + + artifacts_target_sdk = new Dictionary<(string group, string artifact), int>(); + + string xpath_expression_nodes_to_find = + $@"/manifest/uses-sdk/@android:targetSdkVersion" + ; + + + foreach(FilePath fp in files_android_manifests) + { + Information($" AndroidManifest = {fp}"); + xmldoc = new System.Xml.XmlDocument(); + xmldoc.Load(fp.ToString()); + + nsmgr = new System.Xml.XmlNamespaceManager(xmldoc.NameTable); + nsmgr.AddNamespace("android", "http://schemas.android.com/apk/res/android"); + + string t = xmldoc.SelectSingleNode(xpath_expression_nodes_to_find, nsmgr)?.Value; + + string[] path_parts = fp + .ToString() + .Split + ( + new char[]{ '/' }, + System.StringSplitOptions.None + ); + + string a = path_parts[path_parts.Length - 2]; + string g = path_parts[path_parts.Length - 3]; + + Information($" artifact = {g}:{a} - SDK {t}"); + int t_sdk; + bool ok = int.TryParse(t, out t_sdk); + if (ok) + { + artifacts_target_sdk.Add((g,a), t_sdk); + } + } + + return; + }, + () => + { + FilePath[] files_poms = GetFiles("./externals/**/*.pom").ToArray(); + foreach(FilePath fp in files_poms) + { + Information($"files_android_pom = {fp}"); + } + + artifacts_versions = new Dictionary<(string group, string artifact), string>(); + + + foreach(FilePath fp in files_poms) + { + Information($" pom.xml = {fp}"); + xmldoc = new System.Xml.XmlDocument(); + xmldoc.Load(fp.ToString()); + + nsmgr = new System.Xml.XmlNamespaceManager(xmldoc.NameTable); + nsmgr.AddNamespace("pom", "http://maven.apache.org/POM/4.0.0"); + + string v = xmldoc.SelectSingleNode($@"/pom:project/pom:version", nsmgr)?.InnerText; + Information($" version = {v}"); + if ( v == null ) + { + v = xmldoc.SelectSingleNode($@"/pom:project/pom:parent/pom:version", nsmgr)?.InnerText; + } + + string g = xmldoc.SelectSingleNode($@"/pom:project/pom:groupId", nsmgr)?.InnerText; + if ( g == null ) + { + g = xmldoc.SelectSingleNode($@"/pom:project/pom:parent/pom:groupId", nsmgr)?.InnerText; + } + Information($" groupId = {g}"); + + string a = xmldoc.SelectSingleNode($@"/pom:project/pom:artifactId", nsmgr)?.InnerText; + Information($" artifactId = {a}"); + + artifacts_versions.Add((g, a), v); + } + return; + } + ); + + Dictionary<(string group, string artifact), (string version, int sdk)> artifact_fq_sdk; + artifact_fq_sdk = new Dictionary<(string group, string artifact), (string version, int sdk)>(); + + foreach (KeyValuePair<(string group, string artifact), int> ga in artifacts_target_sdk) + { + int t_sdk = ga.Value; + string v = artifacts_versions[ga.Key]; + + artifact_fq_sdk.Add((ga.Key.group, ga.Key.artifact), (v, t_sdk)); + } + + List log_artifacts_sdk_targets = new List(); + + foreach (KeyValuePair<(string g, string a), (string v, int sdk)> ga in artifact_fq_sdk) + { + string log = $"{ga.Key.g}.{ga.Key.a}:{ga.Value.v} - SDK {ga.Value.sdk}"; + Information(log); + log_artifacts_sdk_targets.Add(log); + } + + System.IO.File.WriteAllLines("./output/artifacts_sdk_targets.md", log_artifacts_sdk_targets.ToArray()); + + return; + } + ); + Task ("api-diff-markdown-info-pr") .IsDependentOn("binderate-diff") .Does @@ -564,6 +714,7 @@ Task ("read-analysis-files") "./output/missing_java_type.csv", "./output/nugets-with-changed-APIs.md", "./output/commands-open-file.sh", + "./output/artifacts_sdk_targets.md", }; if ( ! FileExists("./output/spell-errors.txt") ) From 670a598372731ed6127eadeb4f850ec62941c47f Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 21 Dec 2021 10:10:55 +0100 Subject: [PATCH 13/25] azure-pipelines.yml version bumps --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3b09d36bf..f49215a57 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -6,9 +6,9 @@ pr: - main variables: - AndroidBinderatorVersion: 0.5.2 + AndroidBinderatorVersion: 0.5.3 AndroidXMigrationVersion: 1.0.8 - DotNetVersion: 6.0.100 + DotNetVersion: 6.0.101 DotNet6Source: https://aka.ms/dotnet6/nuget/index.json NuGetOrgSource: https://api.nuget.org/v3/index.json LegacyXamarinAndroidPkg: https://aka.ms/xamarin-android-commercial-d17-0-macos From 11f2a1068bbb8da548f9a3f03339491b62587f30 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 24 Dec 2021 10:09:04 +0100 Subject: [PATCH 14/25] targetSDKversion and minCompileSDK analysis --- utilities.cake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/utilities.cake b/utilities.cake index 104c96f5a..b9c78dfb9 100644 --- a/utilities.cake +++ b/utilities.cake @@ -363,11 +363,6 @@ Task ("target-sdk-version-check") artifacts_target_sdk = new Dictionary<(string group, string artifact), int>(); - string xpath_expression_nodes_to_find = - $@"/manifest/uses-sdk/@android:targetSdkVersion" - ; - - foreach(FilePath fp in files_android_manifests) { Information($" AndroidManifest = {fp}"); @@ -377,7 +372,8 @@ Task ("target-sdk-version-check") nsmgr = new System.Xml.XmlNamespaceManager(xmldoc.NameTable); nsmgr.AddNamespace("android", "http://schemas.android.com/apk/res/android"); - string t = xmldoc.SelectSingleNode(xpath_expression_nodes_to_find, nsmgr)?.Value; + string t = xmldoc.SelectSingleNode($@"/manifest/uses-sdk/@android:targetSdkVersion", nsmgr)?.Value; + string mc = xmldoc.SelectSingleNode($@"/manifest/uses-sdk/@android:minCompileSdk", nsmgr)?.Value; string[] path_parts = fp .ToString() @@ -390,7 +386,7 @@ Task ("target-sdk-version-check") string a = path_parts[path_parts.Length - 2]; string g = path_parts[path_parts.Length - 3]; - Information($" artifact = {g}:{a} - SDK {t}"); + Information($" artifact = {g}:{a} - target SDK version = {t} min compile SDK = {mc}"); int t_sdk; bool ok = int.TryParse(t, out t_sdk); if (ok) From 9e1332e3e88505a3c05c5a609e0a8d4ae0435a58 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 3 Jan 2022 13:46:18 +0100 Subject: [PATCH 15/25] Update config.json --- config.json | 1 + 1 file changed, 1 insertion(+) diff --git a/config.json b/config.json index 69c7f36cf..fb51f6501 100644 --- a/config.json +++ b/config.json @@ -560,6 +560,7 @@ "version": "1.0.0", "nugetVersion": "1.0.0", "nugetId": "Xamarin.AndroidX.Emoji2", + "excludedRuntimeDependencies": "androidx.lifecycle.lifecycle-process", "dependencyOnly": false }, { From 7a8007bb231d8b08a3afbe8edcd193ac5fb939b6 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 3 Jan 2022 13:46:31 +0100 Subject: [PATCH 16/25] mappings updates --- mappings/androidx-assemblies.csv | 24 ++++++------- mappings/androidx-mapping.csv | 2 +- mappings/dependencies.json | 60 ++++++++++++++++---------------- 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 389a171c8..4ab78697a 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -1,14 +1,14 @@ 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.12 Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.12 -Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.4.0.1 +Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,Xamarin.Android.Arch.Lifecycle.Common,Xamarin.AndroidX.Lifecycle.Common,2.3.1.4 Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.11 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.4.0.1 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.4.0.1 -Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.4.0.1 -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.1 -Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,2.4.0.1 -Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.4.0.1 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,2.3.1.4 +Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.3.1.4 +Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.3.1.4 +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.4 +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.4 Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.11 Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.11 Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.0.3 @@ -23,7 +23,7 @@ Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Andro 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.11 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.7.0.1 +Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0.4 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.1 Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.0.3.1 @@ -33,7 +33,7 @@ Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xam Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.12 Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,1.0.0.11 Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,1.0.0.11 -Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.4.0 +Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.3.0.9 Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.10 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.3 @@ -47,7 +47,7 @@ Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,Xamarin.Android.Support.Emo Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,1.1.0.6 Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,1.1.0.6 Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,1.3.3.3 -Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.4.0 +Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.3.6.4 Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,1.0.0.11 Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,1.0.0.11 Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,1.1.0.11 @@ -69,8 +69,8 @@ Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,Xamarin.Android. Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,1.0.0.13 Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,1.0.0.11 Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,1.0.0.11 -Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,1.4.0 -Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,1.4.0 +Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat,1.3.1.3 +Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,Xamarin.Android.Support.v7.AppCompat,Xamarin.AndroidX.AppCompat.AppCompatResources,1.3.1.3 Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,Xamarin.Android.Support.v7.CardView,Xamarin.AndroidX.CardView,1.0.0.12 Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,Xamarin.Android.Support.v7.GridLayout,Xamarin.AndroidX.GridLayout,1.0.0.11 Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,Xamarin.Android.Support.v7.MediaRouter,Xamarin.AndroidX.MediaRouter,1.2.5.3 diff --git a/mappings/androidx-mapping.csv b/mappings/androidx-mapping.csv index 1ed9a67f5..07e4ae72f 100644 --- a/mappings/androidx-mapping.csv +++ b/mappings/androidx-mapping.csv @@ -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. -,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.lifecycle.ProcessLifecycleOwnerInitializer. +Android.Arch.Lifecycle,ProcessLifecycleOwnerInitializer,AndroidX.Lifecycle,ProcessLifecycleOwnerInitializer,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Process,android.arch.lifecycle,ProcessLifecycleOwnerInitializer,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, diff --git a/mappings/dependencies.json b/mappings/dependencies.json index f29ec5e3d..f2dd7e781 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -52,9 +52,9 @@ "Xamarin.AndroidX.Annotation.Experimental", "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", - "Xamarin.AndroidX.Concurrent.Futures", "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.AndroidX.VersionedParcelable" + "Xamarin.AndroidX.VersionedParcelable", + "Xamarin.AndroidX.Concurrent.Futures" ] }, { @@ -207,13 +207,13 @@ "Xamarin.AndroidX.Core", "Xamarin.AndroidX.CursorAdapter", "Xamarin.AndroidX.DrawerLayout", - "Xamarin.AndroidX.Emoji2.ViewsHelper", - "Xamarin.AndroidX.Emoji2", "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.Lifecycle.ViewModel", - "Xamarin.AndroidX.ResourceInspection.Annotation", - "Xamarin.AndroidX.SavedState" + "Xamarin.AndroidX.SavedState", + "Xamarin.AndroidX.Emoji2.ViewsHelper", + "Xamarin.AndroidX.Emoji2", + "Xamarin.AndroidX.ResourceInspection.Annotation" ] }, { @@ -241,38 +241,38 @@ ] }, { - "id": "Xamarin.AndroidX.Emoji2.ViewsHelper", + "id": "Xamarin.AndroidX.Fragment", "dependencies": [ + "Xamarin.AndroidX.Activity", + "Xamarin.AndroidX.Annotation.Experimental", + "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Core", - "Xamarin.AndroidX.Emoji2" + "Xamarin.AndroidX.Lifecycle.LiveData.Core", + "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", + "Xamarin.AndroidX.Lifecycle.ViewModel", + "Xamarin.AndroidX.Loader", + "Xamarin.AndroidX.SavedState", + "Xamarin.AndroidX.ViewPager", + "Xamarin.AndroidX.Core.Core.Ktx", + "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Emoji2", + "id": "Xamarin.AndroidX.Emoji2.ViewsHelper", "dependencies": [ - "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Core", - "Xamarin.AndroidX.Lifecycle.Process", - "Xamarin.AndroidX.Startup.StartupRuntime" + "Xamarin.AndroidX.Emoji2" ] }, { - "id": "Xamarin.AndroidX.Fragment", + "id": "Xamarin.AndroidX.Emoji2", "dependencies": [ - "Xamarin.AndroidX.Activity", - "Xamarin.AndroidX.Annotation.Experimental", "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", - "Xamarin.AndroidX.Core.Core.Ktx", - "Xamarin.AndroidX.Lifecycle.LiveData.Core", - "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", - "Xamarin.AndroidX.Lifecycle.ViewModel", - "Xamarin.AndroidX.Loader", - "Xamarin.AndroidX.SavedState", - "Xamarin.AndroidX.ViewPager", - "Xamarin.Kotlin.StdLib" + "Xamarin.AndroidX.Core", + "Xamarin.AndroidX.Startup.StartupRuntime" ] }, { @@ -911,13 +911,6 @@ "Xamarin.AndroidX.Emoji" ] }, - { - "id": "Xamarin.AndroidX.Lifecycle.Process", - "dependencies": [ - "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.AndroidX.Startup.StartupRuntime" - ] - }, { "id": "Xamarin.AndroidX.Startup.StartupRuntime", "dependencies": [ @@ -1066,6 +1059,13 @@ "Xamarin.AndroidX.Lifecycle.ViewModel" ] }, + { + "id": "Xamarin.AndroidX.Lifecycle.Process", + "dependencies": [ + "Xamarin.AndroidX.Lifecycle.Runtime", + "Xamarin.AndroidX.Startup.StartupRuntime" + ] + }, { "id": "Xamarin.AndroidX.Lifecycle.Service", "dependencies": [ From 7961c8ae33103654147c6c2410d03a4ddcc3e807 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 25 Jan 2022 20:14:16 +0100 Subject: [PATCH 17/25] unit tests fixes --- tests/AndroidXMigrationTests/Tests/DependenciesTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs index 0545e2894..eee5855e4 100644 --- a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs +++ b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs @@ -279,7 +279,7 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.Legacy.Support.V4", "Xamarin.AndroidX.Lifecycle.Common", "Xamarin.AndroidX.Lifecycle.LiveData.Core", - "Xamarin.AndroidX.Lifecycle.Process", + //"Xamarin.AndroidX.Lifecycle.Process", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.Lifecycle.ViewModel", "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", @@ -302,6 +302,9 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.ViewPager2", "Xamarin.Google.Android.Material", "Xamarin.Google.Guava.ListenableFuture", + "Xamarin.Jetbrains.Annotations", + "Xamarin.Kotlin.StdLib", + "Xamarin.Kotlin.StdLib.Common", }; var tree = PackageDependencyTree.Load(); From 7b14e4bb70cc248a22e0201371fcd41b1f287a58 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 25 Jan 2022 20:14:27 +0100 Subject: [PATCH 18/25] mappings updatesa --- mappings/androidx-assemblies.csv | 94 ++++---------------------------- mappings/dependencies.json | 36 ++++++------ 2 files changed, 31 insertions(+), 99 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 9e1d8593e..008559010 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -1,100 +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.12 -Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,Xamarin.Android.Arch.Core.Runtime,Xamarin.AndroidX.Arch.Core.Runtime,2.1.0.12 +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.4 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Extensions,2.2.0.11 +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.4 Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.3.1.4 Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.3.1.4 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.4 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.4 -Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.11 -Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.11 -Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.2.0.3 -Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,2.3.0.5 -Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,2.3.0.5 -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.11 -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.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.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.11 -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.4 -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.1 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.DataBindingRuntime,7.0.3.1 -Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,Xamarin.Android.Support.Constraint.Layout,Xamarin.AndroidX.DataBinding.ViewBinding,7.0.3.1 -Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,Xamarin.Android.Support.Constraint.Layout.Solver,Xamarin.AndroidX.ConstraintLayout.Solver,2.0.4.6 -Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,Xamarin.Android.Support.CoordinaterLayout,Xamarin.AndroidX.CoordinatorLayout,1.1.0.11 -Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,Xamarin.Android.Support.Core.UI,Xamarin.AndroidX.Legacy.Support.Core.UI,1.0.0.12 -Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,1.0.0.11 -Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,Xamarin.Android.Support.CursorAdapter,Xamarin.AndroidX.CursorAdapter,1.0.0.11 -Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,1.3.0.9 -Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.10 -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.3 -Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.1.0.4 -Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.4.0.5 -Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.6.0 -Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.11 -Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.6 -Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.11 -Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,Xamarin.Android.Support.Emoji,Xamarin.AndroidX.Emoji,1.1.0.6 -Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,Xamarin.Android.Support.Emoji.AppCompat,Xamarin.AndroidX.Emoji.AppCompat,1.1.0.6 -Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,Xamarin.Android.Support.Emoji.Bundled,Xamarin.AndroidX.Emoji.Bundled,1.1.0.6 -Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,Xamarin.Android.Support.Exif,Xamarin.AndroidX.ExifInterface,1.3.3.3 -Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,Xamarin.Android.Support.Fragment,Xamarin.AndroidX.Fragment,1.3.6.4 -Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,Xamarin.Android.Support.HeifWriter,Xamarin.AndroidX.HeifWriter,1.0.0.11 -Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,Xamarin.Android.Support.Interpolator,Xamarin.AndroidX.Interpolator,1.0.0.11 -Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,Xamarin.Android.Support.Loader,Xamarin.AndroidX.Loader,1.1.0.11 -Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,Xamarin.Android.Support.LocalBroadcastManager,Xamarin.AndroidX.LocalBroadcastManager,1.0.0.11 -Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,Xamarin.Android.Support.Media.Compat,Xamarin.AndroidX.Media,1.4.3.1 -Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,Xamarin.Android.Support.MultiDex,Xamarin.AndroidX.MultiDex,2.0.1.11 -Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,Xamarin.Android.Support.Percent,Xamarin.AndroidX.PercentLayout,1.0.0.12 -Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,Xamarin.Android.Support.Print,Xamarin.AndroidX.Print,1.0.0.11 -Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,Xamarin.Android.Support.Recommendation,Xamarin.AndroidX.Recommendation,1.0.0.11 -Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,Xamarin.Android.Support.RecyclerView.Selection,Xamarin.AndroidX.RecyclerView.Selection,1.1.0.5 -Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,Xamarin.Android.Support.Slices.Builders,Xamarin.AndroidX.Slice.Builders,1.0.0.11 -Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,Xamarin.Android.Support.Slices.Core,Xamarin.AndroidX.Slice.Core,1.0.0.11 -Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,Xamarin.Android.Support.Slices.View,Xamarin.AndroidX.Slice.View,1.0.0.11 -Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,Xamarin.Android.Support.SlidingPaneLayout,Xamarin.AndroidX.SlidingPaneLayout,1.1.0.6 -Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,Xamarin.Android.Support.SwipeRefreshLayout,Xamarin.AndroidX.SwipeRefreshLayout,1.1.0.6 -Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,Xamarin.Android.Support.Transition,Xamarin.AndroidX.Transition,1.4.1.4 -Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,Xamarin.Android.Support.TV.Provider,Xamarin.AndroidX.TvProvider,1.0.0.13 -Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,Xamarin.Android.Support.v13,Xamarin.AndroidX.Legacy.Support.V13,1.0.0.11 -Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,Xamarin.Android.Support.v17.Leanback,Xamarin.AndroidX.Leanback,1.0.0.13 -Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,Xamarin.Android.Support.v17.Preference.Leanback,Xamarin.AndroidX.Leanback.Preference,1.0.0.11 -Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,Xamarin.Android.Support.v4,Xamarin.AndroidX.Legacy.Support.V4,1.0.0.11 -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.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.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.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.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.4 +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 @@ -106,10 +36,10 @@ 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 +Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.6.0 Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.10 Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.5 Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.10 diff --git a/mappings/dependencies.json b/mappings/dependencies.json index f0fbc6f5c..ac23a1c72 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -30,7 +30,8 @@ "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "Xamarin.AndroidX.Lifecycle.ViewModel", "Xamarin.AndroidX.SavedState", - "Xamarin.AndroidX.Tracing.Tracing" + "Xamarin.AndroidX.Tracing.Tracing", + "Xamarin.Kotlin.StdLib" ] }, { @@ -75,7 +76,8 @@ { "id": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencies": [ - "Xamarin.AndroidX.Annotation" + "Xamarin.AndroidX.Annotation", + "Xamarin.Kotlin.StdLib" ] }, { @@ -92,6 +94,13 @@ "Xamarin.AndroidX.Annotation" ] }, + { + "id": "Xamarin.Kotlin.StdLib", + "dependencies": [ + "Xamarin.Jetbrains.Annotations", + "Xamarin.Kotlin.StdLib.Common" + ] + }, { "id": "Xamarin.AndroidX.Activity.Ktx", "dependencies": [ @@ -135,13 +144,6 @@ "Xamarin.Kotlin.StdLib" ] }, - { - "id": "Xamarin.Kotlin.StdLib", - "dependencies": [ - "Xamarin.Jetbrains.Annotations", - "Xamarin.Kotlin.StdLib.Common" - ] - }, { "id": "Xamarin.AndroidX.Ads.Identifier", "dependencies": [ @@ -1052,7 +1054,8 @@ { "id": "Xamarin.AndroidX.Lifecycle.Process", "dependencies": [ - "Xamarin.AndroidX.Lifecycle.Runtime" + "Xamarin.AndroidX.Lifecycle.Runtime", + "Xamarin.AndroidX.Startup.StartupRuntime" ] }, { @@ -1134,6 +1137,12 @@ "Xamarin.Google.Guava.ListenableFuture" ] }, + { + "id": "Xamarin.AndroidX.Migration", + "dependencies": [ + "Xamarin.AndroidX.MultiDex" + ] + }, { "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] @@ -1308,13 +1317,6 @@ "Xamarin.Kotlin.StdLib" ] }, - { - "id": "Xamarin.AndroidX.Startup.StartupRuntime", - "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Tracing.Tracing" - ] - }, { "id": "Xamarin.AndroidX.Recommendation", "dependencies": [ From af181463b68f641284b570c10fbb7ddfe4101b03 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 26 Jan 2022 15:46:30 +0100 Subject: [PATCH 19/25] Update dependencies.json --- mappings/dependencies.json | 91 +++++++++++++++----------------------- 1 file changed, 36 insertions(+), 55 deletions(-) diff --git a/mappings/dependencies.json b/mappings/dependencies.json index ac23a1c72..d1fb12bcd 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -30,8 +30,7 @@ "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "Xamarin.AndroidX.Lifecycle.ViewModel", "Xamarin.AndroidX.SavedState", - "Xamarin.AndroidX.Tracing.Tracing", - "Xamarin.Kotlin.StdLib" + "Xamarin.AndroidX.Tracing.Tracing" ] }, { @@ -51,8 +50,7 @@ "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.AndroidX.VersionedParcelable", - "Xamarin.AndroidX.Concurrent.Futures" + "Xamarin.AndroidX.VersionedParcelable" ] }, { @@ -76,8 +74,7 @@ { "id": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.Kotlin.StdLib" + "Xamarin.AndroidX.Annotation" ] }, { @@ -94,13 +91,6 @@ "Xamarin.AndroidX.Annotation" ] }, - { - "id": "Xamarin.Kotlin.StdLib", - "dependencies": [ - "Xamarin.Jetbrains.Annotations", - "Xamarin.Kotlin.StdLib.Common" - ] - }, { "id": "Xamarin.AndroidX.Activity.Ktx", "dependencies": [ @@ -144,6 +134,13 @@ "Xamarin.Kotlin.StdLib" ] }, + { + "id": "Xamarin.Kotlin.StdLib", + "dependencies": [ + "Xamarin.Jetbrains.Annotations", + "Xamarin.Kotlin.StdLib.Common" + ] + }, { "id": "Xamarin.AndroidX.Ads.Identifier", "dependencies": [ @@ -202,10 +199,7 @@ "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.Lifecycle.ViewModel", - "Xamarin.AndroidX.SavedState", - "Xamarin.AndroidX.Emoji2.ViewsHelper", - "Xamarin.AndroidX.Emoji2", - "Xamarin.AndroidX.ResourceInspection.Annotation" + "Xamarin.AndroidX.SavedState" ] }, { @@ -245,32 +239,7 @@ "Xamarin.AndroidX.Lifecycle.ViewModel", "Xamarin.AndroidX.Loader", "Xamarin.AndroidX.SavedState", - "Xamarin.AndroidX.ViewPager", - "Xamarin.AndroidX.Core.Core.Ktx", - "Xamarin.Kotlin.StdLib" - ] - }, - { - "id": "Xamarin.AndroidX.Emoji2.ViewsHelper", - "dependencies": [ - "Xamarin.AndroidX.Collection", - "Xamarin.AndroidX.Core", - "Xamarin.AndroidX.Emoji2" - ] - }, - { - "id": "Xamarin.AndroidX.Emoji2", - "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Collection", - "Xamarin.AndroidX.Core", - "Xamarin.AndroidX.Startup.StartupRuntime" - ] - }, - { - "id": "Xamarin.AndroidX.ResourceInspection.Annotation", - "dependencies": [ - "Xamarin.AndroidX.Annotation" + "Xamarin.AndroidX.ViewPager" ] }, { @@ -903,6 +872,15 @@ "Xamarin.AndroidX.Emoji" ] }, + { + "id": "Xamarin.AndroidX.Emoji2", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Collection", + "Xamarin.AndroidX.Core", + "Xamarin.AndroidX.Startup.StartupRuntime" + ] + }, { "id": "Xamarin.AndroidX.Startup.StartupRuntime", "dependencies": [ @@ -910,6 +888,14 @@ "Xamarin.AndroidX.Tracing.Tracing" ] }, + { + "id": "Xamarin.AndroidX.Emoji2.ViewsHelper", + "dependencies": [ + "Xamarin.AndroidX.Collection", + "Xamarin.AndroidX.Core", + "Xamarin.AndroidX.Emoji2" + ] + }, { "id": "Xamarin.AndroidX.Loader", "dependencies": [ @@ -1054,8 +1040,7 @@ { "id": "Xamarin.AndroidX.Lifecycle.Process", "dependencies": [ - "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.AndroidX.Startup.StartupRuntime" + "Xamarin.AndroidX.Lifecycle.Runtime" ] }, { @@ -1137,20 +1122,10 @@ "Xamarin.Google.Guava.ListenableFuture" ] }, - { - "id": "Xamarin.AndroidX.Migration", - "dependencies": [ - "Xamarin.AndroidX.MultiDex" - ] - }, { "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ @@ -1332,6 +1307,12 @@ "Xamarin.AndroidX.RecyclerView" ] }, + { + "id": "Xamarin.AndroidX.ResourceInspection.Annotation", + "dependencies": [ + "Xamarin.AndroidX.Annotation" + ] + }, { "id": "Xamarin.AndroidX.Room.Common", "dependencies": [ From f32b376df241ae2ce63a30909e0488f55cbb62e9 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 26 Jan 2022 17:38:22 +0100 Subject: [PATCH 20/25] Update DependenciesTests.cs --- .../Tests/DependenciesTests.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs index eee5855e4..4bf06f711 100644 --- a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs +++ b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs @@ -264,14 +264,14 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.ConstraintLayout.Core", "Xamarin.AndroidX.CoordinatorLayout", "Xamarin.AndroidX.Core", - "Xamarin.AndroidX.Core.Core.Ktx", + //"Xamarin.AndroidX.Core.Core.Ktx", "Xamarin.AndroidX.CursorAdapter", "Xamarin.AndroidX.CustomView", "Xamarin.AndroidX.DocumentFile", "Xamarin.AndroidX.DrawerLayout", "Xamarin.AndroidX.DynamicAnimation", - "Xamarin.AndroidX.Emoji2", - "Xamarin.AndroidX.Emoji2.ViewsHelper", + //"Xamarin.AndroidX.Emoji2", + //"Xamarin.AndroidX.Emoji2.ViewsHelper", "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.Interpolator", "Xamarin.AndroidX.Legacy.Support.Core.UI", @@ -288,10 +288,10 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.Media", "Xamarin.AndroidX.Print", "Xamarin.AndroidX.RecyclerView", - "Xamarin.AndroidX.ResourceInspection.Annotation", + //"Xamarin.AndroidX.ResourceInspection.Annotation", "Xamarin.AndroidX.SavedState", "Xamarin.AndroidX.SlidingPaneLayout", - "Xamarin.AndroidX.Startup.StartupRuntime", + //"Xamarin.AndroidX.Startup.StartupRuntime", "Xamarin.AndroidX.SwipeRefreshLayout", "Xamarin.AndroidX.Tracing.Tracing", "Xamarin.AndroidX.Transition", @@ -302,9 +302,9 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.ViewPager2", "Xamarin.Google.Android.Material", "Xamarin.Google.Guava.ListenableFuture", - "Xamarin.Jetbrains.Annotations", - "Xamarin.Kotlin.StdLib", - "Xamarin.Kotlin.StdLib.Common", + //"Xamarin.Jetbrains.Annotations", + //"Xamarin.Kotlin.StdLib", + //"Xamarin.Kotlin.StdLib.Common", }; var tree = PackageDependencyTree.Load(); From 75ba72423b115cf042bb6d4ee3ae1c633640759b Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 30 Jan 2022 21:33:11 +0100 Subject: [PATCH 21/25] reverting some bumps --- config.json | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/config.json b/config.json index 17e40c13b..3d877368d 100644 --- a/config.json +++ b/config.json @@ -30,7 +30,7 @@ "groupId": "androidx.activity", "artifactId": "activity", "version": "1.3.1", - "nugetVersion": "1.3.1.3", + "nugetVersion": "1.3.1.2", "nugetId": "Xamarin.AndroidX.Activity", "dependencyOnly": false }, @@ -38,7 +38,7 @@ "groupId": "androidx.activity", "artifactId": "activity-ktx", "version": "1.3.1", - "nugetVersion": "1.3.1.3", + "nugetVersion": "1.3.1.2", "nugetId": "Xamarin.AndroidX.Activity.Ktx", "dependencyOnly": false }, @@ -422,7 +422,7 @@ "groupId": "androidx.core", "artifactId": "core", "version": "1.6.0", - "nugetVersion": "1.6.0.4", + "nugetVersion": "1.6.0.3", "nugetId": "Xamarin.AndroidX.Core", "dependencyOnly": false }, @@ -446,7 +446,7 @@ "groupId": "androidx.core", "artifactId": "core-ktx", "version": "1.6.0", - "nugetVersion": "1.6.0.4", + "nugetVersion": "1.6.0.3", "nugetId": "Xamarin.AndroidX.Core.Core.Ktx", "dependencyOnly": false }, @@ -687,7 +687,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.Common", "dependencyOnly": false }, @@ -695,7 +695,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common-java8", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.Common.Java8", "dependencyOnly": false }, @@ -711,7 +711,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData", "dependencyOnly": false }, @@ -719,7 +719,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core", "dependencyOnly": false }, @@ -727,7 +727,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core-ktx", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx", "dependencyOnly": false }, @@ -735,7 +735,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-ktx", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.5", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Ktx", "dependencyOnly": false }, @@ -743,7 +743,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-process", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.Process", "dependencyOnly": false }, @@ -751,7 +751,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencyOnly": false }, @@ -759,7 +759,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams-ktx", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams.Ktx", "dependencyOnly": false }, @@ -767,7 +767,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime", "dependencyOnly": false }, @@ -775,7 +775,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime-ktx", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime.Ktx", "dependencyOnly": false }, @@ -783,7 +783,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-service", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.Service", "dependencyOnly": false }, @@ -791,7 +791,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencyOnly": false }, @@ -799,7 +799,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-ktx", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel.Ktx", "dependencyOnly": false }, @@ -807,7 +807,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-savedstate", "version": "2.3.1", - "nugetVersion": "2.3.1.4", + "nugetVersion": "2.3.1.3", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "dependencyOnly": false }, @@ -1420,8 +1420,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-reflect", - "version": "1.6.0", - "nugetVersion": "1.6.0", + "version": "1.5.31", + "nugetVersion": "1.5.31.3", "nugetId": "Xamarin.Kotlin.Reflect", "dependencyOnly": false, "templateSet": "kotlin", @@ -1432,8 +1432,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib", - "version": "1.6.0", - "nugetVersion": "1.6.0", + "version": "1.5.31", + "nugetVersion": "1.5.31.3", "nugetId": "Xamarin.Kotlin.StdLib", "dependencyOnly": false, "templateSet": "kotlin" @@ -1441,8 +1441,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib-common", - "version": "1.6.0", - "nugetVersion": "1.6.0", + "version": "1.5.31", + "nugetVersion": "1.5.31.3", "nugetId": "Xamarin.Kotlin.StdLib.Common", "dependencyOnly": false, "templateSet": "kotlin", @@ -1453,8 +1453,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib-jdk7", - "version": "1.6.0", - "nugetVersion": "1.6.0", + "version": "1.5.31", + "nugetVersion": "1.5.31.3", "nugetId": "Xamarin.Kotlin.StdLib.Jdk7", "dependencyOnly": false, "templateSet": "kotlin", @@ -1465,8 +1465,8 @@ { "groupId": "org.jetbrains.kotlin", "artifactId": "kotlin-stdlib-jdk8", - "version": "1.6.0", - "nugetVersion": "1.6.0", + "version": "1.5.31", + "nugetVersion": "1.5.31.3", "nugetId": "Xamarin.Kotlin.StdLib.Jdk8", "dependencyOnly": false, "templateSet": "kotlin", From 8ca8c1a45cc3e65c68597723ad10f1d062d1cf61 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 30 Jan 2022 21:33:17 +0100 Subject: [PATCH 22/25] Update androidx-assemblies.csv --- mappings/androidx-assemblies.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 008559010..c56772ec9 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -39,7 +39,7 @@ Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,Xamarin.Android. 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.6.0 +Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.5.31.3 Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.10 Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.5 Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.10 From 8551dd8dd94c42ca04b13b9e923c08b00b850207 Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 30 Jan 2022 22:40:55 +0100 Subject: [PATCH 23/25] version tuning for lifecycle packages --- config.json | 61 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/config.json b/config.json index 3d877368d..d3950adfb 100644 --- a/config.json +++ b/config.json @@ -560,7 +560,6 @@ "version": "1.0.0", "nugetVersion": "1.0.0", "nugetId": "Xamarin.AndroidX.Emoji2", - "excludedRuntimeDependencies": "androidx.lifecycle.lifecycle-process", "dependencyOnly": false }, { @@ -686,16 +685,16 @@ { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Common", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-common-java8", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Common.Java8", "dependencyOnly": false }, @@ -710,104 +709,104 @@ { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-core-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-livedata-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.5", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.LiveData.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-process", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Process", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-reactivestreams-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ReactiveStreams.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-runtime-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Runtime.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-service", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.Service", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-ktx", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModel.Ktx", "dependencyOnly": false }, { "groupId": "androidx.lifecycle", "artifactId": "lifecycle-viewmodel-savedstate", - "version": "2.3.1", - "nugetVersion": "2.3.1.3", + "version": "2.4.0", + "nugetVersion": "2.4.0", "nugetId": "Xamarin.AndroidX.Lifecycle.ViewModelSavedState", "dependencyOnly": false }, From 62c1b84021f40c5671c0c8dd2c9b3fd7a91baaac Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 30 Jan 2022 22:41:00 +0100 Subject: [PATCH 24/25] Update DependenciesTests.cs --- tests/AndroidXMigrationTests/Tests/DependenciesTests.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs index 4bf06f711..8c713db3b 100644 --- a/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs +++ b/tests/AndroidXMigrationTests/Tests/DependenciesTests.cs @@ -302,10 +302,10 @@ public void XamarinFormsTopLevelPackagesExpandToAll() "Xamarin.AndroidX.ViewPager2", "Xamarin.Google.Android.Material", "Xamarin.Google.Guava.ListenableFuture", - //"Xamarin.Jetbrains.Annotations", - //"Xamarin.Kotlin.StdLib", - //"Xamarin.Kotlin.StdLib.Common", - }; + "Xamarin.Jetbrains.Annotations", + "Xamarin.Kotlin.StdLib", + "Xamarin.Kotlin.StdLib.Common", + }; var tree = PackageDependencyTree.Load(); From 65b372631ccbb2b781b7219425ee5457c96c50ee Mon Sep 17 00:00:00 2001 From: moljac Date: Sun, 30 Jan 2022 22:41:16 +0100 Subject: [PATCH 25/25] mappings --- mappings/androidx-assemblies.csv | 16 ++++++++-------- mappings/androidx-mapping.csv | 2 +- mappings/dependencies.json | 17 ++++++++++------- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index c56772ec9..b9501c478 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -1,14 +1,14 @@ 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.4 +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.4 -Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,Xamarin.Android.Arch.Lifecycle.Extensions,Xamarin.AndroidX.Lifecycle.Service,2.3.1.4 -Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,Xamarin.Android.Arch.Lifecycle.LiveData,Xamarin.AndroidX.Lifecycle.LiveData,2.3.1.4 -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.4 -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.4 +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 @@ -23,7 +23,7 @@ Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Andro 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.2.0 -Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0.4 +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.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 diff --git a/mappings/androidx-mapping.csv b/mappings/androidx-mapping.csv index 07e4ae72f..1ed9a67f5 100644 --- a/mappings/androidx-mapping.csv +++ b/mappings/androidx-mapping.csv @@ -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, diff --git a/mappings/dependencies.json b/mappings/dependencies.json index d1fb12bcd..ed2c58bd6 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -74,7 +74,8 @@ { "id": "Xamarin.AndroidX.Lifecycle.ViewModel", "dependencies": [ - "Xamarin.AndroidX.Annotation" + "Xamarin.AndroidX.Annotation", + "Xamarin.Kotlin.StdLib" ] }, { @@ -878,6 +879,14 @@ "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" ] }, @@ -1037,12 +1046,6 @@ "Xamarin.AndroidX.Lifecycle.ViewModel" ] }, - { - "id": "Xamarin.AndroidX.Lifecycle.Process", - "dependencies": [ - "Xamarin.AndroidX.Lifecycle.Runtime" - ] - }, { "id": "Xamarin.AndroidX.Lifecycle.Service", "dependencies": [