From b091fd29a84ac13c226a92fbf204c6764b2d6f06 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 3 Aug 2021 12:36:02 +0300 Subject: [PATCH 01/24] Update config.json --- config.json | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/config.json b/config.json index 560ab0c6a..9c62e04e4 100644 --- a/config.json +++ b/config.json @@ -219,6 +219,158 @@ "nugetId": "Xamarin.AndroidX.Collection.Ktx", "dependencyOnly": false }, + { + "groupId": "androidx.compose.animation", + "artifactId": "animation", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Animation.Animation", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.animation", + "artifactId": "animation-core", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Animation.Animation.Core", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.foundation", + "artifactId": "foundation", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Foundation.Foundation", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.foundation", + "artifactId": "foundation-layout", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.material", + "artifactId": "material", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.Material", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.material", + "artifactId": "material-icons-core", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.material", + "artifactId": "material-icons-extended", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.Material.Icons.Extended", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.material", + "artifactId": "material-ripple", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.Material.Ripple", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.runtime", + "artifactId": "runtime", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.runtime", + "artifactId": "runtime-livedata", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime.LiveData", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.runtime", + "artifactId": "runtime-rxjava2", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime.RxJava2", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.runtime", + "artifactId": "runtime-saveable", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.ui", + "artifactId": "ui", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.UI.UI", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.ui", + "artifactId": "ui-geometry", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Geometry", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.ui", + "artifactId": "ui-graphics", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Graphics", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.ui", + "artifactId": "ui-text", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Text", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.ui", + "artifactId": "ui-unit", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Unit", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.ui", + "artifactId": "ui-util", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Util", + "dependencyOnly": false + }, + { + "groupId": "androidx.compose.ui", + "artifactId": "ui-viewbinding", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Compose.UI.UI.ViewBinding", + "dependencyOnly": false + }, { "groupId": "androidx.concurrent", "artifactId": "concurrent-futures", @@ -843,6 +995,14 @@ "nugetId": "Xamarin.AndroidX.Print", "dependencyOnly": false }, + { + "groupId": "androidx.profileinstaller", + "artifactId": "profileinstaller", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.ProfileInstaller.ProfileInstaller", + "dependencyOnly": false + }, { "groupId": "androidx.recommendation", "artifactId": "recommendation", @@ -987,6 +1147,14 @@ "nugetId": "Xamarin.AndroidX.Sqlite.Framework", "dependencyOnly": false }, + { + "groupId": "androidx.startup", + "artifactId": "startup-runtime", + "version": "1.0.0", + "nugetVersion": "1.0.0", + "nugetId": "Xamarin.AndroidX.Startup.StartupRuntime", + "dependencyOnly": false + }, { "groupId": "androidx.swiperefreshlayout", "artifactId": "swiperefreshlayout", @@ -1163,6 +1331,14 @@ "nugetId": "Xamarin.Kotlin.StdLib", "dependencyOnly": true }, + { + "groupId": "org.jetbrains.kotlin", + "artifactId": "kotlin-stdlib-common", + "version": "1.5.10", + "nugetVersion": "1.5.10", + "nugetId": "Xamarin.Kotlin.StdLib.Common", + "dependencyOnly": true + }, { "groupId": "org.jetbrains", "artifactId": "annotations", From 5dd9a3300755828a046e441ee2a0df41f31d9e37 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 3 Aug 2021 12:36:25 +0300 Subject: [PATCH 02/24] profileinstaller bindings metadata --- .../profileinstaller/Additions/Additions.cs | 4 ++++ .../Transforms/Metadata.Namespaces.xml | 19 +++++++++++++++++++ .../profileinstaller/Transforms/Metadata.xml | 9 +++++++++ 3 files changed, 32 insertions(+) create mode 100644 source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs create mode 100644 source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.xml diff --git a/source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs b/source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs new file mode 100644 index 000000000..d44eff0e9 --- /dev/null +++ b/source/androidx.profileinstaller/profileinstaller/Additions/Additions.cs @@ -0,0 +1,4 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; diff --git a/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml b/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..1ecc5cfff --- /dev/null +++ b/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,19 @@ + + + + AndroidX.ProfileInstaller + + + + + \ No newline at end of file diff --git a/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.xml b/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.xml new file mode 100644 index 000000000..3c3e8cfd5 --- /dev/null +++ b/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.xml @@ -0,0 +1,9 @@ + + + Java.Lang.Object + + + \ No newline at end of file From 83ba398353d4297a6381ddd0479c380de73d494b Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 3 Aug 2021 12:37:24 +0300 Subject: [PATCH 03/24] startup-runtime metadata --- .../startup-runtime/Additions/Additions.cs | 5 +++++ .../Transforms/Metadata.Namespaces.xml | 18 ++++++++++++++++++ .../startup-runtime/Transforms/Metadata.xml | 10 ++++++++++ 3 files changed, 33 insertions(+) create mode 100644 source/androidx.startup/startup-runtime/Additions/Additions.cs create mode 100644 source/androidx.startup/startup-runtime/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.startup/startup-runtime/Transforms/Metadata.xml diff --git a/source/androidx.startup/startup-runtime/Additions/Additions.cs b/source/androidx.startup/startup-runtime/Additions/Additions.cs new file mode 100644 index 000000000..4777ecea1 --- /dev/null +++ b/source/androidx.startup/startup-runtime/Additions/Additions.cs @@ -0,0 +1,5 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + diff --git a/source/androidx.startup/startup-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.startup/startup-runtime/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..1f1404d79 --- /dev/null +++ b/source/androidx.startup/startup-runtime/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,18 @@ + + + + AndroidX.Car.App + + + + \ No newline at end of file diff --git a/source/androidx.startup/startup-runtime/Transforms/Metadata.xml b/source/androidx.startup/startup-runtime/Transforms/Metadata.xml new file mode 100644 index 000000000..06050a2f5 --- /dev/null +++ b/source/androidx.startup/startup-runtime/Transforms/Metadata.xml @@ -0,0 +1,10 @@ + + + AndroidX.RecyclerView.Widget.RecyclerView.ViewHolder + + + + \ No newline at end of file From 38e3a572f6fae0cd516922240e72b6a2132ab5a7 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 4 Aug 2021 12:24:40 +0300 Subject: [PATCH 04/24] compose metadata files --- .../animation-core/Additions/Additions.cs | 8 ++++++++ .../animation-core/Transforms/EnumFields.xml | 2 ++ .../animation-core/Transforms/EnumMethods.xml | 2 ++ .../animation-core/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../animation-core/Transforms/Metadata.xml | 3 +++ .../animation/Additions/Additions.cs | 8 ++++++++ .../animation/Transforms/EnumFields.xml | 2 ++ .../animation/Transforms/EnumMethods.xml | 2 ++ .../animation/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../animation/Transforms/Metadata.ParameterNames.xml | 2 ++ .../animation/Transforms/Metadata.xml | 3 +++ .../foundation-layout/Additions/Additions.cs | 8 ++++++++ .../foundation-layout/Transforms/EnumFields.xml | 2 ++ .../foundation-layout/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../foundation-layout/Transforms/Metadata.xml | 3 +++ .../foundation/Additions/Additions.cs | 8 ++++++++ .../foundation/Transforms/EnumFields.xml | 2 ++ .../foundation/Transforms/EnumMethods.xml | 2 ++ .../foundation/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../foundation/Transforms/Metadata.ParameterNames.xml | 2 ++ .../foundation/Transforms/Metadata.xml | 3 +++ .../material-icons-core/Additions/Additions.cs | 8 ++++++++ .../material-icons-core/Transforms/EnumFields.xml | 2 ++ .../material-icons-core/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../material-icons-core/Transforms/Metadata.xml | 3 +++ .../material-icons-extended/Additions/Additions.cs | 8 ++++++++ .../material-icons-extended/Transforms/EnumFields.xml | 2 ++ .../Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../material-icons-extended/Transforms/Metadata.xml | 3 +++ .../material-ripple/Additions/Additions.cs | 8 ++++++++ .../material-ripple/Transforms/EnumFields.xml | 2 ++ .../material-ripple/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../material-ripple/Transforms/Metadata.xml | 3 +++ .../material/Additions/Additions.cs | 8 ++++++++ .../material/Transforms/EnumFields.xml | 2 ++ .../material/Transforms/EnumMethods.xml | 2 ++ .../material/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../material/Transforms/Metadata.ParameterNames.xml | 2 ++ .../material/Transforms/Metadata.xml | 3 +++ .../runtime-livedata/Additions/Additions.cs | 8 ++++++++ .../runtime-livedata/Transforms/EnumFields.xml | 2 ++ .../runtime-livedata/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../runtime-livedata/Transforms/Metadata.xml | 3 +++ .../runtime-rxjava2/Additions/Additions.cs | 8 ++++++++ .../runtime-rxjava2/Transforms/EnumFields.xml | 2 ++ .../runtime-rxjava2/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../runtime-rxjava2/Transforms/Metadata.xml | 3 +++ .../runtime-rxjava3/Additions/Additions.cs | 8 ++++++++ .../runtime-rxjava3/Transforms/EnumFields.xml | 2 ++ .../runtime-rxjava3/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../runtime-rxjava3/Transforms/Metadata.xml | 3 +++ .../runtime-saveable/Additions/Additions.cs | 8 ++++++++ .../runtime-saveable/Transforms/EnumFields.xml | 2 ++ .../runtime-saveable/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../runtime-saveable/Transforms/Metadata.xml | 3 +++ .../runtime/Additions/Additions.cs | 8 ++++++++ .../runtime/Transforms/EnumFields.xml | 2 ++ .../runtime/Transforms/EnumMethods.xml | 2 ++ .../runtime/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../runtime/Transforms/Metadata.ParameterNames.xml | 2 ++ .../runtime/Transforms/Metadata.xml | 3 +++ .../ui-geometry/Additions/Additions.cs | 8 ++++++++ .../ui-geometry/Transforms/EnumFields.xml | 2 ++ .../ui-geometry/Transforms/EnumMethods.xml | 2 ++ .../ui-geometry/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-geometry/Transforms/Metadata.xml | 3 +++ .../ui-graphics/Additions/Additions.cs | 8 ++++++++ .../ui-graphics/Transforms/EnumFields.xml | 2 ++ .../ui-graphics/Transforms/EnumMethods.xml | 2 ++ .../ui-graphics/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-graphics/Transforms/Metadata.xml | 3 +++ .../ui-text/Additions/Additions.cs | 8 ++++++++ .../ui-text/Transforms/EnumFields.xml | 2 ++ .../ui-text/Transforms/EnumMethods.xml | 2 ++ .../ui-text/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../ui-text/Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-text/Transforms/Metadata.xml | 3 +++ .../ui-tooling-data/Additions/Additions.cs | 8 ++++++++ .../ui-tooling-data/Transforms/EnumFields.xml | 2 ++ .../ui-tooling-data/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-tooling-data/Transforms/Metadata.xml | 3 +++ .../ui-tooling-preview/Additions/Additions.cs | 8 ++++++++ .../ui-tooling-preview/Transforms/EnumFields.xml | 2 ++ .../ui-tooling-preview/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-tooling-preview/Transforms/Metadata.xml | 3 +++ .../ui-tooling/Additions/Additions.cs | 8 ++++++++ .../ui-tooling/Transforms/EnumFields.xml | 2 ++ .../ui-tooling/Transforms/EnumMethods.xml | 2 ++ .../ui-tooling/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../ui-tooling/Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-tooling/Transforms/Metadata.xml | 3 +++ .../ui-unit/Additions/Additions.cs | 8 ++++++++ .../ui-unit/Transforms/EnumFields.xml | 2 ++ .../ui-unit/Transforms/EnumMethods.xml | 2 ++ .../ui-unit/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../ui-unit/Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-unit/Transforms/Metadata.xml | 3 +++ .../ui-util/Additions/Additions.cs | 8 ++++++++ .../ui-util/Transforms/EnumFields.xml | 2 ++ .../ui-util/Transforms/EnumMethods.xml | 2 ++ .../ui-util/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../ui-util/Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-util/Transforms/Metadata.xml | 3 +++ .../ui-viewbinding/Additions/Additions.cs | 8 ++++++++ .../ui-viewbinding/Transforms/EnumFields.xml | 2 ++ .../ui-viewbinding/Transforms/EnumMethods.xml | 2 ++ .../ui-viewbinding/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../ui-viewbinding/Transforms/Metadata.xml | 3 +++ source/androidx.compose.ui/ui/Additions/Additions.cs | 8 ++++++++ .../androidx.compose.ui/ui/Transforms/EnumFields.xml | 2 ++ .../androidx.compose.ui/ui/Transforms/EnumMethods.xml | 2 ++ .../ui/Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../ui/Transforms/Metadata.ParameterNames.xml | 2 ++ source/androidx.compose.ui/ui/Transforms/Metadata.xml | 3 +++ .../compose-runtime/Additions/Additions.cs | 8 ++++++++ .../compose-runtime/Transforms/EnumFields.xml | 2 ++ .../compose-runtime/Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 11 +++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../compose-runtime/Transforms/Metadata.xml | 3 +++ 144 files changed, 672 insertions(+) create mode 100644 source/androidx.compose.animation/animation-core/Additions/Additions.cs create mode 100644 source/androidx.compose.animation/animation-core/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.animation/animation-core/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.animation/animation-core/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.animation/animation-core/Transforms/Metadata.xml create mode 100644 source/androidx.compose.animation/animation/Additions/Additions.cs create mode 100644 source/androidx.compose.animation/animation/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.animation/animation/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.animation/animation/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.animation/animation/Transforms/Metadata.xml create mode 100644 source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs create mode 100644 source/androidx.compose.foundation/foundation-layout/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.foundation/foundation-layout/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml create mode 100644 source/androidx.compose.foundation/foundation/Additions/Additions.cs create mode 100644 source/androidx.compose.foundation/foundation/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.foundation/foundation/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.foundation/foundation/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.foundation/foundation/Transforms/Metadata.xml create mode 100644 source/androidx.compose.material/material-icons-core/Additions/Additions.cs create mode 100644 source/androidx.compose.material/material-icons-core/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.material/material-icons-core/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.material/material-icons-core/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml create mode 100644 source/androidx.compose.material/material-icons-extended/Additions/Additions.cs create mode 100644 source/androidx.compose.material/material-icons-extended/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.material/material-icons-extended/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.material/material-icons-extended/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml create mode 100644 source/androidx.compose.material/material-ripple/Additions/Additions.cs create mode 100644 source/androidx.compose.material/material-ripple/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.material/material-ripple/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.material/material-ripple/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.material/material-ripple/Transforms/Metadata.xml create mode 100644 source/androidx.compose.material/material/Additions/Additions.cs create mode 100644 source/androidx.compose.material/material/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.material/material/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.material/material/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.material/material/Transforms/Metadata.xml create mode 100644 source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs create mode 100644 source/androidx.compose.runtime/runtime-livedata/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.runtime/runtime-livedata/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs create mode 100644 source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs create mode 100644 source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml create mode 100644 source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs create mode 100644 source/androidx.compose.runtime/runtime-saveable/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.runtime/runtime-saveable/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml create mode 100644 source/androidx.compose.runtime/runtime/Additions/Additions.cs create mode 100644 source/androidx.compose.runtime/runtime/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.runtime/runtime/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.runtime/runtime/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.runtime/runtime/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-geometry/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-geometry/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-geometry/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-geometry/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-graphics/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-graphics/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-graphics/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-graphics/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-text/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-text/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-text/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-text/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-text/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-tooling-data/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-tooling-data/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-tooling/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-tooling/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-tooling/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-tooling/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-unit/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-unit/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-unit/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-unit/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-util/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-util/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-util/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-util/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-util/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui-viewbinding/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui-viewbinding/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml create mode 100644 source/androidx.compose.ui/ui/Additions/Additions.cs create mode 100644 source/androidx.compose.ui/ui/Transforms/EnumFields.xml create mode 100644 source/androidx.compose.ui/ui/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose.ui/ui/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose.ui/ui/Transforms/Metadata.xml create mode 100644 source/androidx.compose/compose-runtime/Additions/Additions.cs create mode 100644 source/androidx.compose/compose-runtime/Transforms/EnumFields.xml create mode 100644 source/androidx.compose/compose-runtime/Transforms/EnumMethods.xml create mode 100644 source/androidx.compose/compose-runtime/Transforms/Metadata.Namespaces.xml create mode 100644 source/androidx.compose/compose-runtime/Transforms/Metadata.ParameterNames.xml create mode 100644 source/androidx.compose/compose-runtime/Transforms/Metadata.xml diff --git a/source/androidx.compose.animation/animation-core/Additions/Additions.cs b/source/androidx.compose.animation/animation-core/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.animation/animation-core/Transforms/EnumFields.xml b/source/androidx.compose.animation/animation-core/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/EnumMethods.xml b/source/androidx.compose.animation/animation-core/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation/Additions/Additions.cs b/source/androidx.compose.animation/animation/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.animation/animation/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.animation/animation/Transforms/EnumFields.xml b/source/androidx.compose.animation/animation/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.animation/animation/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation/Transforms/EnumMethods.xml b/source/androidx.compose.animation/animation/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.animation/animation/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.animation/animation/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.animation/animation/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation/Transforms/Metadata.xml b/source/androidx.compose.animation/animation/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.animation/animation/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs b/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/EnumFields.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/EnumMethods.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Additions/Additions.cs b/source/androidx.compose.foundation/foundation/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.foundation/foundation/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.foundation/foundation/Transforms/EnumFields.xml b/source/androidx.compose.foundation/foundation/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.foundation/foundation/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Transforms/EnumMethods.xml b/source/androidx.compose.foundation/foundation/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.foundation/foundation/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-core/Additions/Additions.cs b/source/androidx.compose.material/material-icons-core/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.material/material-icons-core/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.material/material-icons-core/Transforms/EnumFields.xml b/source/androidx.compose.material/material-icons-core/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.material/material-icons-core/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-core/Transforms/EnumMethods.xml b/source/androidx.compose.material/material-icons-core/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.material/material-icons-core/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs b/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/EnumFields.xml b/source/androidx.compose.material/material-icons-extended/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.material/material-icons-extended/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/EnumMethods.xml b/source/androidx.compose.material/material-icons-extended/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.material/material-icons-extended/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-ripple/Additions/Additions.cs b/source/androidx.compose.material/material-ripple/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.material/material-ripple/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.material/material-ripple/Transforms/EnumFields.xml b/source/androidx.compose.material/material-ripple/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.material/material-ripple/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-ripple/Transforms/EnumMethods.xml b/source/androidx.compose.material/material-ripple/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.material/material-ripple/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-ripple/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.material/material-ripple/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.material/material-ripple/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-ripple/Transforms/Metadata.xml b/source/androidx.compose.material/material-ripple/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.material/material-ripple/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material/Additions/Additions.cs b/source/androidx.compose.material/material/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.material/material/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.material/material/Transforms/EnumFields.xml b/source/androidx.compose.material/material/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.material/material/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material/Transforms/EnumMethods.xml b/source/androidx.compose.material/material/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.material/material/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.material/material/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.material/material/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.material/material/Transforms/Metadata.xml b/source/androidx.compose.material/material/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.material/material/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-livedata/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/EnumFields.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/EnumMethods.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava2/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumFields.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumMethods.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava3/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumFields.xml b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumMethods.xml b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.runtime/runtime-rxjava3/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs b/source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-saveable/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/EnumFields.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/EnumMethods.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Additions/Additions.cs b/source/androidx.compose.runtime/runtime/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.runtime/runtime/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.runtime/runtime/Transforms/EnumFields.xml b/source/androidx.compose.runtime/runtime/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.runtime/runtime/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/EnumMethods.xml b/source/androidx.compose.runtime/runtime/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.runtime/runtime/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Additions/Additions.cs b/source/androidx.compose.ui/ui-geometry/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-geometry/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-geometry/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-geometry/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-geometry/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-geometry/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Additions/Additions.cs b/source/androidx.compose.ui/ui-graphics/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-graphics/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-graphics/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-graphics/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-graphics/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-graphics/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Additions/Additions.cs b/source/androidx.compose.ui/ui-text/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-text/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-text/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-text/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-text/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-text/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-text/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-data/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-data/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-data/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-preview/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling-preview/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-tooling/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-tooling/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-tooling/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Additions/Additions.cs b/source/androidx.compose.ui/ui-unit/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-unit/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-unit/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-unit/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-unit/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-unit/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-unit/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-util/Additions/Additions.cs b/source/androidx.compose.ui/ui-util/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-util/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-util/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-util/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-util/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-util/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-util/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-util/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-util/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-util/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-util/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-util/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-util/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-util/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs b/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Additions/Additions.cs b/source/androidx.compose.ui/ui/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose.ui/ui/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose.ui/ui/Transforms/EnumFields.xml b/source/androidx.compose.ui/ui/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose.ui/ui/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/EnumMethods.xml b/source/androidx.compose.ui/ui/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose.ui/ui/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/source/androidx.compose/compose-runtime/Additions/Additions.cs b/source/androidx.compose/compose-runtime/Additions/Additions.cs new file mode 100644 index 000000000..cc609c55b --- /dev/null +++ b/source/androidx.compose/compose-runtime/Additions/Additions.cs @@ -0,0 +1,8 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; + +namespace AndroidX.Compose +{ +} diff --git a/source/androidx.compose/compose-runtime/Transforms/EnumFields.xml b/source/androidx.compose/compose-runtime/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/androidx.compose/compose-runtime/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose/compose-runtime/Transforms/EnumMethods.xml b/source/androidx.compose/compose-runtime/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/androidx.compose/compose-runtime/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose/compose-runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.compose/compose-runtime/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..638cde2e8 --- /dev/null +++ b/source/androidx.compose/compose-runtime/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/source/androidx.compose/compose-runtime/Transforms/Metadata.ParameterNames.xml b/source/androidx.compose/compose-runtime/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/androidx.compose/compose-runtime/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/androidx.compose/compose-runtime/Transforms/Metadata.xml b/source/androidx.compose/compose-runtime/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/androidx.compose/compose-runtime/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file From 60fa26392e6d30b63bca6db99114c6d62dbcea7c Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 4 Oct 2021 12:16:50 +0200 Subject: [PATCH 05/24] metadata fixes for initial builds --- ....appcompat-resources-typeforwarders.csproj | 2 +- .../animation-core/Additions/Additions.cs | 6 + ...X.Compose.Animation.Core.IAnimationSpec.cs | 104 +++++++++++ ...pose.Animation.Core.IDecayAnimationSpec.cs | 105 +++++++++++ ...ose.Animation.Core.IFiniteAnimationSpec.cs | 104 +++++++++++ ...e.Animation.Core.InfiniteRepeatableSpec.cs | 31 ++++ ...X.Compose.Animation.Core.RepeatableSpec.cs | 30 +++ ...ndroidX.Compose.Animation.Core.SnapSpec.cs | 29 +++ .../Transforms/Metadata.Namespaces.xml | 6 +- .../animation-core/Transforms/Metadata.xml | 89 +++++++++ .../Transforms/Metadata.Namespaces.xml | 6 +- .../foundation-layout/Transforms/Metadata.xml | 25 +++ .../Transforms/Metadata.Namespaces.xml | 48 ++++- .../foundation/Transforms/Metadata.xml | 66 +++++++ .../Transforms/Metadata.Namespaces.xml | 37 +++- .../Transforms/Metadata.Namespaces.xml | 37 +++- .../Transforms/Metadata.Namespaces.xml | 6 +- .../runtime/Additions/Additions.cs | 4 +- .../Transforms/Metadata.Namespaces.xml | 77 +++++++- .../runtime/Transforms/Metadata.xml | 93 ++++++++++ .../Transforms/Metadata.Namespaces.xml | 6 +- .../ui-geometry/Transforms/Metadata.xml | 6 + .../Transforms/Metadata.Namespaces.xml | 30 ++- .../ui-graphics/Transforms/Metadata.xml | 19 ++ .../ui-text/Additions/Additions.cs | 21 ++- .../Transforms/Metadata.Namespaces.xml | 60 +++++- .../ui-text/Transforms/Metadata.xml | 171 ++++++++++++++++++ .../Transforms/Metadata.Namespaces.xml | 6 +- .../ui-unit/Transforms/Metadata.xml | 96 ++++++++++ .../Transforms/Metadata.Namespaces.xml | 6 +- .../Transforms/Metadata.Namespaces.xml | 7 +- .../ui/Transforms/Metadata.Namespaces.xml | 138 +++++++++++++- .../ui/Transforms/Metadata.xml | 56 ++++++ .../Transforms/Metadata.Namespaces.xml | 9 +- .../Xamarin.AndroidX.Migration.props | 27 +++ 35 files changed, 1496 insertions(+), 67 deletions(-) create mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs create mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs create mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs create mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs create mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs create mode 100644 source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs diff --git a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj index 7022f5dba..1200b83e2 100644 --- a/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj +++ b/source/androidx.appcompat/typeforwarders/androidx.appcompat.appcompat-resources-typeforwarders.csproj @@ -1,6 +1,6 @@ - MonoAndroid9.0;net6.0-android30.0 + MonoAndroid9.0;net6.0-android Xamarin.AndroidX.AppCompat.Resources Resources Assets diff --git a/source/androidx.compose.animation/animation-core/Additions/Additions.cs b/source/androidx.compose.animation/animation-core/Additions/Additions.cs index cc609c55b..3a964710f 100644 --- a/source/androidx.compose.animation/animation-core/Additions/Additions.cs +++ b/source/androidx.compose.animation/animation-core/Additions/Additions.cs @@ -3,6 +3,12 @@ using Android.Widget; using Android.Graphics; +delegate IntPtr _JniMarshal_PPL_L (IntPtr jnienv, IntPtr klass, IntPtr p0); + namespace AndroidX.Compose { } + +namespace AndroidX.Compose.Animation.Core +{ +} diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs new file mode 100644 index 000000000..c9339bd56 --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace AndroidX.Compose.Animation.Core { + + // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='AnimationSpec']" + [Register ("androidx/compose/animation/core/AnimationSpec", "", "AndroidX.Compose.Animation.Core.IAnimationSpecInvoker")] + [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] + public partial interface IAnimationSpec : IJavaObject, IJavaPeerable { + // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='AnimationSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" + [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;", "GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler:AndroidX.Compose.Animation.Core.IAnimationSpecInvoker, Xamarin.AndroidX.Compose.Animation.Animation.Core")] + [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] + global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter); + + } + + [global::Android.Runtime.Register ("androidx/compose/animation/core/AnimationSpec", DoNotGenerateAcw=true)] + internal partial class IAnimationSpecInvoker : global::Java.Lang.Object, IAnimationSpec { + static readonly JniPeerMembers _members = new XAPeerMembers ("androidx/compose/animation/core/AnimationSpec", typeof (IAnimationSpecInvoker)); + + static IntPtr java_class_ref { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + protected override IntPtr ThresholdClass { + get { return class_ref; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + + IntPtr class_ref; + + public static IAnimationSpec GetObject (IntPtr handle, JniHandleOwnership transfer) + { + return global::Java.Lang.Object.GetObject (handle, transfer); + } + + static IntPtr Validate (IntPtr handle) + { + if (!JNIEnv.IsInstanceOf (handle, java_class_ref)) + throw new InvalidCastException ($"Unable to convert instance of type '{JNIEnv.GetClassNameFromInstance (handle)}' to type 'androidx.compose.animation.core.AnimationSpec'."); + return handle; + } + + protected override void Dispose (bool disposing) + { + if (this.class_ref != IntPtr.Zero) + JNIEnv.DeleteGlobalRef (this.class_ref); + this.class_ref = IntPtr.Zero; + base.Dispose (disposing); + } + + public IAnimationSpecInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate (handle), transfer) + { + IntPtr local_ref = JNIEnv.GetObjectClass (((global::Java.Lang.Object) this).Handle); + this.class_ref = JNIEnv.NewGlobalRef (local_ref); + JNIEnv.DeleteLocalRef (local_ref); + } + + static Delegate cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; +#pragma warning disable 0169 + static Delegate GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler () + { + if (cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == null) + cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_); + return cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; + } + + static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_converter) + { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var converter = (global::AndroidX.Compose.Animation.Core.ITwoWayConverter)global::Java.Lang.Object.GetObject (native_converter, JniHandleOwnership.DoNotTransfer); + IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.Vectorize (converter)); + return __ret; + } +#pragma warning restore 0169 + + IntPtr id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; + public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) + { + if (id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == IntPtr.Zero) + id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNIEnv.GetMethodID (class_ref, "vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;"); + JValue* __args = stackalloc JValue [1]; + __args [0] = new JValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); + var __ret = (Java.Lang.Object) global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_, __args), JniHandleOwnership.TransferLocalRef); + return __ret; + } + + } +} diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs new file mode 100644 index 000000000..13be76fd2 --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs @@ -0,0 +1,105 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace AndroidX.Compose.Animation.Core { + + // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='DecayAnimationSpec']" + [Register ("androidx/compose/animation/core/DecayAnimationSpec", "", "AndroidX.Compose.Animation.Core.IDecayAnimationSpecInvoker")] + [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] + public partial interface IDecayAnimationSpec : IJavaObject, IJavaPeerable { + // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='DecayAnimationSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" + [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDecayAnimationSpec;", "GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler:AndroidX.Compose.Animation.Core.IDecayAnimationSpecInvoker, Xamarin.AndroidX.Compose.Animation.Animation.Core")] + [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] + global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter typeConverter); + + } + + [global::Android.Runtime.Register ("androidx/compose/animation/core/DecayAnimationSpec", DoNotGenerateAcw=true)] + internal partial class IDecayAnimationSpecInvoker : global::Java.Lang.Object, IDecayAnimationSpec { + + static readonly JniPeerMembers _members = new XAPeerMembers ("androidx/compose/animation/core/DecayAnimationSpec", typeof (IDecayAnimationSpecInvoker)); + + static IntPtr java_class_ref { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + protected override IntPtr ThresholdClass { + get { return class_ref; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + + IntPtr class_ref; + + public static IDecayAnimationSpec GetObject (IntPtr handle, JniHandleOwnership transfer) + { + return global::Java.Lang.Object.GetObject (handle, transfer); + } + + static IntPtr Validate (IntPtr handle) + { + if (!JNIEnv.IsInstanceOf (handle, java_class_ref)) + throw new InvalidCastException ($"Unable to convert instance of type '{JNIEnv.GetClassNameFromInstance (handle)}' to type 'androidx.compose.animation.core.DecayAnimationSpec'."); + return handle; + } + + protected override void Dispose (bool disposing) + { + if (this.class_ref != IntPtr.Zero) + JNIEnv.DeleteGlobalRef (this.class_ref); + this.class_ref = IntPtr.Zero; + base.Dispose (disposing); + } + + public IDecayAnimationSpecInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate (handle), transfer) + { + IntPtr local_ref = JNIEnv.GetObjectClass (((global::Java.Lang.Object) this).Handle); + this.class_ref = JNIEnv.NewGlobalRef (local_ref); + JNIEnv.DeleteLocalRef (local_ref); + } + + static Delegate cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; +#pragma warning disable 0169 + static Delegate GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler () + { + if (cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == null) + cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_); + return cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; + } + + static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_typeConverter) + { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var typeConverter = (global::AndroidX.Compose.Animation.Core.ITwoWayConverter)global::Java.Lang.Object.GetObject (native_typeConverter, JniHandleOwnership.DoNotTransfer); + IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.Vectorize (typeConverter)); + return __ret; + } +#pragma warning restore 0169 + + IntPtr id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; + public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter typeConverter) + { + if (id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == IntPtr.Zero) + id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNIEnv.GetMethodID (class_ref, "vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDecayAnimationSpec;"); + JValue* __args = stackalloc JValue [1]; + __args [0] = new JValue ((typeConverter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) typeConverter).Handle); + var __ret = (Java.Lang.Object) global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_, __args), JniHandleOwnership.TransferLocalRef); + return __ret; + } + + } +} diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs new file mode 100644 index 000000000..559a816a5 --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace AndroidX.Compose.Animation.Core { + + // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='FiniteAnimationSpec']" + [Register ("androidx/compose/animation/core/FiniteAnimationSpec", "", "AndroidX.Compose.Animation.Core.IFiniteAnimationSpecInvoker")] + [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] + public partial interface IFiniteAnimationSpec : global::AndroidX.Compose.Animation.Core.IAnimationSpec { + // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='FiniteAnimationSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" + [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;", "GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler:AndroidX.Compose.Animation.Core.IFiniteAnimationSpecInvoker, Xamarin.AndroidX.Compose.Animation.Animation.Core")] + [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] + global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter); + + } + + [global::Android.Runtime.Register ("androidx/compose/animation/core/FiniteAnimationSpec", DoNotGenerateAcw=true)] + internal partial class IFiniteAnimationSpecInvoker : global::Java.Lang.Object, IFiniteAnimationSpec { + static readonly JniPeerMembers _members = new XAPeerMembers ("androidx/compose/animation/core/FiniteAnimationSpec", typeof (IFiniteAnimationSpecInvoker)); + + static IntPtr java_class_ref { + get { return _members.JniPeerType.PeerReference.Handle; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + public override global::Java.Interop.JniPeerMembers JniPeerMembers { + get { return _members; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + protected override IntPtr ThresholdClass { + get { return class_ref; } + } + + [global::System.Diagnostics.DebuggerBrowsable (global::System.Diagnostics.DebuggerBrowsableState.Never)] + [global::System.ComponentModel.EditorBrowsable (global::System.ComponentModel.EditorBrowsableState.Never)] + protected override global::System.Type ThresholdType { + get { return _members.ManagedPeerType; } + } + + IntPtr class_ref; + + public static IFiniteAnimationSpec GetObject (IntPtr handle, JniHandleOwnership transfer) + { + return global::Java.Lang.Object.GetObject (handle, transfer); + } + + static IntPtr Validate (IntPtr handle) + { + if (!JNIEnv.IsInstanceOf (handle, java_class_ref)) + throw new InvalidCastException ($"Unable to convert instance of type '{JNIEnv.GetClassNameFromInstance (handle)}' to type 'androidx.compose.animation.core.FiniteAnimationSpec'."); + return handle; + } + + protected override void Dispose (bool disposing) + { + if (this.class_ref != IntPtr.Zero) + JNIEnv.DeleteGlobalRef (this.class_ref); + this.class_ref = IntPtr.Zero; + base.Dispose (disposing); + } + + public IFiniteAnimationSpecInvoker (IntPtr handle, JniHandleOwnership transfer) : base (Validate (handle), transfer) + { + IntPtr local_ref = JNIEnv.GetObjectClass (((global::Java.Lang.Object) this).Handle); + this.class_ref = JNIEnv.NewGlobalRef (local_ref); + JNIEnv.DeleteLocalRef (local_ref); + } + + static Delegate cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; +#pragma warning disable 0169 + static Delegate GetVectorize_Landroidx_compose_animation_core_TwoWayConverter_Handler () + { + if (cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == null) + cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNINativeWrapper.CreateDelegate ((_JniMarshal_PPL_L) n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_); + return cb_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; + } + + static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (IntPtr jnienv, IntPtr native__this, IntPtr native_converter) + { + var __this = global::Java.Lang.Object.GetObject (jnienv, native__this, JniHandleOwnership.DoNotTransfer); + var converter = (global::AndroidX.Compose.Animation.Core.ITwoWayConverter)global::Java.Lang.Object.GetObject (native_converter, JniHandleOwnership.DoNotTransfer); + IntPtr __ret = JNIEnv.ToLocalJniHandle (__this.Vectorize (converter)); + return __ret; + } +#pragma warning restore 0169 + + IntPtr id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_; + public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) + { + if (id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ == IntPtr.Zero) + id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_ = JNIEnv.GetMethodID (class_ref, "vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;"); + JValue* __args = stackalloc JValue [1]; + __args [0] = new JValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); + var __ret = (Java.Lang.Object) global::Java.Lang.Object.GetObject (JNIEnv.CallObjectMethod (((global::Java.Lang.Object) this).Handle, id_vectorize_Landroidx_compose_animation_core_TwoWayConverter_, __args), JniHandleOwnership.TransferLocalRef); + return __ret; + } + + } +} diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs new file mode 100644 index 000000000..a265f389e --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs @@ -0,0 +1,31 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace AndroidX.Compose.Animation.Core +{ + + // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='InfiniteRepeatableSpec']" + // [global::Android.Runtime.Register ("androidx/compose/animation/core/InfiniteRepeatableSpec", DoNotGenerateAcw=true)] + // [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] + public sealed partial class InfiniteRepeatableSpec //: global::Java.Lang.Object, global::AndroidX.Compose.Animation.Core.IAnimationSpec + { + // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='InfiniteRepeatableSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" + [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;", "")] + [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] + public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) + { + const string __id = "vectorize.(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedAnimationSpec;"; + try { + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); + return (Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); + } finally { + global::System.GC.KeepAlive (converter); + } + } + + } +} \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs new file mode 100644 index 000000000..d95f701c2 --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace AndroidX.Compose.Animation.Core +{ + + // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='RepeatableSpec']" + // [global::Android.Runtime.Register ("androidx/compose/animation/core/RepeatableSpec", DoNotGenerateAcw=true)] + // [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] + public sealed partial class RepeatableSpec // : global::Java.Lang.Object, global::AndroidX.Compose.Animation.Core.IFiniteAnimationSpec + { + // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='RepeatableSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" + [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;", "")] + [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] + public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) + { + const string __id = "vectorize.(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedFiniteAnimationSpec;"; + try { + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); + return (Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); + } finally { + global::System.GC.KeepAlive (converter); + } + } + } +} \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs new file mode 100644 index 000000000..6ef7f7fdb --- /dev/null +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections.Generic; +using Android.Runtime; +using Java.Interop; + +namespace AndroidX.Compose.Animation.Core +{ + // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='SnapSpec']" + // [global::Android.Runtime.Register ("androidx/compose/animation/core/SnapSpec", DoNotGenerateAcw=true)] + // [global::Java.Interop.JavaTypeParameters (new string [] {"T"})] + public sealed partial class SnapSpec //: global::Java.Lang.Object, global::AndroidX.Compose.Animation.Core.IDurationBasedAnimationSpec + { + // Metadata.xml XPath method reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='SnapSpec']/method[@name='vectorize' and count(parameter)=1 and parameter[1][@type='androidx.compose.animation.core.TwoWayConverter<T, V>']]" + [Register ("vectorize", "(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDurationBasedAnimationSpec;", "")] + [global::Java.Interop.JavaTypeParameters (new string [] {"V extends androidx.compose.animation.core.AnimationVector"})] + public unsafe global::Java.Lang.Object Vectorize (global::AndroidX.Compose.Animation.Core.ITwoWayConverter converter) + { + const string __id = "vectorize.(Landroidx/compose/animation/core/TwoWayConverter;)Landroidx/compose/animation/core/VectorizedDurationBasedAnimationSpec;"; + try { + JniArgumentValue* __args = stackalloc JniArgumentValue [1]; + __args [0] = new JniArgumentValue ((converter == null) ? IntPtr.Zero : ((global::Java.Lang.Object) converter).Handle); + var __rm = _members.InstanceMethods.InvokeAbstractObjectMethod (__id, this, __args); + return (Java.Lang.Object) global::Java.Lang.Object.GetObject (__rm.Handle, JniHandleOwnership.TransferLocalRef); + } finally { + global::System.GC.KeepAlive (converter); + } + } + } +} \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml index 638cde2e8..cf0fc3b0b 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml index 9495e200d..5f81229fc 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml @@ -1,3 +1,92 @@  + + + + Java.Lang.Object + + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + Java.Lang.Object + + + + + + + + + + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml index 638cde2e8..55a6b4f50 100644 --- a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml index 9495e200d..0caaad4b9 100644 --- a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml @@ -1,3 +1,28 @@  + + CalculateBottomPadding + + + CalculateLeftPadding + + + CalculateRightPadding + + + CalculateTopPadding + + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml index 638cde2e8..16c28afbe 100644 --- a/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,51 @@  - \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml index 9495e200d..f9064d0cf 100644 --- a/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml +++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml @@ -1,3 +1,69 @@  + + RoundedCornerShape1 + + + RoundedCornerShape1 + + + + false + + + + CutCornerShape1 + + + CutCornerShape1 + + + + CornerSize1 + + + AbsoluteRoundedCornerShape1 + + + AbsoluteRoundedCornerShape1 + + + AbsoluteCutCornerShape1 + + + AbsoluteCutCornerShape1 + + + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml index 638cde2e8..544a54309 100644 --- a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,40 @@  - + + AndroidX.Compose.Material.Icons.Rounded + + + AndroidX.Compose.Material.Icons.Sharp + + + AndroidX.Compose.Material.Icons.Outlined + + + AndroidX.Compose.Material.Icons.Filled + + + AndroidX.Compose.Material.Icons.TwoTone + + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml index 638cde2e8..544a54309 100644 --- a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,40 @@  - + + AndroidX.Compose.Material.Icons.Rounded + + + AndroidX.Compose.Material.Icons.Sharp + + + AndroidX.Compose.Material.Icons.Outlined + + + AndroidX.Compose.Material.Icons.Filled + + + AndroidX.Compose.Material.Icons.TwoTone + + \ No newline at end of file diff --git a/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml index 638cde2e8..4a70b2d08 100644 --- a/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Additions/Additions.cs b/source/androidx.compose.runtime/runtime/Additions/Additions.cs index cc609c55b..7d27cfbfd 100644 --- a/source/androidx.compose.runtime/runtime/Additions/Additions.cs +++ b/source/androidx.compose.runtime/runtime/Additions/Additions.cs @@ -3,6 +3,6 @@ using Android.Widget; using Android.Graphics; -namespace AndroidX.Compose +namespace Androidx.Compose.Runtime.Snapshots { -} +} \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml index 638cde2e8..d6769723c 100644 --- a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,80 @@  - \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml index 9495e200d..b7c557507 100644 --- a/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml @@ -1,3 +1,96 @@  + + + + Java.Util.ICollection + + + Java.Util.ICollection + + + Java.Util.ICollection + + + Java.Util.ICollection + + + Java.Util.ICollection + + + Java.Util.ICollection + + + Java.Util.ICollection + + + Java.Util.ICollection + + + + + + + + System.Collections.ICollection + + + System.Collections.ICollection + + + System.Collections.ICollection + + + + + + + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml index 638cde2e8..8a72f3ce1 100644 --- a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml index 9495e200d..6b5201cfa 100644 --- a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml @@ -1,3 +1,9 @@  + + RectFromOffsetAndSize + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml index 638cde2e8..cf33494d8 100644 --- a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,33 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml index 9495e200d..6ac3d1311 100644 --- a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml @@ -1,3 +1,22 @@  + + ToSp + + + ToSp1 + + + ToSp + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Additions/Additions.cs b/source/androidx.compose.ui/ui-text/Additions/Additions.cs index cc609c55b..dccf2b2b6 100644 --- a/source/androidx.compose.ui/ui-text/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-text/Additions/Additions.cs @@ -3,6 +3,25 @@ using Android.Widget; using Android.Graphics; -namespace AndroidX.Compose +namespace AndroidX.Compose.UI.Text { + public sealed partial class AnnotatedString + { + public Java.Lang.ICharSequence SubSequenceFormatted (int start, int end) + { + throw new NotImplementedException(); + } + } +} + +namespace AndroidX.Compose.UI.Text.Font +{ + + public sealed partial class FontListFontFamily + { + public System.Collections.IList SubList (int fromIndex, int toIndex) + { + return (System.Collections.IList) this.SubList(fromIndex, toIndex); + } + } } diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml index 638cde2e8..c8ba31312 100644 --- a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,63 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml index 9495e200d..24cf88db2 100644 --- a/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml @@ -1,3 +1,174 @@  + + Java.Lang.Object + + + Java.Lang.Object + + + + System.Collections.ICollection + + + System.Collections.ICollection + + + System.Collections.ICollection + + + System.Collections.ICollection + + + + + + + + Size + + + + + + + Java.Lang.Object + + + + + Length + + + + + + Java.Lang.Object + + + Java.Lang.Object + + + System.Collections.ICollection + + + System.Collections.ICollection + + + System.Collections.ICollection + + + Java.Lang.Object + + + Java.Lang.Object + + + System.Collections.ICollection + + + System.Collections.ICollection + + + + Java.Lang.Object + + + Java.Lang.Object + + + + + + + Size + + + + + SubListOriginal + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml index 638cde2e8..83507743c 100644 --- a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml index 9495e200d..405a1300e 100644 --- a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml @@ -1,3 +1,99 @@  + + ConstrainFromSize + + + ConstrainFromOtherConstraints + + + + + Java.Lang.Object + + + + + + Minus1 + + + Minus2 + + + + + Div1 + + + Div2 + + + + + Plus1 + + + Plus2 + + + + + IntRectFromTopLeftAndBottomRight + + + IntRectFromOffsetAndSize + + + + ToSp + + + ToSp1 + + + ToSp + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml index 638cde2e8..a1e71f9d1 100644 --- a/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml index 638cde2e8..8341375df 100644 --- a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,10 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml index 638cde2e8..9aa0a6bfc 100644 --- a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,141 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.xml index 9495e200d..208a5c9a6 100644 --- a/source/androidx.compose.ui/ui/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.xml @@ -1,3 +1,59 @@  + + ToSp + + + ToSp1 + + + + Times1 + + + + + + + + + Java.Lang.Object + + + + + \ No newline at end of file diff --git a/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml b/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml index 1ecc5cfff..df04441a6 100644 --- a/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.profileinstaller/profileinstaller/Transforms/Metadata.Namespaces.xml @@ -1,17 +1,12 @@  - AndroidX.ProfileInstaller + AndroidX.ProfileInstallers diff --git a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props index f51c7f77b..d26fb7b9a 100644 --- a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props +++ b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props @@ -146,6 +146,7 @@ <_AndroidXAssembly Include="Xamarin.AndroidX.Loader" /> <_AndroidXAssembly Include="Xamarin.AndroidX.LocalBroadcastManager" /> <_AndroidXAssembly Include="Xamarin.AndroidX.Media" /> + <_AndroidXAssembly Include="Xamarin.AndroidX.Media2.Widget" /> <_AndroidXAssembly Include="Xamarin.AndroidX.MediaRouter" /> <_AndroidXAssembly Include="Xamarin.AndroidX.MultiDex" /> <_AndroidXAssembly Include="Xamarin.AndroidX.Palette" /> @@ -174,6 +175,8 @@ <_AndroidXAssembly Include="Xamarin.AndroidX.WebKit" /> <_AndroidXAssembly Include="Xamarin.AndroidX.Work.Runtime" /> <_AndroidXAssembly Include="Xamarin.Google.Android.Material" /> + <_AndroidXAssembly Include="Xamarin.Jetbrains.Annotations" /> + <_AndroidXAssembly Include="Xamarin.Kotlin.StdLib" /> @@ -201,6 +204,25 @@ <_AndroidXMavenArtifact Include="androidx.cardview.cardview" /> <_AndroidXMavenArtifact Include="androidx.collection.collection" /> <_AndroidXMavenArtifact Include="androidx.collection.collection-ktx" /> + <_AndroidXMavenArtifact Include="androidx.compose.animation.animation" /> + <_AndroidXMavenArtifact Include="androidx.compose.animation.animation-core" /> + <_AndroidXMavenArtifact Include="androidx.compose.foundation.foundation" /> + <_AndroidXMavenArtifact Include="androidx.compose.foundation.foundation-layout" /> + <_AndroidXMavenArtifact Include="androidx.compose.material.material" /> + <_AndroidXMavenArtifact Include="androidx.compose.material.material-icons-core" /> + <_AndroidXMavenArtifact Include="androidx.compose.material.material-icons-extended" /> + <_AndroidXMavenArtifact Include="androidx.compose.material.material-ripple" /> + <_AndroidXMavenArtifact Include="androidx.compose.runtime.runtime" /> + <_AndroidXMavenArtifact Include="androidx.compose.runtime.runtime-livedata" /> + <_AndroidXMavenArtifact Include="androidx.compose.runtime.runtime-rxjava2" /> + <_AndroidXMavenArtifact Include="androidx.compose.runtime.runtime-saveable" /> + <_AndroidXMavenArtifact Include="androidx.compose.ui.ui" /> + <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-geometry" /> + <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-graphics" /> + <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-text" /> + <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-unit" /> + <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-util" /> + <_AndroidXMavenArtifact Include="androidx.compose.ui.ui-viewbinding" /> <_AndroidXMavenArtifact Include="androidx.concurrent.concurrent-futures" /> <_AndroidXMavenArtifact Include="androidx.constraintlayout.constraintlayout" /> <_AndroidXMavenArtifact Include="androidx.constraintlayout.constraintlayout-core" /> @@ -281,6 +303,7 @@ <_AndroidXMavenArtifact Include="androidx.preference.preference" /> <_AndroidXMavenArtifact Include="androidx.preference.preference-ktx" /> <_AndroidXMavenArtifact Include="androidx.print.print" /> + <_AndroidXMavenArtifact Include="androidx.profileinstaller.profileinstaller" /> <_AndroidXMavenArtifact Include="androidx.recommendation.recommendation" /> <_AndroidXMavenArtifact Include="androidx.recyclerview.recyclerview" /> <_AndroidXMavenArtifact Include="androidx.recyclerview.recyclerview-selection" /> @@ -326,7 +349,11 @@ <_AndroidXMavenArtifact Include="io.reactivex.rxjava2.rxjava" /> <_AndroidXMavenArtifact Include="io.reactivex.rxjava3.rxjava" /> <_AndroidXMavenArtifact Include="org.jetbrains.annotations" /> + <_AndroidXMavenArtifact Include="org.jetbrains.kotlin.kotlin-reflect" /> <_AndroidXMavenArtifact Include="org.jetbrains.kotlin.kotlin-stdlib" /> + <_AndroidXMavenArtifact Include="org.jetbrains.kotlin.kotlin-stdlib-common" /> + <_AndroidXMavenArtifact Include="org.jetbrains.kotlin.kotlin-stdlib-jdk7" /> + <_AndroidXMavenArtifact Include="org.jetbrains.kotlin.kotlin-stdlib-jdk8" /> <_AndroidXMavenArtifact Include="org.jetbrains.kotlinx.kotlinx-coroutines-android" /> <_AndroidXMavenArtifact Include="org.jetbrains.kotlinx.kotlinx-coroutines-core" /> <_AndroidXMavenArtifact Include="org.jetbrains.kotlinx.kotlinx-coroutines-core-jvm" /> From f0acdd5fd65613d6bc0ed0207638d0ec6ac4b5e7 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 4 Oct 2021 12:17:04 +0200 Subject: [PATCH 06/24] mappings updates --- mappings/androidx-assemblies.csv | 4 + mappings/androidx-mapping.csv | 4 + mappings/dependencies.json | 326 ++++++++++++++++++++++++++----- 3 files changed, 290 insertions(+), 44 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 094841283..576e7d373 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -11,11 +11,14 @@ Xamarin.Android.Arch.Lifecycle.Runtime,Xamarin.AndroidX.Lifecycle.Runtime,Xamari Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,Xamarin.Android.Arch.Lifecycle.ViewModel,Xamarin.AndroidX.Lifecycle.ViewModel,2.3.1.1 Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,Xamarin.Android.Arch.Persistence.Db,Xamarin.AndroidX.Sqlite,2.1.0.8 Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,Xamarin.Android.Arch.Persistence.Db.Framework,Xamarin.AndroidX.Sqlite.Framework,2.1.0.8 +Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,1.1.3.1 Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,2.3.0.2 Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,Xamarin.Android.Arch.Persistence.Room.Runtime,Xamarin.AndroidX.Room.Runtime,2.3.0.2 Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,Xamarin.Android.Arch.Work.Runtime,Xamarin.AndroidX.Work.Runtime,2.5.0.3 Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,Xamarin.Android.Support.Animated.Vector.Drawable,Xamarin.AndroidX.VectorDrawable.Animated,1.1.0.8 Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,1.2.0.1 +Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,1.1.3.1 +Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,13.0.0.4 Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,Xamarin.Android.Support.AsyncLayoutInflater,Xamarin.AndroidX.AsyncLayoutInflater,1.0.0.8 Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,Xamarin.Android.Support.Collections,Xamarin.AndroidX.Collection,1.1.0.8 Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,Xamarin.Android.Support.Compat,Xamarin.AndroidX.Core,1.6.0.1 @@ -32,6 +35,7 @@ Xamarin.Android.Support.CustomTabs,Xamarin.AndroidX.Browser,Xamarin.Android.Supp Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,Xamarin.Android.Support.CustomView,Xamarin.AndroidX.CustomView,1.1.0.7 Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,1.1.0.1 Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,1.4.0.2 +Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,1.5.30 Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,Xamarin.Android.Support.DocumentFile,Xamarin.AndroidX.DocumentFile,1.0.1.8 Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,Xamarin.Android.Support.DrawerLayout,Xamarin.AndroidX.DrawerLayout,1.1.1.3 Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,Xamarin.Android.Support.Dynamic.Animation,Xamarin.AndroidX.DynamicAnimation,1.0.0.8 diff --git a/mappings/androidx-mapping.csv b/mappings/androidx-mapping.csv index c70de60ce..3f28e2259 100644 --- a/mappings/androidx-mapping.csv +++ b/mappings/androidx-mapping.csv @@ -64,6 +64,8 @@ Android.Support.Annotation,IRestrictToInvoker,AndroidX.Annotations,IRestrictToIn Android.Support.Annotation,IAnimRes,AndroidX.Annotations,IAnimRes,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,AnimRes,androidx.annotation,AnimRes, Android.Support.Annotation,IAnimResInvoker,AndroidX.Annotations,IAnimResInvoker,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,AnimRes,androidx.annotation,AnimRes, Android.Support.Annotation,NullableAttribute,AndroidX.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, +Android.Support.Annotation,NullableAttribute,JetBrains.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,,,,, +Android.Support.Annotation,NullableAttribute,System.Runtime.CompilerServices,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,,,,, Android.Support.Annotation,IntRangeAttribute,AndroidX.Annotations,IntRangeAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,IdResAttribute,AndroidX.Annotations,IdResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,IFractionRes,AndroidX.Annotations,IFractionRes,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,FractionRes,androidx.annotation,FractionRes, @@ -1850,6 +1852,7 @@ Android.Arch.Persistence.Room,UpdateAttribute,AndroidX.Room,UpdateAttribute,Xama Android.Arch.Persistence.Room,ITypeConverter,AndroidX.Room,ITypeConverter,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,android.arch.persistence.room,TypeConverter,androidx.room,TypeConverter, Android.Arch.Persistence.Room,ITypeConverterInvoker,AndroidX.Room,ITypeConverterInvoker,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,android.arch.persistence.room,TypeConverter,androidx.room,TypeConverter, Android.Arch.Persistence.Room,EmbeddedAttribute,AndroidX.Room,EmbeddedAttribute,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,,,,, +Android.Arch.Persistence.Room,EmbeddedAttribute,Microsoft.CodeAnalysis,EmbeddedAttribute,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Media2.Widget,,,,, Android.Arch.Persistence.Room,ITransaction,AndroidX.Room,ITransaction,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,android.arch.persistence.room,Transaction,androidx.room,Transaction, Android.Arch.Persistence.Room,ITransactionInvoker,AndroidX.Room,ITransactionInvoker,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,android.arch.persistence.room,Transaction,androidx.room,Transaction, Android.Arch.Persistence.Room,TransactionAttribute,AndroidX.Room,TransactionAttribute,Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,,,,, @@ -2769,6 +2772,7 @@ Android.Support.Design.Internal,IExperimentalInvoker,Google.Android.Material.Int ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type com.google.android.material.bottomnavigation.BottomNavigationPresenter. ,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type com.google.android.material.bottomnavigation.BottomNavigationPresenter.SavedState. Android.Support.Design.Internal,ThemeEnforcement,Google.Android.Material.Internal,ThemeEnforcement,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ThemeEnforcement,com.google.android.material.internal,ThemeEnforcement, +Android.Support.Design.Internal,ExperimentalAttribute,Kotlin,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,,,,, Android.Support.Design.Internal,ExperimentalAttribute,AndroidX.Annotations.Experimental,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,,,,, Android.Support.Design.Internal,ExperimentalAttribute,Google.Android.Material.Internal,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,,,,, Android.Support.Design.Internal,NavigationMenuView,Google.Android.Material.Internal,NavigationMenuView,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,NavigationMenuView,com.google.android.material.internal,NavigationMenuView, diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 0ac12b5a7..6fedf00ce 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -118,7 +118,10 @@ }, { "id": "Xamarin.Kotlin.StdLib", - "dependencies": [] + "dependencies": [ + "Xamarin.Jetbrains.Annotations", + "Xamarin.Kotlin.StdLib.Common" + ] }, { "id": "Xamarin.AndroidX.Ads.Identifier", @@ -491,6 +494,253 @@ "Xamarin.Kotlin.StdLib" ] }, + { + "id": "Xamarin.AndroidX.Compose.Animation.Animation", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Animation.Animation.Core", + "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Geometry", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.Kotlin.StdLib.Common" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Animation.Animation.Core", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Unit", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.Kotlin.StdLib", + "Xamarin.KotlinX.Coroutines.Core" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.Kotlin.StdLib.Common" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Runtime.Runtime", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.Kotlin.StdLib", + "Xamarin.KotlinX.Coroutines.Android" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.UI.UI.Geometry", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.UI.UI.Util", + "dependencies": [ + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.UI.UI", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.AutoFill", + "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Geometry", + "Xamarin.AndroidX.Compose.UI.UI.Graphics", + "Xamarin.AndroidX.Compose.UI.UI.Text", + "Xamarin.AndroidX.Compose.UI.UI.Unit", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Lifecycle.Common.Java8", + "Xamarin.AndroidX.Lifecycle.Runtime", + "Xamarin.AndroidX.Lifecycle.ViewModel", + "Xamarin.AndroidX.ProfileInstaller.ProfileInstaller", + "Xamarin.AndroidX.SavedState", + "Xamarin.Kotlin.StdLib.Common", + "Xamarin.Kotlin.StdLib", + "Xamarin.KotlinX.Coroutines.Android", + "Xamarin.KotlinX.Coroutines.Core" + ] + }, + { + "id": "Xamarin.Kotlin.StdLib.Common", + "dependencies": [] + }, + { + "id": "Xamarin.AndroidX.Compose.UI.UI.Unit", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Geometry", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.KotlinX.Coroutines.Core", + "dependencies": [] + }, + { + "id": "Xamarin.AndroidX.Compose.Compose.Material.Material", + "dependencies": [ + "Xamarin.AndroidX.Compose.Animation.Animation.Core", + "Xamarin.AndroidX.Compose.Animation.Animation", + "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", + "Xamarin.AndroidX.Compose.Foundation.Foundation", + "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", + "Xamarin.AndroidX.Compose.Compose.Material.Material.Ripple", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Text", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.Kotlin.StdLib.Common" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Foundation.Foundation", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Animation.Animation", + "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Text", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.Kotlin.StdLib.Common" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", + "dependencies": [ + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Compose.Material.Material.Ripple", + "dependencies": [ + "Xamarin.AndroidX.Compose.Animation.Animation", + "Xamarin.AndroidX.Compose.Foundation.Foundation", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.Kotlin.StdLib.Common" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.UI.UI.Text", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Collection", + "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Graphics", + "Xamarin.AndroidX.Compose.UI.UI.Unit", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Core", + "Xamarin.Kotlin.StdLib.Common", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Compose.Material.Material.Icons.Extended", + "dependencies": [ + "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.Kotlin.StdLib.Common" + ] + }, + { + "id": "Xamarin.KotlinX.Coroutines.Android", + "dependencies": [] + }, + { + "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.LiveData", + "dependencies": [ + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.Lifecycle.LiveData", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.RxJava2", + "dependencies": [ + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.Kotlin.StdLib", + "Xamarin.Android.ReactiveX.RxJava" + ] + }, + { + "id": "Xamarin.Android.ReactiveX.RxJava", + "dependencies": [] + }, + { + "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.UI.UI.Graphics", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.UI.UI.Unit", + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.Kotlin.StdLib.Common" + ] + }, + { + "id": "Xamarin.AndroidX.ProfileInstaller.ProfileInstaller", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Startup.StartupRuntime" + ] + }, + { + "id": "Xamarin.AndroidX.Compose.UI.UI.ViewBinding", + "dependencies": [ + "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.DataBinding.ViewBinding", + "Xamarin.AndroidX.Fragment.Ktx", + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.AndroidX.DataBinding.ViewBinding", + "dependencies": [ + "Xamarin.AndroidX.Annotation" + ] + }, + { + "id": "Xamarin.AndroidX.Fragment.Ktx", + "dependencies": [ + "Xamarin.AndroidX.Activity.Ktx", + "Xamarin.AndroidX.Collection.Ktx", + "Xamarin.AndroidX.Core.Core.Ktx", + "Xamarin.AndroidX.Fragment", + "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx", + "Xamarin.AndroidX.Lifecycle.ViewModel.Ktx", + "Xamarin.AndroidX.SavedState.SavedState.Ktx", + "Xamarin.Kotlin.StdLib" + ] + }, { "id": "Xamarin.AndroidX.ConstraintLayout.Core", "dependencies": [] @@ -557,12 +807,6 @@ "Xamarin.AndroidX.Lifecycle.Runtime" ] }, - { - "id": "Xamarin.AndroidX.DataBinding.ViewBinding", - "dependencies": [ - "Xamarin.AndroidX.Annotation" - ] - }, { "id": "Xamarin.AndroidX.DocumentFile", "dependencies": [ @@ -626,19 +870,6 @@ "Xamarin.AndroidX.CustomView" ] }, - { - "id": "Xamarin.AndroidX.Fragment.Ktx", - "dependencies": [ - "Xamarin.AndroidX.Activity.Ktx", - "Xamarin.AndroidX.Collection.Ktx", - "Xamarin.AndroidX.Core.Core.Ktx", - "Xamarin.AndroidX.Fragment", - "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx", - "Xamarin.AndroidX.Lifecycle.ViewModel.Ktx", - "Xamarin.AndroidX.SavedState.SavedState.Ktx", - "Xamarin.Kotlin.StdLib" - ] - }, { "id": "Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx", "dependencies": [ @@ -783,10 +1014,6 @@ "Xamarin.KotlinX.Coroutines.Core" ] }, - { - "id": "Xamarin.KotlinX.Coroutines.Core", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencies": [ @@ -798,10 +1025,6 @@ "Xamarin.KotlinX.Coroutines.Android" ] }, - { - "id": "Xamarin.KotlinX.Coroutines.Android", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Lifecycle.ReactiveStreams.Ktx", "dependencies": [ @@ -857,10 +1080,6 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ @@ -987,15 +1206,11 @@ "dependencies": [ "Xamarin.AndroidX.Arch.Core.Runtime", "Xamarin.AndroidX.Paging.Common", - "Xamarin.Android.ReactiveX.RxJava", "Xamarin.Kotlin.StdLib", + "Xamarin.Android.ReactiveX.RxJava", "Xamarin.KotlinX.Coroutines.Rx2" ] }, - { - "id": "Xamarin.Android.ReactiveX.RxJava", - "dependencies": [] - }, { "id": "Xamarin.KotlinX.Coroutines.Rx2", "dependencies": [] @@ -1030,6 +1245,13 @@ "Xamarin.Kotlin.StdLib" ] }, + { + "id": "Xamarin.AndroidX.Startup.StartupRuntime", + "dependencies": [ + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Tracing.Tracing" + ] + }, { "id": "Xamarin.AndroidX.Recommendation", "dependencies": [ @@ -1144,13 +1366,6 @@ "Xamarin.AndroidX.Slice.Core" ] }, - { - "id": "Xamarin.AndroidX.Startup.StartupRuntime", - "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Tracing.Tracing" - ] - }, { "id": "Xamarin.AndroidX.TvProvider", "dependencies": [ @@ -1230,6 +1445,29 @@ "Xamarin.Kotlin.StdLib", "Xamarin.KotlinX.Coroutines.Android" ] + }, + { + "id": "Xamarin.Jetbrains.Annotations", + "dependencies": [] + }, + { + "id": "Xamarin.Kotlin.Reflect", + "dependencies": [ + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.Kotlin.StdLib.Jdk7", + "dependencies": [ + "Xamarin.Kotlin.StdLib" + ] + }, + { + "id": "Xamarin.Kotlin.StdLib.Jdk8", + "dependencies": [ + "Xamarin.Kotlin.StdLib.Jdk7", + "Xamarin.Kotlin.StdLib" + ] } ] } \ No newline at end of file From dbdaec364105d4e09dd614fc0179ea75a241d93c Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 4 Oct 2021 12:17:15 +0200 Subject: [PATCH 07/24] spell check for compose --- utilities.cake | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/utilities.cake b/utilities.cake index 7ad97873b..3e6991d50 100644 --- a/utilities.cake +++ b/utilities.cake @@ -17,7 +17,7 @@ List spell_errors = null; JArray binderator_json_array = null; Task ("spell-check") - .Does + .Does ( () => { @@ -36,7 +36,7 @@ Task ("spell-check") }; foreach(string file_dictionary in files_dictionaries) { - string url_full = url + System.Uri.EscapeDataString(file_dictionary); + string url_full = url + System.Uri.EscapeDataString(file_dictionary); Information($"Downloading "); Information($" {url_full}"); if (!FileExists($"./externals/{file_dictionary}")) @@ -116,6 +116,15 @@ Task ("spell-check") "WindowJava", "Startup", "StartupRuntime", + "MaterialIcons", + "Saveable", + "Util", + "ProfileInstaller", + "Kotlin", + "StdLib", + "Jdk7", + "Jdk8", + "Jetbrains", }; var dictionary_custom = WeCantSpell.Hunspell.WordList.CreateFromWords(words); @@ -169,7 +178,7 @@ Task ("spell-check") ); Task ("namespace-check") - .Does + .Does ( () => { @@ -209,7 +218,7 @@ Task("binderate-diff") EnsureDirectoryExists("./output/"); // "git diff -U999999 main:config.json config.json" > ./output/config.json.diff-from-main.txt" - string process = "git"; + string process = "git"; string process_args = "diff -U999999 main:config.json config.json"; IEnumerable redirectedStandardOutput; ProcessSettings process_settings = new ProcessSettings () @@ -225,7 +234,7 @@ Task("binderate-diff") Task ("api-diff-markdown-info-pr") .IsDependentOn("binderate-diff") - .Does + .Does ( () => { @@ -246,7 +255,7 @@ Task ("api-diff-markdown-info-pr") { idx_start = i; } - + if(line.Contains("dependencyOnly")) { if (line.StartsWith("-")) @@ -362,7 +371,7 @@ string ParseDiffLine(string line, string name) } Task ("api-diff-analysis") - .Does + .Does ( () => { @@ -418,8 +427,8 @@ Task ("read-analysis-files") .IsDependentOn ("api-diff-markdown-info-pr") .IsDependentOn ("namespace-check") .IsDependentOn ("spell-check") - .IsDependentOn ("api-diff-analysis") - .Does + .IsDependentOn ("api-diff-analysis") + .Does ( () => { @@ -457,7 +466,7 @@ Task("dependencies") ( () => { - if (!(binderator_json_array?.Count > 0)) + if (!(binderator_json_array?.Count > 0)) { using (StreamReader reader = System.IO.File.OpenText(@"./config.json")) { From 5cd36cf8b0513a7da63921295be64e14947f048a Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 5 Oct 2021 08:02:07 +0200 Subject: [PATCH 08/24] namespace fixes --- .../material-ripple/Transforms/Metadata.Namespaces.xml | 6 ++---- .../runtime-saveable/Transforms/Metadata.Namespaces.xml | 6 ++---- .../runtime/Transforms/Metadata.Namespaces.xml | 8 +++++++- .../window/Transforms/Metadata.Namespaces.xml | 7 ++++++- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml index 638cde2e8..baf9ec1c4 100644 --- a/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml index 638cde2e8..2cdc39404 100644 --- a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml index d6769723c..ed34c002f 100644 --- a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml @@ -76,5 +76,11 @@ > AndroidX.Compose.Runtime.Tooling - + + AndroidX.Compose.Runtime.external.KotlinX.Collections.Immutable.Internal + + \ No newline at end of file diff --git a/source/androidx.window/window/Transforms/Metadata.Namespaces.xml b/source/androidx.window/window/Transforms/Metadata.Namespaces.xml index 1ba07a4ad..c2a15f0c0 100644 --- a/source/androidx.window/window/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.window/window/Transforms/Metadata.Namespaces.xml @@ -13,5 +13,10 @@ > AndroidX.Window.Layout - + + AndroidX.Window.Core + \ No newline at end of file From 5cf8e35600dcc809d5f46a077cb0025ce4658387 Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 5 Oct 2021 08:15:12 +0200 Subject: [PATCH 09/24] mappings updates --- mappings/androidx-assemblies.csv | 4 - mappings/androidx-mapping.csv | 9 +- mappings/dependencies.json | 88 +++---------------- .../Xamarin.AndroidX.Migration.props | 2 - 4 files changed, 11 insertions(+), 92 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 3461f2dab..3dc58ea47 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -16,8 +16,6 @@ Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamari 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.6.0.2 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.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.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 @@ -35,8 +33,6 @@ Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xa 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.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.1.2 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 diff --git a/mappings/androidx-mapping.csv b/mappings/androidx-mapping.csv index 07e4ae72f..3f28e2259 100644 --- a/mappings/androidx-mapping.csv +++ b/mappings/androidx-mapping.csv @@ -57,8 +57,6 @@ Android.Support.Annotation,IIdResInvoker,AndroidX.Annotations,IIdResInvoker,Xama Android.Support.Annotation,AnimResAttribute,AndroidX.Annotations,AnimResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,InterpolatorResAttribute,AndroidX.Annotations,InterpolatorResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,NonNullAttribute,AndroidX.Annotations,NonNullAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, -Android.Support.Annotation,NonNullAttribute,ReactiveX.RxJava3.Annotations,NonNullAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,,,,, -Android.Support.Annotation,NonNullAttribute,ReactiveX.Annotations,NonNullAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,,,,, Android.Support.Annotation,ColorLongAttribute,AndroidX.Annotations,ColorLongAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,RestrictToScope,AndroidX.Annotations,RestrictToScope,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,RestrictTo.Scope,androidx.annotation,RestrictTo.Scope, Android.Support.Annotation,IRestrictTo,AndroidX.Annotations,IRestrictTo,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,RestrictTo,androidx.annotation,RestrictTo, @@ -67,8 +65,6 @@ Android.Support.Annotation,IAnimRes,AndroidX.Annotations,IAnimRes,Xamarin.Androi Android.Support.Annotation,IAnimResInvoker,AndroidX.Annotations,IAnimResInvoker,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,AnimRes,androidx.annotation,AnimRes, Android.Support.Annotation,NullableAttribute,AndroidX.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,NullableAttribute,JetBrains.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,,,,, -Android.Support.Annotation,NullableAttribute,ReactiveX.RxJava3.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,,,,, -Android.Support.Annotation,NullableAttribute,ReactiveX.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,,,,, Android.Support.Annotation,NullableAttribute,System.Runtime.CompilerServices,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,,,,, Android.Support.Annotation,IntRangeAttribute,AndroidX.Annotations,IntRangeAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,IdResAttribute,AndroidX.Annotations,IdResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, @@ -167,7 +163,6 @@ Android.Support.Annotation,IVisibleForTesting,AndroidX.Annotations,IVisibleForTe Android.Support.Annotation,IVisibleForTestingInvoker,AndroidX.Annotations,IVisibleForTestingInvoker,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,VisibleForTesting,androidx.annotation,VisibleForTesting, Android.Support.Annotation,DimenResAttribute,AndroidX.Annotations,DimenResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,VisibleForTestingAttribute,AndroidX.Annotations,VisibleForTestingAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, -Android.Support.Annotation,VisibleForTestingAttribute,JetBrains.Annotations,VisibleForTestingAttribute,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,,,,, Android.Arch.Core.Util,IFunction,AndroidX.Arch.Core.Util,IFunction,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,android.arch.core.util,Function,androidx.arch.core.util,Function, Android.Arch.Core.Util,IFunctionInvoker,AndroidX.Arch.Core.Util,IFunctionInvoker,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,android.arch.core.util,Function,androidx.arch.core.util,Function, Android.Arch.Core.Internal,SafeIterableMap,AndroidX.Arch.Core.Internal,SafeIterableMap,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,android.arch.core.internal,SafeIterableMap,androidx.arch.core.internal,SafeIterableMap, @@ -2780,8 +2775,6 @@ Android.Support.Design.Internal,ThemeEnforcement,Google.Android.Material.Interna Android.Support.Design.Internal,ExperimentalAttribute,Kotlin,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,,,,, Android.Support.Design.Internal,ExperimentalAttribute,AndroidX.Annotations.Experimental,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,,,,, Android.Support.Design.Internal,ExperimentalAttribute,Google.Android.Material.Internal,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,,,,, -Android.Support.Design.Internal,ExperimentalAttribute,ReactiveX.RxJava3.Annotations,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,,,,, -Android.Support.Design.Internal,ExperimentalAttribute,ReactiveX.Annotations,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,,,,, Android.Support.Design.Internal,NavigationMenuView,Google.Android.Material.Internal,NavigationMenuView,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,NavigationMenuView,com.google.android.material.internal,NavigationMenuView, Android.Support.Design.Internal,ScrimInsetsFrameLayout,Google.Android.Material.Internal,ScrimInsetsFrameLayout,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ScrimInsetsFrameLayout,com.google.android.material.internal,ScrimInsetsFrameLayout, Android.Support.Design.Internal,ForegroundLinearLayout,Google.Android.Material.Internal,ForegroundLinearLayout,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ForegroundLinearLayout,com.google.android.material.internal,ForegroundLinearLayout, @@ -2880,7 +2873,7 @@ Android.Support.Wear.Widget,BoxInsetLayout.LayoutParams.IBoxedEdges,AndroidX.Wea Android.Support.Wear.Widget,BoxInsetLayout.LayoutParams.IBoxedEdgesInvoker,AndroidX.Wear.Widget,BoxInsetLayout.LayoutParams.IBoxedEdgesInvoker,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,BoxInsetLayout.LayoutParams.BoxedEdges,androidx.wear.widget,BoxInsetLayout.LayoutParams.BoxedEdges, Android.Support.Wear.Widget,CircledImageView,AndroidX.Wear.Widget,CircledImageView,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircledImageView,androidx.wear.widget,CircledImageView, Android.Support.Wear.Widget,SimpleAnimatorListener,AndroidX.Wear.Widget,SimpleAnimatorListener,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,SimpleAnimatorListener,androidx.wear.widget,SimpleAnimatorListener, -,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.wear.widget.SwipeDismissLayout. +Android.Support.Wear.Widget,SwipeDismissLayout,AndroidX.Wear.Widget,SwipeDismissLayout,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,SwipeDismissLayout,androidx.wear.widget,SwipeDismissLayout, Android.Support.Wear.Widget,CircularProgressLayout,AndroidX.Wear.Widget,CircularProgressLayout,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircularProgressLayout,androidx.wear.widget,CircularProgressLayout, Android.Support.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListener,AndroidX.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListener,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircularProgressLayout.OnTimerFinishedListener,androidx.wear.widget,CircularProgressLayout.OnTimerFinishedListener, Android.Support.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListenerInvoker,AndroidX.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListenerInvoker,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircularProgressLayout.OnTimerFinishedListener,androidx.wear.widget,CircularProgressLayout.OnTimerFinishedListener, diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 8f980737e..6fedf00ce 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1,25 +1,5 @@ { "packages": [ - { - "id": "GoogleGson", - "dependencies": [] - }, - { - "id": "Xamarin.Android.ReactiveStreams", - "dependencies": [] - }, - { - "id": "Xamarin.Android.ReactiveX.RxJava", - "dependencies": [ - "Xamarin.Android.ReactiveStreams" - ] - }, - { - "id": "Xamarin.Android.ReactiveX.RxJava3.RxJava", - "dependencies": [ - "Xamarin.Android.ReactiveStreams" - ] - }, { "id": "Xamarin.AndroidX.Activity", "dependencies": [ @@ -796,16 +776,9 @@ "id": "Xamarin.AndroidX.Core.GoogleShortcuts", "dependencies": [ "Xamarin.AndroidX.Core", - "Xamarin.Google.Crypto.Tink.Android", "Xamarin.Firebase.AppIndexing" ] }, - { - "id": "Xamarin.Google.Crypto.Tink.Android", - "dependencies": [ - "GoogleGson" - ] - }, { "id": "Xamarin.Firebase.AppIndexing", "dependencies": [] @@ -1041,12 +1014,6 @@ "Xamarin.KotlinX.Coroutines.Core" ] }, - { - "id": "Xamarin.KotlinX.Coroutines.Core", - "dependencies": [ - "Xamarin.KotlinX.Coroutines.Core.Jvm" - ] - }, { "id": "Xamarin.AndroidX.Lifecycle.ReactiveStreams", "dependencies": [ @@ -1055,7 +1022,7 @@ "Xamarin.AndroidX.Lifecycle.Common", "Xamarin.AndroidX.Lifecycle.LiveData", "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.Android.ReactiveStreams" + "Xamarin.KotlinX.Coroutines.Android" ] }, { @@ -1065,20 +1032,11 @@ "Xamarin.Kotlin.StdLib" ] }, - { - "id": "Xamarin.KotlinX.Coroutines.Android", - "dependencies": [ - "Xamarin.Kotlin.StdLib.Jdk8", - "Xamarin.KotlinX.Coroutines.Core.Jvm" - ] - }, { "id": "Xamarin.AndroidX.Media2.Common", "dependencies": [ - "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Concurrent.Futures", - "Xamarin.AndroidX.Core", "Xamarin.AndroidX.Media", "Xamarin.AndroidX.VersionedParcelable", "Xamarin.Google.Guava.ListenableFuture" @@ -1214,10 +1172,7 @@ }, { "id": "Xamarin.KotlinX.Coroutines.Core.Jvm", - "dependencies": [ - "Xamarin.Kotlin.StdLib.Common", - "Xamarin.Kotlin.StdLib.Jdk8" - ] + "dependencies": [] }, { "id": "Xamarin.AndroidX.Paging.Common.Ktx", @@ -1258,12 +1213,7 @@ }, { "id": "Xamarin.KotlinX.Coroutines.Rx2", - "dependencies": [ - "Xamarin.Android.ReactiveX.RxJava", - "Xamarin.Kotlin.StdLib.Jdk8", - "Xamarin.KotlinX.Coroutines.Core.Jvm", - "Xamarin.KotlinX.Coroutines.Reactive" - ] + "dependencies": [] }, { "id": "Xamarin.AndroidX.Paging.RxJava2.Ktx", @@ -1370,6 +1320,10 @@ "Xamarin.Android.ReactiveX.RxJava3.RxJava" ] }, + { + "id": "Xamarin.Android.ReactiveX.RxJava3.RxJava", + "dependencies": [] + }, { "id": "Xamarin.AndroidX.Sqlite.Framework", "dependencies": [ @@ -1386,8 +1340,7 @@ { "id": "Xamarin.AndroidX.Security.SecurityCrypto", "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.Google.Crypto.Tink.Android" + "Xamarin.AndroidX.Annotation" ] }, { @@ -1434,12 +1387,11 @@ "id": "Xamarin.AndroidX.Wear", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Core.Core.Ktx", + "Xamarin.AndroidX.ConstraintLayout", "Xamarin.AndroidX.Core", "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.RecyclerView", - "Xamarin.AndroidX.SwipeRefreshLayout", - "Xamarin.AndroidX.VersionedParcelable" + "Xamarin.AndroidX.SwipeRefreshLayout" ] }, { @@ -1483,7 +1435,6 @@ "Xamarin.AndroidX.Room.Runtime", "Xamarin.AndroidX.Sqlite.Framework", "Xamarin.AndroidX.Sqlite", - "Xamarin.AndroidX.Startup.StartupRuntime", "Xamarin.Google.Guava.ListenableFuture" ] }, @@ -1505,10 +1456,6 @@ "Xamarin.Kotlin.StdLib" ] }, - { - "id": "Xamarin.Kotlin.StdLib.Common", - "dependencies": [] - }, { "id": "Xamarin.Kotlin.StdLib.Jdk7", "dependencies": [ @@ -1521,21 +1468,6 @@ "Xamarin.Kotlin.StdLib.Jdk7", "Xamarin.Kotlin.StdLib" ] - }, - { - "id": "Xamarin.KotlinX.Coroutines.Jdk8", - "dependencies": [ - "Xamarin.Kotlin.StdLib.Jdk8", - "Xamarin.KotlinX.Coroutines.Core.Jvm" - ] - }, - { - "id": "Xamarin.KotlinX.Coroutines.Reactive", - "dependencies": [ - "Xamarin.Kotlin.StdLib.Jdk8", - "Xamarin.KotlinX.Coroutines.Core.Jvm", - "Xamarin.Android.ReactiveStreams" - ] } ] } \ 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 9074fd210..51ee46460 100644 --- a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props +++ b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props @@ -99,8 +99,6 @@ - <_AndroidXAssembly Include="Xamarin.Android.ReactiveX.RxJava" /> - <_AndroidXAssembly Include="Xamarin.Android.ReactiveX.RxJava3.RxJava" /> <_AndroidXAssembly Include="Xamarin.AndroidX.Annotation" /> <_AndroidXAssembly Include="Xamarin.AndroidX.Annotation.Experimental" /> <_AndroidXAssembly Include="Xamarin.AndroidX.AppCompat" /> From d182c9888b51e20870fb21a02c53f1f2ad683add Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 25 Oct 2021 13:35:08 +0200 Subject: [PATCH 10/24] metadata --- .../animation/Transforms/Metadata.Namespaces.xml | 6 ++---- .../runtime-livedata/Transforms/Metadata.Namespaces.xml | 6 ++---- .../runtime-rxjava2/Transforms/Metadata.Namespaces.xml | 6 ++---- .../ui-text/Transforms/Metadata.Namespaces.xml | 8 +++++++- .../ui/Transforms/Metadata.Namespaces.xml | 6 ++++++ 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml index 638cde2e8..682e7006e 100644 --- a/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml index 638cde2e8..df5eab517 100644 --- a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml index 638cde2e8..c5fb259d7 100644 --- a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml @@ -1,11 +1,9 @@  - \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml index c8ba31312..3281e7f0b 100644 --- a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml @@ -53,11 +53,17 @@ > AndroidX.Compose.UI.Text.Platform.Extensions + + AndroidX.Compose.UI.Text.Android.Style + AndroidX.Compose.UI.Text.Style - + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml index 9aa0a6bfc..3ee8c3b5e 100644 --- a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml @@ -65,6 +65,12 @@ > AndroidX.Compose.UI.Input.NestedScroll + + AndroidX.Compose.UI.Input.Pointer + Date: Mon, 25 Oct 2021 13:35:16 +0200 Subject: [PATCH 11/24] mappings --- mappings/androidx-assemblies.csv | 4 ++ mappings/androidx-mapping.csv | 9 ++- mappings/dependencies.json | 96 +++++++++++++++++++++++++------- 3 files changed, 89 insertions(+), 20 deletions(-) diff --git a/mappings/androidx-assemblies.csv b/mappings/androidx-assemblies.csv index 3dc58ea47..3461f2dab 100644 --- a/mappings/androidx-assemblies.csv +++ b/mappings/androidx-assemblies.csv @@ -16,6 +16,8 @@ Xamarin.Android.Arch.Persistence.Room.Common,Xamarin.AndroidX.Room.Common,Xamari 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.6.0.2 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.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.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 @@ -33,6 +35,8 @@ Xamarin.Android.Support.Core.Utils,Xamarin.AndroidX.Legacy.Support.Core.Utils,Xa 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.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.1.2 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 diff --git a/mappings/androidx-mapping.csv b/mappings/androidx-mapping.csv index 3f28e2259..07e4ae72f 100644 --- a/mappings/androidx-mapping.csv +++ b/mappings/androidx-mapping.csv @@ -57,6 +57,8 @@ Android.Support.Annotation,IIdResInvoker,AndroidX.Annotations,IIdResInvoker,Xama Android.Support.Annotation,AnimResAttribute,AndroidX.Annotations,AnimResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,InterpolatorResAttribute,AndroidX.Annotations,InterpolatorResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,NonNullAttribute,AndroidX.Annotations,NonNullAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, +Android.Support.Annotation,NonNullAttribute,ReactiveX.RxJava3.Annotations,NonNullAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,,,,, +Android.Support.Annotation,NonNullAttribute,ReactiveX.Annotations,NonNullAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,,,,, Android.Support.Annotation,ColorLongAttribute,AndroidX.Annotations,ColorLongAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,RestrictToScope,AndroidX.Annotations,RestrictToScope,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,RestrictTo.Scope,androidx.annotation,RestrictTo.Scope, Android.Support.Annotation,IRestrictTo,AndroidX.Annotations,IRestrictTo,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,RestrictTo,androidx.annotation,RestrictTo, @@ -65,6 +67,8 @@ Android.Support.Annotation,IAnimRes,AndroidX.Annotations,IAnimRes,Xamarin.Androi Android.Support.Annotation,IAnimResInvoker,AndroidX.Annotations,IAnimResInvoker,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,AnimRes,androidx.annotation,AnimRes, Android.Support.Annotation,NullableAttribute,AndroidX.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,NullableAttribute,JetBrains.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,,,,, +Android.Support.Annotation,NullableAttribute,ReactiveX.RxJava3.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava3.RxJava,,,,, +Android.Support.Annotation,NullableAttribute,ReactiveX.Annotations,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.Android.ReactiveX.RxJava,,,,, Android.Support.Annotation,NullableAttribute,System.Runtime.CompilerServices,NullableAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Media2.Widget,,,,, Android.Support.Annotation,IntRangeAttribute,AndroidX.Annotations,IntRangeAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,IdResAttribute,AndroidX.Annotations,IdResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, @@ -163,6 +167,7 @@ Android.Support.Annotation,IVisibleForTesting,AndroidX.Annotations,IVisibleForTe Android.Support.Annotation,IVisibleForTestingInvoker,AndroidX.Annotations,IVisibleForTestingInvoker,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,android.support.annotation,VisibleForTesting,androidx.annotation,VisibleForTesting, Android.Support.Annotation,DimenResAttribute,AndroidX.Annotations,DimenResAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, Android.Support.Annotation,VisibleForTestingAttribute,AndroidX.Annotations,VisibleForTestingAttribute,Xamarin.Android.Support.Annotations,Xamarin.AndroidX.Annotation,,,,, +Android.Support.Annotation,VisibleForTestingAttribute,JetBrains.Annotations,VisibleForTestingAttribute,Xamarin.Android.Support.Annotations,Xamarin.Jetbrains.Annotations,,,,, Android.Arch.Core.Util,IFunction,AndroidX.Arch.Core.Util,IFunction,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,android.arch.core.util,Function,androidx.arch.core.util,Function, Android.Arch.Core.Util,IFunctionInvoker,AndroidX.Arch.Core.Util,IFunctionInvoker,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,android.arch.core.util,Function,androidx.arch.core.util,Function, Android.Arch.Core.Internal,SafeIterableMap,AndroidX.Arch.Core.Internal,SafeIterableMap,Xamarin.Android.Arch.Core.Common,Xamarin.AndroidX.Arch.Core.Common,android.arch.core.internal,SafeIterableMap,androidx.arch.core.internal,SafeIterableMap, @@ -2775,6 +2780,8 @@ Android.Support.Design.Internal,ThemeEnforcement,Google.Android.Material.Interna Android.Support.Design.Internal,ExperimentalAttribute,Kotlin,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Kotlin.StdLib,,,,, Android.Support.Design.Internal,ExperimentalAttribute,AndroidX.Annotations.Experimental,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.AndroidX.Annotation.Experimental,,,,, Android.Support.Design.Internal,ExperimentalAttribute,Google.Android.Material.Internal,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,,,,, +Android.Support.Design.Internal,ExperimentalAttribute,ReactiveX.RxJava3.Annotations,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava3.RxJava,,,,, +Android.Support.Design.Internal,ExperimentalAttribute,ReactiveX.Annotations,ExperimentalAttribute,Xamarin.Android.Support.Design,Xamarin.Android.ReactiveX.RxJava,,,,, Android.Support.Design.Internal,NavigationMenuView,Google.Android.Material.Internal,NavigationMenuView,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,NavigationMenuView,com.google.android.material.internal,NavigationMenuView, Android.Support.Design.Internal,ScrimInsetsFrameLayout,Google.Android.Material.Internal,ScrimInsetsFrameLayout,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ScrimInsetsFrameLayout,com.google.android.material.internal,ScrimInsetsFrameLayout, Android.Support.Design.Internal,ForegroundLinearLayout,Google.Android.Material.Internal,ForegroundLinearLayout,Xamarin.Android.Support.Design,Xamarin.Google.Android.Material,android.support.design.internal,ForegroundLinearLayout,com.google.android.material.internal,ForegroundLinearLayout, @@ -2873,7 +2880,7 @@ Android.Support.Wear.Widget,BoxInsetLayout.LayoutParams.IBoxedEdges,AndroidX.Wea Android.Support.Wear.Widget,BoxInsetLayout.LayoutParams.IBoxedEdgesInvoker,AndroidX.Wear.Widget,BoxInsetLayout.LayoutParams.IBoxedEdgesInvoker,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,BoxInsetLayout.LayoutParams.BoxedEdges,androidx.wear.widget,BoxInsetLayout.LayoutParams.BoxedEdges, Android.Support.Wear.Widget,CircledImageView,AndroidX.Wear.Widget,CircledImageView,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircledImageView,androidx.wear.widget,CircledImageView, Android.Support.Wear.Widget,SimpleAnimatorListener,AndroidX.Wear.Widget,SimpleAnimatorListener,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,SimpleAnimatorListener,androidx.wear.widget,SimpleAnimatorListener, -Android.Support.Wear.Widget,SwipeDismissLayout,AndroidX.Wear.Widget,SwipeDismissLayout,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,SwipeDismissLayout,androidx.wear.widget,SwipeDismissLayout, +,,,,,,,,,,WARNING: Unable to find AndroidX type for Java type androidx.wear.widget.SwipeDismissLayout. Android.Support.Wear.Widget,CircularProgressLayout,AndroidX.Wear.Widget,CircularProgressLayout,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircularProgressLayout,androidx.wear.widget,CircularProgressLayout, Android.Support.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListener,AndroidX.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListener,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircularProgressLayout.OnTimerFinishedListener,androidx.wear.widget,CircularProgressLayout.OnTimerFinishedListener, Android.Support.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListenerInvoker,AndroidX.Wear.Widget,CircularProgressLayout.IOnTimerFinishedListenerInvoker,Xamarin.Android.Support.Wear,Xamarin.AndroidX.Wear,android.support.wear.widget,CircularProgressLayout.OnTimerFinishedListener,androidx.wear.widget,CircularProgressLayout.OnTimerFinishedListener, diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 6fedf00ce..9b1776895 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1,5 +1,25 @@ { "packages": [ + { + "id": "GoogleGson", + "dependencies": [] + }, + { + "id": "Xamarin.Android.ReactiveStreams", + "dependencies": [] + }, + { + "id": "Xamarin.Android.ReactiveX.RxJava", + "dependencies": [ + "Xamarin.Android.ReactiveStreams" + ] + }, + { + "id": "Xamarin.Android.ReactiveX.RxJava3.RxJava", + "dependencies": [ + "Xamarin.Android.ReactiveStreams" + ] + }, { "id": "Xamarin.AndroidX.Activity", "dependencies": [ @@ -591,7 +611,9 @@ }, { "id": "Xamarin.KotlinX.Coroutines.Core", - "dependencies": [] + "dependencies": [ + "Xamarin.KotlinX.Coroutines.Core.Jvm" + ] }, { "id": "Xamarin.AndroidX.Compose.Compose.Material.Material", @@ -664,7 +686,10 @@ }, { "id": "Xamarin.KotlinX.Coroutines.Android", - "dependencies": [] + "dependencies": [ + "Xamarin.Kotlin.StdLib.Jdk8", + "Xamarin.KotlinX.Coroutines.Core.Jvm" + ] }, { "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.LiveData", @@ -679,14 +704,10 @@ "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.RxJava2", "dependencies": [ "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.Kotlin.StdLib", - "Xamarin.Android.ReactiveX.RxJava" + "Xamarin.Android.ReactiveX.RxJava", + "Xamarin.Kotlin.StdLib" ] }, - { - "id": "Xamarin.Android.ReactiveX.RxJava", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", "dependencies": [ @@ -776,9 +797,16 @@ "id": "Xamarin.AndroidX.Core.GoogleShortcuts", "dependencies": [ "Xamarin.AndroidX.Core", + "Xamarin.Google.Crypto.Tink.Android", "Xamarin.Firebase.AppIndexing" ] }, + { + "id": "Xamarin.Google.Crypto.Tink.Android", + "dependencies": [ + "GoogleGson" + ] + }, { "id": "Xamarin.Firebase.AppIndexing", "dependencies": [] @@ -1022,7 +1050,8 @@ "Xamarin.AndroidX.Lifecycle.Common", "Xamarin.AndroidX.Lifecycle.LiveData", "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.KotlinX.Coroutines.Android" + "Xamarin.KotlinX.Coroutines.Android", + "Xamarin.Android.ReactiveStreams" ] }, { @@ -1039,7 +1068,9 @@ "Xamarin.AndroidX.Concurrent.Futures", "Xamarin.AndroidX.Media", "Xamarin.AndroidX.VersionedParcelable", - "Xamarin.Google.Guava.ListenableFuture" + "Xamarin.Google.Guava.ListenableFuture", + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Core" ] }, { @@ -1080,6 +1111,10 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, + { + "id": "Xamarin.AndroidX.Migration.Tool", + "dependencies": [] + }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ @@ -1172,7 +1207,10 @@ }, { "id": "Xamarin.KotlinX.Coroutines.Core.Jvm", - "dependencies": [] + "dependencies": [ + "Xamarin.Kotlin.StdLib.Common", + "Xamarin.Kotlin.StdLib.Jdk8" + ] }, { "id": "Xamarin.AndroidX.Paging.Common.Ktx", @@ -1213,7 +1251,12 @@ }, { "id": "Xamarin.KotlinX.Coroutines.Rx2", - "dependencies": [] + "dependencies": [ + "Xamarin.Android.ReactiveX.RxJava", + "Xamarin.Kotlin.StdLib.Jdk8", + "Xamarin.KotlinX.Coroutines.Core.Jvm", + "Xamarin.KotlinX.Coroutines.Reactive" + ] }, { "id": "Xamarin.AndroidX.Paging.RxJava2.Ktx", @@ -1320,10 +1363,6 @@ "Xamarin.Android.ReactiveX.RxJava3.RxJava" ] }, - { - "id": "Xamarin.Android.ReactiveX.RxJava3.RxJava", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Sqlite.Framework", "dependencies": [ @@ -1340,7 +1379,8 @@ { "id": "Xamarin.AndroidX.Security.SecurityCrypto", "dependencies": [ - "Xamarin.AndroidX.Annotation" + "Xamarin.AndroidX.Annotation", + "Xamarin.Google.Crypto.Tink.Android" ] }, { @@ -1391,7 +1431,9 @@ "Xamarin.AndroidX.Core", "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.RecyclerView", - "Xamarin.AndroidX.SwipeRefreshLayout" + "Xamarin.AndroidX.SwipeRefreshLayout", + "Xamarin.AndroidX.Core.Core.Ktx", + "Xamarin.AndroidX.VersionedParcelable" ] }, { @@ -1435,7 +1477,8 @@ "Xamarin.AndroidX.Room.Runtime", "Xamarin.AndroidX.Sqlite.Framework", "Xamarin.AndroidX.Sqlite", - "Xamarin.Google.Guava.ListenableFuture" + "Xamarin.Google.Guava.ListenableFuture", + "Xamarin.AndroidX.Startup.StartupRuntime" ] }, { @@ -1468,6 +1511,21 @@ "Xamarin.Kotlin.StdLib.Jdk7", "Xamarin.Kotlin.StdLib" ] + }, + { + "id": "Xamarin.KotlinX.Coroutines.Jdk8", + "dependencies": [ + "Xamarin.Kotlin.StdLib.Jdk8", + "Xamarin.KotlinX.Coroutines.Core.Jvm" + ] + }, + { + "id": "Xamarin.KotlinX.Coroutines.Reactive", + "dependencies": [ + "Xamarin.Kotlin.StdLib.Jdk8", + "Xamarin.KotlinX.Coroutines.Core.Jvm", + "Xamarin.Android.ReactiveStreams" + ] } ] } \ No newline at end of file From f7535d9579b2ee7198f7b8bf63423877d975a7b9 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 25 Oct 2021 13:37:02 +0200 Subject: [PATCH 12/24] migration updates --- .../BuildTasks/Xamarin.AndroidX.Migration.props | 2 ++ source/migration/JetifierWrapper/.project | 11 +++++++++++ .../.settings/org.eclipse.buildship.core.prefs | 11 +++++++++++ 3 files changed, 24 insertions(+) diff --git a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props index 51ee46460..9074fd210 100644 --- a/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props +++ b/source/migration/BuildTasks/Xamarin.AndroidX.Migration.props @@ -99,6 +99,8 @@ + <_AndroidXAssembly Include="Xamarin.Android.ReactiveX.RxJava" /> + <_AndroidXAssembly Include="Xamarin.Android.ReactiveX.RxJava3.RxJava" /> <_AndroidXAssembly Include="Xamarin.AndroidX.Annotation" /> <_AndroidXAssembly Include="Xamarin.AndroidX.Annotation.Experimental" /> <_AndroidXAssembly Include="Xamarin.AndroidX.AppCompat" /> diff --git a/source/migration/JetifierWrapper/.project b/source/migration/JetifierWrapper/.project index a6cfd8bb5..0b7912cf6 100644 --- a/source/migration/JetifierWrapper/.project +++ b/source/migration/JetifierWrapper/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.buildship.core.gradleprojectnature + + + 1633513535677 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/source/migration/JetifierWrapper/.settings/org.eclipse.buildship.core.prefs b/source/migration/JetifierWrapper/.settings/org.eclipse.buildship.core.prefs index e8895216f..b98b7efc3 100644 --- a/source/migration/JetifierWrapper/.settings/org.eclipse.buildship.core.prefs +++ b/source/migration/JetifierWrapper/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home=/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true From ba03e7d61fc48eae38a3008b440d6a0464b48ef9 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 25 Oct 2021 13:37:15 +0200 Subject: [PATCH 13/24] migration tests --- .../Aarxersise.Java.AndroidX/.project | 11 ++++++ .../org.eclipse.buildship.core.prefs | 11 ++++++ .../Aarxersise.Java.Support/.project | 11 ++++++ .../org.eclipse.buildship.core.prefs | 11 ++++++ .../Aarxersise.Java.Support/app/.classpath | 6 ++++ .../Aarxersise.Java.Support/app/.project | 34 +++++++++++++++++++ .../org.eclipse.buildship.core.prefs | 2 ++ 7 files changed, 86 insertions(+) create mode 100644 tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.classpath create mode 100644 tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.project create mode 100644 tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.settings/org.eclipse.buildship.core.prefs diff --git a/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.project b/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.project index d95ad70cb..dd9bde716 100644 --- a/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.project +++ b/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.project @@ -14,4 +14,15 @@ org.eclipse.buildship.core.gradleprojectnature + + + 1633513535654 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.settings/org.eclipse.buildship.core.prefs b/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.settings/org.eclipse.buildship.core.prefs index e8895216f..b98b7efc3 100644 --- a/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.settings/org.eclipse.buildship.core.prefs +++ b/tests/AndroidXMigrationTests/Aarxersise.Java.AndroidX/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home=/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.project b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.project index fed2d2c9b..676857150 100644 --- a/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.project +++ b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.project @@ -14,4 +14,15 @@ org.eclipse.buildship.core.gradleprojectnature + + + 1633513535658 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.settings/org.eclipse.buildship.core.prefs b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.settings/org.eclipse.buildship.core.prefs index e8895216f..b98b7efc3 100644 --- a/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.settings/org.eclipse.buildship.core.prefs +++ b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/.settings/org.eclipse.buildship.core.prefs @@ -1,2 +1,13 @@ +arguments= +auto.sync=false +build.scans.enabled=false +connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER) connection.project.dir= eclipse.preferences.version=1 +gradle.user.home= +java.home=/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home +jvm.arguments= +offline.mode=false +override.workspace.settings=true +show.console.view=true +show.executions.view=true diff --git a/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.classpath b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.classpath new file mode 100644 index 000000000..4a04201ca --- /dev/null +++ b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.classpath @@ -0,0 +1,6 @@ + + + + + + diff --git a/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.project b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.project new file mode 100644 index 000000000..656b307d0 --- /dev/null +++ b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.project @@ -0,0 +1,34 @@ + + + Aarxersise.Java.Support-app + Project Aarxersise.Java.Support-app created by Buildship. + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.buildship.core.gradleprojectnature + + + + 1633513535661 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.settings/org.eclipse.buildship.core.prefs b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.settings/org.eclipse.buildship.core.prefs new file mode 100644 index 000000000..b1886adb4 --- /dev/null +++ b/tests/AndroidXMigrationTests/Aarxersise.Java.Support/app/.settings/org.eclipse.buildship.core.prefs @@ -0,0 +1,2 @@ +connection.project.dir=.. +eclipse.preferences.version=1 From d1997a75a303cad0c1accad12e9fbb45bc57377b Mon Sep 17 00:00:00 2001 From: moljac Date: Tue, 26 Oct 2021 17:49:36 +0200 Subject: [PATCH 14/24] remove-node added to supress surfacing C# MCWs --- .../animation-core/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../animation/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../foundation/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../Transforms/Metadata.Namespaces.xml | 7 +++++++ .../Transforms/Metadata.Namespaces.xml | 7 +++++++ .../material-ripple/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../material/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../runtime-livedata/Additions/Additions.cs | 3 --- .../runtime-livedata/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../runtime-rxjava2/Additions/Additions.cs | 3 --- .../runtime-rxjava2/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../runtime-rxjava3/Additions/Additions.cs | 3 --- .../runtime-rxjava3/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../runtime-saveable/Additions/Additions.cs | 3 --- .../runtime-saveable/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../runtime/Additions/Additions.cs | 3 --- .../runtime/Transforms/Metadata.Namespaces.xml | 9 ++++++++- .../ui-geometry/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../ui-graphics/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../ui-text/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../ui-tooling-data/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../Transforms/Metadata.Namespaces.xml | 7 +++++++ .../ui-tooling/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../ui-unit/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../ui-util/Transforms/Metadata.Namespaces.xml | 7 +++++++ .../ui-viewbinding/Transforms/Metadata.Namespaces.xml | 6 ++++++ .../compose-runtime/Additions/Additions.cs | 4 ---- .../compose-runtime/Transforms/Metadata.Namespaces.xml | 8 +++++++- 28 files changed, 154 insertions(+), 21 deletions(-) diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml index cf0fc3b0b..dd08d703a 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml @@ -1,4 +1,11 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - AndroidX.Compose.Runtime.external.KotlinX.Collections.Immutable.Internal + AndroidX.Compose.Runtime.External.KotlinX.Collections.Immutable.Internal \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml index 8a72f3ce1..6941158eb 100644 --- a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml @@ -1,4 +1,11 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file From 8e36d8e565de8ffd18545863e6d695c6a1ee1ceb Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 27 Oct 2021 11:22:56 +0200 Subject: [PATCH 15/24] removed surfaced C# code (MCWs) --- ...X.Compose.Animation.Core.IAnimationSpec.cs | 2 + ...pose.Animation.Core.IDecayAnimationSpec.cs | 2 + ...ose.Animation.Core.IFiniteAnimationSpec.cs | 2 + ...e.Animation.Core.InfiniteRepeatableSpec.cs | 4 +- ...X.Compose.Animation.Core.RepeatableSpec.cs | 4 +- ...ndroidX.Compose.Animation.Core.SnapSpec.cs | 4 +- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 4 + .../Transforms/Metadata.Namespaces.xml | 30 ++++++-- .../Transforms/Metadata.Namespaces.xml | 24 ++++-- .../Transforms/Metadata.Namespaces.xml | 24 ++++-- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 7 -- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 51 ++++++++++++- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 21 ++++-- .../Transforms/Metadata.Namespaces.xml | 39 ++++++++-- .../Transforms/Metadata.Namespaces.xml | 6 -- .../Transforms/Metadata.Namespaces.xml | 7 -- .../Transforms/Metadata.Namespaces.xml | 6 -- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../Transforms/Metadata.Namespaces.xml | 9 +-- .../ui/Transforms/Metadata.Namespaces.xml | 73 +++++++++++++++++++ .../Transforms/Metadata.Namespaces.xml | 14 ---- 30 files changed, 283 insertions(+), 140 deletions(-) diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs index c9339bd56..8d0a72c21 100644 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IAnimationSpec.cs @@ -3,6 +3,7 @@ using Android.Runtime; using Java.Interop; +/* namespace AndroidX.Compose.Animation.Core { // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='AnimationSpec']" @@ -102,3 +103,4 @@ static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (Int } } +*/ \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs index 13be76fd2..18e8aaf32 100644 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IDecayAnimationSpec.cs @@ -3,6 +3,7 @@ using Android.Runtime; using Java.Interop; +/* namespace AndroidX.Compose.Animation.Core { // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='DecayAnimationSpec']" @@ -103,3 +104,4 @@ static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (Int } } +*/ diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs index 559a816a5..f1da9e03b 100644 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.IFiniteAnimationSpec.cs @@ -3,6 +3,7 @@ using Android.Runtime; using Java.Interop; +/* namespace AndroidX.Compose.Animation.Core { // Metadata.xml XPath interface reference: path="/api/package[@name='androidx.compose.animation.core']/interface[@name='FiniteAnimationSpec']" @@ -102,3 +103,4 @@ static IntPtr n_Vectorize_Landroidx_compose_animation_core_TwoWayConverter_ (Int } } +*/ diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs index a265f389e..e16b54774 100644 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.InfiniteRepeatableSpec.cs @@ -3,6 +3,7 @@ using Android.Runtime; using Java.Interop; +/* namespace AndroidX.Compose.Animation.Core { @@ -28,4 +29,5 @@ public sealed partial class InfiniteRepeatableSpec //: global::Java.Lang.Object, } } -} \ No newline at end of file +} +*/ diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs index d95f701c2..76ce79b90 100644 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.RepeatableSpec.cs @@ -3,6 +3,7 @@ using Android.Runtime; using Java.Interop; +/* namespace AndroidX.Compose.Animation.Core { @@ -27,4 +28,5 @@ public sealed partial class RepeatableSpec // : global::Java.Lang.Object, global } } } -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs index 6ef7f7fdb..adcb60592 100644 --- a/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs +++ b/source/androidx.compose.animation/animation-core/Additions/AndroidX.Compose.Animation.Core.SnapSpec.cs @@ -3,6 +3,7 @@ using Android.Runtime; using Java.Interop; +/* namespace AndroidX.Compose.Animation.Core { // Metadata.xml XPath class reference: path="/api/package[@name='androidx.compose.animation.core']/class[@name='SnapSpec']" @@ -26,4 +27,5 @@ public sealed partial class SnapSpec //: global::Java.Lang.Object, global::Andro } } } -} \ No newline at end of file +} +*/ \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml index dd08d703a..ffc3729c9 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml @@ -1,10 +1,7 @@  - - + - - + + + - - + + + + + + + + - - + + + + + + - - + + + + + + - - + - - + - - + - - + - - - - + + + BINDINGSGENERATOR : error BG0000: System.InvalidOperationException: The XPath expression evaluated to unexpected type System.Boolean. + + + + + + + error BG4301: Invalid XPath specification: path=//package/. + + --> + + + + + + + + + + + + + - - + - - + + + + + - - + + + + + + + + + + + - - - - - - + - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file From 236ac4b30c526b3eac48aa9d590d71d00e0fb200 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 27 Oct 2021 11:23:09 +0200 Subject: [PATCH 16/24] Update dependencies.json --- mappings/dependencies.json | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/mappings/dependencies.json b/mappings/dependencies.json index 9b1776895..a5f96356a 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1050,7 +1050,6 @@ "Xamarin.AndroidX.Lifecycle.Common", "Xamarin.AndroidX.Lifecycle.LiveData", "Xamarin.AndroidX.Lifecycle.Runtime", - "Xamarin.KotlinX.Coroutines.Android", "Xamarin.Android.ReactiveStreams" ] }, @@ -1064,13 +1063,13 @@ { "id": "Xamarin.AndroidX.Media2.Common", "dependencies": [ + "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.Collection", "Xamarin.AndroidX.Concurrent.Futures", + "Xamarin.AndroidX.Core", "Xamarin.AndroidX.Media", "Xamarin.AndroidX.VersionedParcelable", - "Xamarin.Google.Guava.ListenableFuture", - "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Core" + "Xamarin.Google.Guava.ListenableFuture" ] }, { @@ -1111,10 +1110,6 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ @@ -1244,8 +1239,8 @@ "dependencies": [ "Xamarin.AndroidX.Arch.Core.Runtime", "Xamarin.AndroidX.Paging.Common", - "Xamarin.Kotlin.StdLib", "Xamarin.Android.ReactiveX.RxJava", + "Xamarin.Kotlin.StdLib", "Xamarin.KotlinX.Coroutines.Rx2" ] }, @@ -1427,12 +1422,11 @@ "id": "Xamarin.AndroidX.Wear", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.ConstraintLayout", + "Xamarin.AndroidX.Core.Core.Ktx", "Xamarin.AndroidX.Core", "Xamarin.AndroidX.Fragment", "Xamarin.AndroidX.RecyclerView", "Xamarin.AndroidX.SwipeRefreshLayout", - "Xamarin.AndroidX.Core.Core.Ktx", "Xamarin.AndroidX.VersionedParcelable" ] }, @@ -1477,8 +1471,8 @@ "Xamarin.AndroidX.Room.Runtime", "Xamarin.AndroidX.Sqlite.Framework", "Xamarin.AndroidX.Sqlite", - "Xamarin.Google.Guava.ListenableFuture", - "Xamarin.AndroidX.Startup.StartupRuntime" + "Xamarin.AndroidX.Startup.StartupRuntime", + "Xamarin.Google.Guava.ListenableFuture" ] }, { From ad81abf3fd4a42b5215c33b140bb60a8d7f2af25 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 27 Oct 2021 13:33:34 +0200 Subject: [PATCH 17/24] Update dependencies.json --- mappings/dependencies.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mappings/dependencies.json b/mappings/dependencies.json index a5f96356a..e59120a62 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -1110,6 +1110,10 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, + { + "id": "Xamarin.AndroidX.Migration.Tool", + "dependencies": [] + }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From a31dbc1e0f89292bafae6ddfc276f301ab468f4a Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 29 Oct 2021 16:05:43 +0200 Subject: [PATCH 18/24] review fix - metadata commented out for faster builds --- .../animation-core/Additions/Additions.cs | 8 -------- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../animation-core/Transforms/Metadata.xml | 13 +++++++++---- .../animation/Additions/Additions.cs | 4 ---- .../animation/Transforms/Metadata.Namespaces.xml | 2 ++ .../foundation-layout/Additions/Additions.cs | 4 ---- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../foundation-layout/Transforms/Metadata.xml | 4 +++- .../foundation/Additions/Additions.cs | 3 --- .../foundation/Transforms/Metadata.Namespaces.xml | 4 +++- .../foundation/Transforms/Metadata.xml | 5 +++-- .../material-icons-core/Additions/Additions.cs | 4 ---- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../material-icons-extended/Additions/Additions.cs | 4 ---- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../material-ripple/Additions/Additions.cs | 6 +----- .../Transforms/Metadata.Namespaces.xml | 3 +++ .../material/Additions/Additions.cs | 4 ---- .../material/Transforms/Metadata.Namespaces.xml | 4 +++- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../runtime/Transforms/Metadata.Namespaces.xml | 4 +++- .../runtime/Transforms/Metadata.xml | 6 ++++-- .../ui-geometry/Additions/Additions.cs | 4 ---- .../ui-geometry/Transforms/Metadata.Namespaces.xml | 4 +++- .../ui-geometry/Transforms/Metadata.xml | 3 +++ .../ui-graphics/Additions/Additions.cs | 3 --- .../ui-graphics/Transforms/Metadata.Namespaces.xml | 4 +++- .../ui-graphics/Transforms/Metadata.xml | 4 +++- .../ui-text/Additions/Additions.cs | 2 ++ .../ui-text/Transforms/Metadata.Namespaces.xml | 4 +++- .../ui-text/Transforms/Metadata.xml | 2 ++ .../ui-tooling-data/Additions/Additions.cs | 4 ---- .../ui-tooling-preview/Additions/Additions.cs | 4 ---- .../ui-tooling/Additions/Additions.cs | 4 ---- .../ui-unit/Additions/Additions.cs | 4 ---- .../ui-unit/Transforms/Metadata.Namespaces.xml | 4 +++- .../ui-unit/Transforms/Metadata.xml | 3 +++ .../ui-util/Additions/Additions.cs | 4 ---- .../ui-util/Transforms/Metadata.Namespaces.xml | 4 +++- .../ui-viewbinding/Additions/Additions.cs | 4 ---- .../Transforms/Metadata.Namespaces.xml | 4 +++- .../androidx.compose.ui/ui/Additions/Additions.cs | 4 ---- .../ui/Transforms/Metadata.Namespaces.xml | 4 +++- .../androidx.compose.ui/ui/Transforms/Metadata.xml | 4 +++- 46 files changed, 92 insertions(+), 99 deletions(-) diff --git a/source/androidx.compose.animation/animation-core/Additions/Additions.cs b/source/androidx.compose.animation/animation-core/Additions/Additions.cs index 3a964710f..aa70205d8 100644 --- a/source/androidx.compose.animation/animation-core/Additions/Additions.cs +++ b/source/androidx.compose.animation/animation-core/Additions/Additions.cs @@ -4,11 +4,3 @@ using Android.Graphics; delegate IntPtr _JniMarshal_PPL_L (IntPtr jnienv, IntPtr klass, IntPtr p0); - -namespace AndroidX.Compose -{ -} - -namespace AndroidX.Compose.Animation.Core -{ -} diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml index ffc3729c9..6cfe164fa 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.animation.core']" /> + \ No newline at end of file diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml index 5f81229fc..2a5d3dfc7 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.xml @@ -1,5 +1,6 @@  + + + + + + /> + --> \ No newline at end of file diff --git a/source/androidx.compose.animation/animation/Additions/Additions.cs b/source/androidx.compose.animation/animation/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.animation/animation/Additions/Additions.cs +++ b/source/androidx.compose.animation/animation/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml index 43a8429f9..a4cc07967 100644 --- a/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.animation/animation/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.animation']" /> + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs b/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs +++ b/source/androidx.compose.foundation/foundation-layout/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml index b129b9585..cdd0939f5 100644 --- a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.foundation.layout']" /> + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml index 0caaad4b9..6cb03e17a 100644 --- a/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml +++ b/source/androidx.compose.foundation/foundation-layout/Transforms/Metadata.xml @@ -1,5 +1,6 @@  + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Additions/Additions.cs b/source/androidx.compose.foundation/foundation/Additions/Additions.cs index cc609c55b..26375c851 100644 --- a/source/androidx.compose.foundation/foundation/Additions/Additions.cs +++ b/source/androidx.compose.foundation/foundation/Additions/Additions.cs @@ -3,6 +3,3 @@ using Android.Widget; using Android.Graphics; -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml index 370307960..cd2409a35 100644 --- a/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.Namespaces.xml @@ -24,6 +24,7 @@ path="/api/package[@name='androidx.compose.foundation.text.selection']" /> + \ No newline at end of file diff --git a/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml index f9064d0cf..72553e9df 100644 --- a/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml +++ b/source/androidx.compose.foundation/foundation/Transforms/Metadata.xml @@ -1,5 +1,5 @@  - + diff --git a/source/androidx.compose.material/material-icons-core/Additions/Additions.cs b/source/androidx.compose.material/material-icons-core/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.material/material-icons-core/Additions/Additions.cs +++ b/source/androidx.compose.material/material-icons-core/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml index 838916928..1a07beec0 100644 --- a/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material-icons-core/Transforms/Metadata.Namespaces.xml @@ -18,6 +18,7 @@ path="/api/package[@name='androidx.compose.material.icons.twotone']" /> + \ No newline at end of file diff --git a/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs b/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs +++ b/source/androidx.compose.material/material-icons-extended/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml index 838916928..1a07beec0 100644 --- a/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material-icons-extended/Transforms/Metadata.Namespaces.xml @@ -18,6 +18,7 @@ path="/api/package[@name='androidx.compose.material.icons.twotone']" /> + \ No newline at end of file diff --git a/source/androidx.compose.material/material-ripple/Additions/Additions.cs b/source/androidx.compose.material/material-ripple/Additions/Additions.cs index cc609c55b..5d31c614b 100644 --- a/source/androidx.compose.material/material-ripple/Additions/Additions.cs +++ b/source/androidx.compose.material/material-ripple/Additions/Additions.cs @@ -1,8 +1,4 @@ using System; using Android.Views; using Android.Widget; -using Android.Graphics; - -namespace AndroidX.Compose -{ -} +using Android.Graphics; \ No newline at end of file diff --git a/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml index 83f4f0db7..38f0d2c97 100644 --- a/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material-ripple/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,14 @@ path="/api/package[@name='androidx.compose.material.ripple']" /> + \ No newline at end of file diff --git a/source/androidx.compose.material/material/Additions/Additions.cs b/source/androidx.compose.material/material/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.material/material/Additions/Additions.cs +++ b/source/androidx.compose.material/material/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml index 6148a47cc..3e0b30e0e 100644 --- a/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.material/material/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.material']" /> + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml index 09737d9c0..a578b29b5 100644 --- a/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime-livedata/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.runtime.livedata']" /> + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml index d926f61dc..bd60ab072 100644 --- a/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime-rxjava2/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.runtime.rxjava2']" /> + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml index 16591eda7..cb0553589 100644 --- a/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime-saveable/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.runtime.saveable']" /> + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml index c44f39174..f703a5fc2 100644 --- a/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.Namespaces.xml @@ -55,6 +55,7 @@ path="/api/package[@name='androidx.compose.runtime.external.kotlinx.collections.immutable.internal']" /> + \ No newline at end of file diff --git a/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml index b7c557507..7b3164092 100644 --- a/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml +++ b/source/androidx.compose.runtime/runtime/Transforms/Metadata.xml @@ -4,6 +4,7 @@ /> + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Additions/Additions.cs b/source/androidx.compose.ui/ui-geometry/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui-geometry/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-geometry/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml index 8f75f35f1..285a11575 100644 --- a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.ui.geometry']" /> + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml index 6b5201cfa..97f5a6a66 100644 --- a/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-geometry/Transforms/Metadata.xml @@ -1,9 +1,12 @@  + + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Additions/Additions.cs b/source/androidx.compose.ui/ui-graphics/Additions/Additions.cs index cc609c55b..26375c851 100644 --- a/source/androidx.compose.ui/ui-graphics/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-graphics/Additions/Additions.cs @@ -3,6 +3,3 @@ using Android.Widget; using Android.Graphics; -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml index fc438d00e..74292f048 100644 --- a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.Namespaces.xml @@ -15,6 +15,7 @@ path="/api/package[@name='androidx.compose.ui.graphics.vector']" /> + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml index 6ac3d1311..a548d1522 100644 --- a/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-graphics/Transforms/Metadata.xml @@ -1,5 +1,6 @@  + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Additions/Additions.cs b/source/androidx.compose.ui/ui-text/Additions/Additions.cs index dccf2b2b6..c63cd86f9 100644 --- a/source/androidx.compose.ui/ui-text/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-text/Additions/Additions.cs @@ -3,6 +3,7 @@ using Android.Widget; using Android.Graphics; +/* namespace AndroidX.Compose.UI.Text { public sealed partial class AnnotatedString @@ -25,3 +26,4 @@ public System.Collections.IList SubList (int fromIndex, int toIndex) } } } +*/ \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml index 530fbaeb5..ad931ab64 100644 --- a/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.Namespaces.xml @@ -33,6 +33,7 @@ path="/api/package[@name='androidx.compose.ui.text.style']" /> + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml index 24cf88db2..28d4331e4 100644 --- a/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-text/Transforms/Metadata.xml @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-tooling-data/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-tooling-preview/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs b/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-tooling/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-unit/Additions/Additions.cs b/source/androidx.compose.ui/ui-unit/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui-unit/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-unit/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml index f43b4a56f..2901d8d26 100644 --- a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.ui.unit']" /> + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml index 405a1300e..cd8c67b97 100644 --- a/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui-unit/Transforms/Metadata.xml @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-util/Additions/Additions.cs b/source/androidx.compose.ui/ui-util/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui-util/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-util/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml index c70632529..bbff63f84 100644 --- a/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-util/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.ui.util']" /> + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs b/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui-viewbinding/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml index 3ae348c22..5378906e3 100644 --- a/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui-viewbinding/Transforms/Metadata.Namespaces.xml @@ -3,11 +3,13 @@ path="/api/package[@name='androidx.compose.ui.viewinterop']" /> + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Additions/Additions.cs b/source/androidx.compose.ui/ui/Additions/Additions.cs index cc609c55b..127606d41 100644 --- a/source/androidx.compose.ui/ui/Additions/Additions.cs +++ b/source/androidx.compose.ui/ui/Additions/Additions.cs @@ -2,7 +2,3 @@ using Android.Views; using Android.Widget; using Android.Graphics; - -namespace AndroidX.Compose -{ -} diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml index 19adaa270..a0aef8901 100644 --- a/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.Namespaces.xml @@ -72,6 +72,7 @@ path="/api/package[@name='androidx.inspection.compose.ui']" /> + \ No newline at end of file diff --git a/source/androidx.compose.ui/ui/Transforms/Metadata.xml b/source/androidx.compose.ui/ui/Transforms/Metadata.xml index 208a5c9a6..87b668fb5 100644 --- a/source/androidx.compose.ui/ui/Transforms/Metadata.xml +++ b/source/androidx.compose.ui/ui/Transforms/Metadata.xml @@ -39,6 +39,7 @@ --> + From f3486e7d45a54003f832e19ea82674d77ff8a9d7 Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 29 Oct 2021 16:12:16 +0200 Subject: [PATCH 19/24] shortened nuget ids --- config.json | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/config.json b/config.json index 336800c7b..a9cc351a8 100644 --- a/config.json +++ b/config.json @@ -223,7 +223,7 @@ "artifactId": "animation", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Animation.Animation", + "nugetId": "Xamarin.AndroidX.Compose.Animation", "dependencyOnly": false }, { @@ -231,7 +231,7 @@ "artifactId": "animation-core", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Animation.Animation.Core", + "nugetId": "Xamarin.AndroidX.Compose.Animation.Core", "dependencyOnly": false }, { @@ -239,7 +239,7 @@ "artifactId": "foundation", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Foundation.Foundation", + "nugetId": "Xamarin.AndroidX.Compose.Foundation", "dependencyOnly": false }, { @@ -247,7 +247,7 @@ "artifactId": "foundation-layout", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", + "nugetId": "Xamarin.AndroidX.Compose.Foundation.Layout", "dependencyOnly": false }, { @@ -255,7 +255,7 @@ "artifactId": "material", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.Material", + "nugetId": "Xamarin.AndroidX.Compose.Material", "dependencyOnly": false }, { @@ -263,7 +263,7 @@ "artifactId": "material-icons-core", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", + "nugetId": "Xamarin.AndroidX.Compose.Material.Icons.Core", "dependencyOnly": false }, { @@ -271,7 +271,7 @@ "artifactId": "material-icons-extended", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.Material.Icons.Extended", + "nugetId": "Xamarin.AndroidX.Compose.Material.Icons.Extended", "dependencyOnly": false }, { @@ -279,7 +279,7 @@ "artifactId": "material-ripple", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Compose.Material.Material.Ripple", + "nugetId": "Xamarin.AndroidX.Compose.Material.Ripple", "dependencyOnly": false }, { @@ -287,7 +287,7 @@ "artifactId": "runtime", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime", + "nugetId": "Xamarin.AndroidX.Compose.Runtime", "dependencyOnly": false }, { @@ -295,7 +295,7 @@ "artifactId": "runtime-livedata", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime.LiveData", + "nugetId": "Xamarin.AndroidX.Compose.Runtime.LiveData", "dependencyOnly": false }, { @@ -303,7 +303,7 @@ "artifactId": "runtime-rxjava2", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime.RxJava2", + "nugetId": "Xamarin.AndroidX.Compose.Runtime.RxJava2", "dependencyOnly": false }, { @@ -311,7 +311,7 @@ "artifactId": "runtime-saveable", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", + "nugetId": "Xamarin.AndroidX.Compose.Runtime.Saveable", "dependencyOnly": false }, { @@ -319,7 +319,7 @@ "artifactId": "ui", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.UI.UI", + "nugetId": "Xamarin.AndroidX.Compose.UI", "dependencyOnly": false }, { @@ -327,7 +327,7 @@ "artifactId": "ui-geometry", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Geometry", + "nugetId": "Xamarin.AndroidX.Compose.UI.Geometry", "dependencyOnly": false }, { @@ -335,7 +335,7 @@ "artifactId": "ui-graphics", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Graphics", + "nugetId": "Xamarin.AndroidX.Compose.UI.Graphics", "dependencyOnly": false }, { @@ -343,7 +343,7 @@ "artifactId": "ui-text", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Text", + "nugetId": "Xamarin.AndroidX.Compose.UI.Text", "dependencyOnly": false }, { @@ -351,7 +351,7 @@ "artifactId": "ui-unit", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Unit", + "nugetId": "Xamarin.AndroidX.Compose.UI.Unit", "dependencyOnly": false }, { @@ -359,7 +359,7 @@ "artifactId": "ui-util", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.UI.UI.Util", + "nugetId": "Xamarin.AndroidX.Compose.UI.Util", "dependencyOnly": false }, { @@ -367,7 +367,7 @@ "artifactId": "ui-viewbinding", "version": "1.0.0", "nugetVersion": "1.0.0", - "nugetId": "Xamarin.AndroidX.Compose.UI.UI.ViewBinding", + "nugetId": "Xamarin.AndroidX.Compose.UI.ViewBinding", "dependencyOnly": false }, { From 183bb37886c98a5e240b7d8cf6b611c08e32edea Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 1 Nov 2021 14:37:04 +0100 Subject: [PATCH 20/24] nuget summary and description for Compose packages --- source/AndroidXProject.cshtml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/AndroidXProject.cshtml b/source/AndroidXProject.cshtml index 790a32eaa..4fa5cc994 100644 --- a/source/AndroidXProject.cshtml +++ b/source/AndroidXProject.cshtml @@ -227,4 +227,13 @@ } + + @if (@Model.NuGetPackageId.StartsWith("Xamarin.AndroidX.Compose")) + { + + Xamarin.Android bindings for AndroidX - @(Model.Name) (bindings without managed callable wrappers (C#) and are only used for including Java files) + Xamarin.Android bindings for AndroidX - @(Model.Name) (bindings without managed callable wrappers (C#) and are only used for including Java files) artifact=@(Model.MavenGroupId):@(Model.Name) artifact_versioned=@(Model.MavenGroupId):@(Model.Name):@(artifact_version) + + } + From 25b66a078f080107deaa427a3b8c37055b477964 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 1 Nov 2021 14:37:08 +0100 Subject: [PATCH 21/24] Update dependencies.json --- mappings/dependencies.json | 182 ++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 93 deletions(-) diff --git a/mappings/dependencies.json b/mappings/dependencies.json index e59120a62..39964b6ba 100644 --- a/mappings/dependencies.json +++ b/mappings/dependencies.json @@ -515,42 +515,42 @@ ] }, { - "id": "Xamarin.AndroidX.Compose.Animation.Animation", + "id": "Xamarin.AndroidX.Compose.Animation", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Animation.Animation.Core", - "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Geometry", - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.Compose.Animation.Core", + "Xamarin.AndroidX.Compose.Foundation.Layout", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Geometry", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.AndroidX.Compose.UI", "Xamarin.Kotlin.StdLib.Common" ] }, { - "id": "Xamarin.AndroidX.Compose.Animation.Animation.Core", + "id": "Xamarin.AndroidX.Compose.Animation.Core", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Unit", - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Unit", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.AndroidX.Compose.UI", "Xamarin.Kotlin.StdLib", "Xamarin.KotlinX.Coroutines.Core" ] }, { - "id": "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", + "id": "Xamarin.AndroidX.Compose.Foundation.Layout", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.AndroidX.Compose.UI", "Xamarin.Kotlin.StdLib.Common" ] }, { - "id": "Xamarin.AndroidX.Compose.Runtime.Runtime", + "id": "Xamarin.AndroidX.Compose.Runtime", "dependencies": [ "Xamarin.AndroidX.Annotation", "Xamarin.Kotlin.StdLib", @@ -558,32 +558,32 @@ ] }, { - "id": "Xamarin.AndroidX.Compose.UI.UI.Geometry", + "id": "Xamarin.AndroidX.Compose.UI.Geometry", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Util", "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Compose.UI.UI.Util", + "id": "Xamarin.AndroidX.Compose.UI.Util", "dependencies": [ "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Compose.UI.UI", + "id": "Xamarin.AndroidX.Compose.UI", "dependencies": [ "Xamarin.AndroidX.Annotation", "Xamarin.AndroidX.AutoFill", - "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Geometry", - "Xamarin.AndroidX.Compose.UI.UI.Graphics", - "Xamarin.AndroidX.Compose.UI.UI.Text", - "Xamarin.AndroidX.Compose.UI.UI.Unit", - "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.Runtime.Saveable", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Geometry", + "Xamarin.AndroidX.Compose.UI.Graphics", + "Xamarin.AndroidX.Compose.UI.Text", + "Xamarin.AndroidX.Compose.UI.Unit", + "Xamarin.AndroidX.Compose.UI.Util", "Xamarin.AndroidX.Lifecycle.Common.Java8", "Xamarin.AndroidX.Lifecycle.Runtime", "Xamarin.AndroidX.Lifecycle.ViewModel", @@ -600,12 +600,12 @@ "dependencies": [] }, { - "id": "Xamarin.AndroidX.Compose.UI.UI.Unit", + "id": "Xamarin.AndroidX.Compose.UI.Unit", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Geometry", - "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Geometry", + "Xamarin.AndroidX.Compose.UI.Util", "Xamarin.Kotlin.StdLib" ] }, @@ -616,71 +616,71 @@ ] }, { - "id": "Xamarin.AndroidX.Compose.Compose.Material.Material", + "id": "Xamarin.AndroidX.Compose.Foundation", "dependencies": [ - "Xamarin.AndroidX.Compose.Animation.Animation.Core", - "Xamarin.AndroidX.Compose.Animation.Animation", - "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", - "Xamarin.AndroidX.Compose.Foundation.Foundation", - "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", - "Xamarin.AndroidX.Compose.Compose.Material.Material.Ripple", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Text", - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.Annotation", + "Xamarin.AndroidX.Compose.Animation", + "Xamarin.AndroidX.Compose.Foundation.Layout", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Text", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.AndroidX.Compose.UI", "Xamarin.Kotlin.StdLib.Common" ] }, { - "id": "Xamarin.AndroidX.Compose.Foundation.Foundation", + "id": "Xamarin.AndroidX.Compose.UI.Text", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Animation.Animation", - "Xamarin.AndroidX.Compose.Foundation.Foundation.Layout", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Text", - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.AndroidX.Compose.UI.UI", - "Xamarin.Kotlin.StdLib.Common" + "Xamarin.AndroidX.Collection", + "Xamarin.AndroidX.Compose.Runtime.Saveable", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Graphics", + "Xamarin.AndroidX.Compose.UI.Unit", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.AndroidX.Core", + "Xamarin.Kotlin.StdLib.Common", + "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", + "id": "Xamarin.AndroidX.Compose.Material", "dependencies": [ - "Xamarin.AndroidX.Compose.UI.UI", - "Xamarin.Kotlin.StdLib" + "Xamarin.AndroidX.Compose.Animation.Core", + "Xamarin.AndroidX.Compose.Animation", + "Xamarin.AndroidX.Compose.Foundation.Layout", + "Xamarin.AndroidX.Compose.Foundation", + "Xamarin.AndroidX.Compose.Material.Icons.Core", + "Xamarin.AndroidX.Compose.Material.Ripple", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Text", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.AndroidX.Compose.UI", + "Xamarin.Kotlin.StdLib.Common" ] }, { - "id": "Xamarin.AndroidX.Compose.Compose.Material.Material.Ripple", + "id": "Xamarin.AndroidX.Compose.Material.Icons.Core", "dependencies": [ - "Xamarin.AndroidX.Compose.Animation.Animation", - "Xamarin.AndroidX.Compose.Foundation.Foundation", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.Kotlin.StdLib.Common" + "Xamarin.AndroidX.Compose.UI", + "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Compose.UI.UI.Text", + "id": "Xamarin.AndroidX.Compose.Material.Ripple", "dependencies": [ - "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Collection", - "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Graphics", - "Xamarin.AndroidX.Compose.UI.UI.Unit", - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.AndroidX.Core", - "Xamarin.Kotlin.StdLib.Common", - "Xamarin.Kotlin.StdLib" + "Xamarin.AndroidX.Compose.Animation", + "Xamarin.AndroidX.Compose.Foundation", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.Kotlin.StdLib.Common" ] }, { - "id": "Xamarin.AndroidX.Compose.Compose.Material.Material.Icons.Extended", + "id": "Xamarin.AndroidX.Compose.Material.Icons.Extended", "dependencies": [ - "Xamarin.AndroidX.Compose.Compose.Material.MaterialIcons.Core", - "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.Material.Icons.Core", + "Xamarin.AndroidX.Compose.Runtime", "Xamarin.Kotlin.StdLib.Common" ] }, @@ -692,37 +692,37 @@ ] }, { - "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.LiveData", + "id": "Xamarin.AndroidX.Compose.Runtime.LiveData", "dependencies": [ - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI", "Xamarin.AndroidX.Lifecycle.LiveData", "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.RxJava2", + "id": "Xamarin.AndroidX.Compose.Runtime.RxJava2", "dependencies": [ - "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.Runtime", "Xamarin.Android.ReactiveX.RxJava", "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Compose.Runtime.Runtime.Saveable", + "id": "Xamarin.AndroidX.Compose.Runtime.Saveable", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Runtime.Runtime", + "Xamarin.AndroidX.Compose.Runtime", "Xamarin.Kotlin.StdLib" ] }, { - "id": "Xamarin.AndroidX.Compose.UI.UI.Graphics", + "id": "Xamarin.AndroidX.Compose.UI.Graphics", "dependencies": [ "Xamarin.AndroidX.Annotation", - "Xamarin.AndroidX.Compose.Runtime.Runtime", - "Xamarin.AndroidX.Compose.UI.UI.Unit", - "Xamarin.AndroidX.Compose.UI.UI.Util", + "Xamarin.AndroidX.Compose.Runtime", + "Xamarin.AndroidX.Compose.UI.Unit", + "Xamarin.AndroidX.Compose.UI.Util", "Xamarin.Kotlin.StdLib.Common" ] }, @@ -734,10 +734,10 @@ ] }, { - "id": "Xamarin.AndroidX.Compose.UI.UI.ViewBinding", + "id": "Xamarin.AndroidX.Compose.UI.ViewBinding", "dependencies": [ - "Xamarin.AndroidX.Compose.UI.UI.Util", - "Xamarin.AndroidX.Compose.UI.UI", + "Xamarin.AndroidX.Compose.UI.Util", + "Xamarin.AndroidX.Compose.UI", "Xamarin.AndroidX.DataBinding.ViewBinding", "Xamarin.AndroidX.Fragment.Ktx", "Xamarin.Kotlin.StdLib" @@ -1110,10 +1110,6 @@ "id": "Xamarin.AndroidX.MultiDex", "dependencies": [] }, - { - "id": "Xamarin.AndroidX.Migration.Tool", - "dependencies": [] - }, { "id": "Xamarin.AndroidX.Navigation.Common", "dependencies": [ From f71cf05a6c113636fb5f17aec7f8a5882d66e3e1 Mon Sep 17 00:00:00 2001 From: moljac Date: Mon, 1 Nov 2021 16:41:30 +0100 Subject: [PATCH 22/24] simplifying remove-node for packages --- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 25 +------ .../Transforms/Metadata.Namespaces.xml | 19 +---- .../Transforms/Metadata.Namespaces.xml | 19 +---- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 50 ++----------- .../Transforms/Metadata.Namespaces.xml | 4 +- .../Transforms/Metadata.Namespaces.xml | 16 +--- .../Transforms/Metadata.Namespaces.xml | 34 +-------- .../Transforms/Metadata.Namespaces.xml | 4 +- .../ui/Transforms/Metadata.Namespaces.xml | 73 +------------------ 17 files changed, 22 insertions(+), 254 deletions(-) diff --git a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml index 6cfe164fa..a8553be46 100644 --- a/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml +++ b/source/androidx.compose.animation/animation-core/Transforms/Metadata.Namespaces.xml @@ -1,7 +1,5 @@  - + - - - - - - - - - - - - - + - +