From 2f5578dbc1d734b827faea4ed5b247568b91e832 Mon Sep 17 00:00:00 2001 From: moljac Date: Sat, 23 Apr 2022 12:21:22 +0200 Subject: [PATCH 1/7] Update config.json --- config.json | 130 +++++++++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 57 deletions(-) diff --git a/config.json b/config.json index 4b83a2dec..51a359081 100644 --- a/config.json +++ b/config.json @@ -1089,40 +1089,40 @@ { "groupId": "com.google.mlkit", "artifactId": "barcode-scanning", - "version": "16.1.2", - "nugetVersion": "116.1.2.5", + "version": "16.2.0", + "nugetVersion": "116.2.0", "nugetId": "Xamarin.Google.MLKit.BarcodeScanning", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "common", - "version": "17.3.0", - "nugetVersion": "117.3.0.5", + "version": "17.5.0", + "nugetVersion": "117.5.0", "nugetId": "Xamarin.Google.MLKit.Common", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "digital-ink-recognition", - "version": "17.0.0", - "nugetVersion": "117.0.0.5", + "version": "17.0.1", + "nugetVersion": "117.0.1", "nugetId": "Xamarin.Google.MLKit.DigitalInk.Recognition", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "face-detection", - "version": "16.1.1", - "nugetVersion": "116.1.1.5", + "version": "16.1.2", + "nugetVersion": "116.1.2", "nugetId": "Xamarin.Google.MLKit.FaceDetection", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "image-labeling", - "version": "17.0.4", - "nugetVersion": "117.0.4.5", + "version": "17.0.5", + "nugetVersion": "117.0.5", "nugetId": "Xamarin.Google.MLKit.ImageLabeling", "dependencyOnly": false }, @@ -1137,8 +1137,8 @@ { "groupId": "com.google.mlkit", "artifactId": "image-labeling-common", - "version": "17.0.0", - "nugetVersion": "117.0.0.6", + "version": "17.1.0", + "nugetVersion": "117.1.0.0", "nugetId": "Xamarin.Google.MLKit.ImageLabeling.Common", "dependencyOnly": false }, @@ -1153,16 +1153,16 @@ { "groupId": "com.google.mlkit", "artifactId": "image-labeling-default-common", - "version": "16.0.0", - "nugetVersion": "116.0.0.6", + "version": "16.0.1", + "nugetVersion": "116.0.1", "nugetId": "Xamarin.Google.MLKit.ImageLabeling.Default.Common", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "language-id", - "version": "16.1.1", - "nugetVersion": "116.1.1.5", + "version": "17.0.0", + "nugetVersion": "117.0.0", "nugetId": "Xamarin.Google.MLKit.Language.Id", "dependencyOnly": false }, @@ -1185,24 +1185,24 @@ { "groupId": "com.google.mlkit", "artifactId": "object-detection", - "version": "16.2.4", - "nugetVersion": "116.2.4.5", + "version": "16.2.8", + "nugetVersion": "116.2.8", "nugetId": "Xamarin.Google.MLKit.ObjectDetection", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "object-detection-common", - "version": "17.0.1", - "nugetVersion": "117.0.1.5", + "version": "17.2.0", + "nugetVersion": "117.2.0", "nugetId": "Xamarin.Google.MLKit.ObjectDetection.Common", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "object-detection-custom", - "version": "16.3.2", - "nugetVersion": "116.3.2.5", + "version": "16.3.4", + "nugetVersion": "116.3.4", "nugetId": "Xamarin.Google.MLKit.ObjectDetection.Custom", "dependencyOnly": false }, @@ -1233,8 +1233,8 @@ { "groupId": "com.google.mlkit", "artifactId": "smart-reply", - "version": "16.1.1", - "nugetVersion": "116.1.1.5", + "version": "16.2.0", + "nugetVersion": "116.2.0", "nugetId": "Xamarin.Google.MLKit.SmartReply", "dependencyOnly": false }, @@ -1249,19 +1249,27 @@ { "groupId": "com.google.mlkit", "artifactId": "vision-common", - "version": "16.4.0", - "nugetVersion": "116.4.0.5", + "version": "16.7.0", + "nugetVersion": "116.7.0", "nugetId": "Xamarin.Google.MLKit.Vision.Common", "dependencyOnly": false }, { "groupId": "com.google.mlkit", "artifactId": "vision-internal-vkp", - "version": "18.1.1", - "nugetVersion": "118.1.1.5", + "version": "18.2.1", + "nugetVersion": "118.2.1", "nugetId": "Xamarin.Google.MLKit.Vision.Internal.Vkp", "dependencyOnly": false }, + { + "groupId": "com.google.android.odml", + "artifactId": "image", + "version": "1.0.0-beta1", + "nugetVersion": "1.0.0.0-beta1", + "nugetId": "Xamarin.Google.Android.ODML.Image", + "dependencyOnly": false + }, { "groupId": "com.google.protobuf", "artifactId": "protobuf-javalite", @@ -1503,16 +1511,16 @@ { "groupId": "androidx.annotation", "artifactId": "annotation", - "version": "1.2.0", - "nugetVersion": "1.2.0", + "version": "1.3.0", + "nugetVersion": "1.3.0.2", "nugetId": "Xamarin.AndroidX.Annotation", "dependencyOnly": true }, { "groupId": "androidx.appcompat", "artifactId": "appcompat", - "version": "1.2.0", - "nugetVersion": "1.2.0.7", + "version": "1.3.1", + "nugetVersion": "1.3.1.3", "nugetId": "Xamarin.AndroidX.AppCompat", "dependencyOnly": true }, @@ -1520,7 +1528,7 @@ "groupId": "androidx.browser", "artifactId": "browser", "version": "1.3.0", - "nugetVersion": "1.3.0.5", + "nugetVersion": "1.3.0.8", "nugetId": "Xamarin.AndroidX.Browser", "dependencyOnly": true }, @@ -1528,47 +1536,47 @@ "groupId": "androidx.cardview", "artifactId": "cardview", "version": "1.0.0", - "nugetVersion": "1.0.0.8", + "nugetVersion": "1.0.0.11", "nugetId": "Xamarin.AndroidX.CardView", "dependencyOnly": true }, { "groupId": "androidx.collection", "artifactId": "collection", - "version": "1.1.0", - "nugetVersion": "1.1.0.7", + "version": "1.2.0", + "nugetVersion": "1.2.0.2", "nugetId": "Xamarin.AndroidX.Collection", "dependencyOnly": true }, { "groupId": "androidx.constraintlayout", "artifactId": "constraintlayout", - "version": "2.0.4", - "nugetVersion": "2.0.4.2", + "version": "2.1.1", + "nugetVersion": "2.1.1.2", "nugetId": "Xamarin.AndroidX.ConstraintLayout", "dependencyOnly": true }, { "groupId": "androidx.core", "artifactId": "core", - "version": "1.3.2", - "nugetVersion": "1.3.2.3", + "version": "1.6.0", + "nugetVersion": "1.6.0.5", "nugetId": "Xamarin.AndroidX.Core", "dependencyOnly": true }, { "groupId": "androidx.exifinterface", "artifactId": "exifinterface", - "version": "1.3.2", - "nugetVersion": "1.3.2.2", + "version": "1.3.3", + "nugetVersion": "1.3.3.2", "nugetId": "Xamarin.AndroidX.ExifInterface", "dependencyOnly": true }, { "groupId": "androidx.fragment", "artifactId": "fragment", - "version": "1.3.2", - "nugetVersion": "1.3.2", + "version": "1.3.6", + "nugetVersion": "1.3.6.3", "nugetId": "Xamarin.AndroidX.Fragment", "dependencyOnly": true }, @@ -1576,7 +1584,7 @@ "groupId": "androidx.legacy", "artifactId": "legacy-support-core-utils", "version": "1.0.0", - "nugetVersion": "1.0.0.7", + "nugetVersion": "1.0.0.10", "nugetId": "Xamarin.AndroidX.Legacy.Support.Core.Utils", "dependencyOnly": true }, @@ -1584,7 +1592,7 @@ "groupId": "androidx.legacy", "artifactId": "legacy-support-v4", "version": "1.0.0", - "nugetVersion": "1.0.0.7", + "nugetVersion": "1.0.0.10", "nugetId": "Xamarin.AndroidX.Legacy.Support.V4", "dependencyOnly": true }, @@ -1592,7 +1600,7 @@ "groupId": "androidx.lifecycle", "artifactId": "lifecycle-extensions", "version": "2.2.0", - "nugetVersion": "2.2.0.7", + "nugetVersion": "2.2.0.10", "nugetId": "Xamarin.AndroidX.Lifecycle.Extensions", "dependencyOnly": true }, @@ -1600,7 +1608,7 @@ "groupId": "androidx.loader", "artifactId": "loader", "version": "1.1.0", - "nugetVersion": "1.1.0.7", + "nugetVersion": "1.1.0.10", "nugetId": "Xamarin.AndroidX.Loader", "dependencyOnly": true }, @@ -1608,34 +1616,42 @@ "groupId": "androidx.localbroadcastmanager", "artifactId": "localbroadcastmanager", "version": "1.0.0", - "nugetVersion": "1.0.0.7", + "nugetVersion": "1.0.0.10", "nugetId": "Xamarin.AndroidX.LocalBroadcastManager", "dependencyOnly": true }, { "groupId": "androidx.media", "artifactId": "media", - "version": "1.2.1", - "nugetVersion": "1.2.1.2", + "version": "1.4.3", + "nugetVersion": "1.4.3", "nugetId": "Xamarin.AndroidX.Media", "dependencyOnly": true }, { "groupId": "androidx.mediarouter", "artifactId": "mediarouter", - "version": "1.2.2", - "nugetVersion": "1.2.2.1", + "version": "1.2.5", + "nugetVersion": "1.2.5.2", "nugetId": "Xamarin.AndroidX.MediaRouter", "dependencyOnly": true }, { "groupId": "androidx.recyclerview", "artifactId": "recyclerview", - "version": "1.1.0", - "nugetVersion": "1.1.0.8", + "version": "1.2.1", + "nugetVersion": "1.2.1.3", "nugetId": "Xamarin.AndroidX.RecyclerView", "dependencyOnly": true }, + { + "groupId": "androidx.tracing", + "artifactId": "tracing", + "version": "1.0.0", + "nugetVersion": "1.0.0.3", + "nugetId": "Xamarin.AndroidX.Tracing.Tracing", + "dependencyOnly": true + }, { "groupId": "androidx.vectordrawable", "artifactId": "vectordrawable-animated", @@ -1647,8 +1663,8 @@ { "groupId": "androidx.work", "artifactId": "work-runtime", - "version": "2.5.0", - "nugetVersion": "2.5.0.1", + "version": "2.7.1", + "nugetVersion": "2.7.1.2", "nugetId": "Xamarin.AndroidX.Work.Runtime", "dependencyOnly": true }, From 295a9ba31690009f35442c0444a108f021a4628c Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 27 Apr 2022 17:13:21 +0200 Subject: [PATCH 2/7] MLKit updates --- config.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/config.json b/config.json index 51a359081..5e420b02e 100644 --- a/config.json +++ b/config.json @@ -413,16 +413,16 @@ { "groupId": "com.google.android.gms", "artifactId": "play-services-mlkit-barcode-scanning", - "version": "16.1.5", - "nugetVersion": "116.1.5.5", + "version": "16.2.0", + "nugetVersion": "116.2.0", "nugetId": "Xamarin.GooglePlayServices.MLKit.BarcodeScanning", "dependencyOnly": false }, { "groupId": "com.google.android.gms", "artifactId": "play-services-mlkit-face-detection", - "version": "16.1.7", - "nugetVersion": "116.1.7.5", + "version": "16.2.0", + "nugetVersion": "116.2.0", "nugetId": "Xamarin.GooglePlayServices.MLKit.FaceDetection", "dependencyOnly": false }, @@ -434,6 +434,14 @@ "nugetId": "Xamarin.GooglePlayServices.MLKit.ImageLabeling", "dependencyOnly": false }, + { + "groupId": "com.google.android.gms", + "artifactId": "play-services-mlkit-language-id", + "version": "16.0.0-beta2", + "nugetVersion": "116.0.0-beta2", + "nugetId": "Xamarin.GooglePlayServices.MLKit.LanguageId", + "dependencyOnly": false + }, { "groupId": "com.google.android.gms", "artifactId": "play-services-mlkit-text-recognition", From 4047b9b58471eb8ab742686c1a946417a6a674d6 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 27 Apr 2022 17:13:26 +0200 Subject: [PATCH 3/7] Update Directory.Build.targets --- samples/Directory.Build.targets | 71 +++++++++++++++++---------------- 1 file changed, 37 insertions(+), 34 deletions(-) diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index 88045a525..478c79f9d 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -47,9 +47,10 @@ - - + + + @@ -131,28 +132,29 @@ - - - - - + + + + + - + - - + + - - - + + + - + - - + + + @@ -179,25 +181,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - + From efac6cf22c806b7d3fce2f933c4889aacca03985 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 27 Apr 2022 17:13:48 +0200 Subject: [PATCH 4/7] new package dependency --- .../Additions/Additions.cs | 4 +++ .../Transforms/EnumFields.xml | 2 ++ .../Transforms/EnumMethods.xml | 2 ++ .../Transforms/Metadata.Namespaces.xml | 27 +++++++++++++++++++ .../Transforms/Metadata.ParameterNames.xml | 2 ++ .../Transforms/Metadata.xml | 3 +++ 6 files changed, 40 insertions(+) create mode 100644 source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs create mode 100644 source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumFields.xml create mode 100644 source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumMethods.xml create mode 100644 source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.Namespaces.xml create mode 100644 source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.ParameterNames.xml create mode 100644 source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.xml diff --git a/source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs b/source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs new file mode 100644 index 000000000..127606d41 --- /dev/null +++ b/source/com.google.android.gms/play-services-mlkit-language-id/Additions/Additions.cs @@ -0,0 +1,4 @@ +using System; +using Android.Views; +using Android.Widget; +using Android.Graphics; diff --git a/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumFields.xml b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumFields.xml new file mode 100644 index 000000000..f8105b317 --- /dev/null +++ b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumFields.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumMethods.xml b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumMethods.xml new file mode 100644 index 000000000..501e4827b --- /dev/null +++ b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/EnumMethods.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.Namespaces.xml b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.Namespaces.xml new file mode 100644 index 000000000..c72254964 --- /dev/null +++ b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.Namespaces.xml @@ -0,0 +1,27 @@ + + + Xamarin.Google.MLKit.NL.LanguageId + + + Xamarin.Google.MLKit.ML.LanguageId.Internal + + + Xamarin.Google.MLKit.Vision.Barcode.Common.Internal + + + Xamarin.Google.MLKit.NL.LanguageId.Internal + + + \ No newline at end of file diff --git a/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.ParameterNames.xml b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.ParameterNames.xml new file mode 100644 index 000000000..f5da9828b --- /dev/null +++ b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.ParameterNames.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.xml b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.xml new file mode 100644 index 000000000..9495e200d --- /dev/null +++ b/source/com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file From a3cd30c2bba188af625abfb9d706e6530e4ddbe4 Mon Sep 17 00:00:00 2001 From: moljac Date: Wed, 27 Apr 2022 17:13:56 +0200 Subject: [PATCH 5/7] Update Metadata.Namespaces.xml --- .../language-id/Transforms/Metadata.Namespaces.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/com.google.mlkit/language-id/Transforms/Metadata.Namespaces.xml b/source/com.google.mlkit/language-id/Transforms/Metadata.Namespaces.xml index a1c3eabc5..ebb58adee 100755 --- a/source/com.google.mlkit/language-id/Transforms/Metadata.Namespaces.xml +++ b/source/com.google.mlkit/language-id/Transforms/Metadata.Namespaces.xml @@ -19,7 +19,12 @@ > Xamarin.Google.MLKit.LanguageId.Internal - + + Android.Gms.Dynamite.Descriptors.MLKit.Dynamite.LangId + From 8ef2126784d41e6639e9043b2f619aca88cd7d6e Mon Sep 17 00:00:00 2001 From: moljac Date: Thu, 28 Apr 2022 15:02:30 +0200 Subject: [PATCH 6/7] spell check updates --- utilities.cake | 1 + 1 file changed, 1 insertion(+) diff --git a/utilities.cake b/utilities.cake index df4a27cb4..57821c282 100644 --- a/utilities.cake +++ b/utilities.cake @@ -202,6 +202,7 @@ Task ("spell-check") "UrlConnection", "PerfMark", "PerfMarkApi", + "LanguageId", }; var dictionary_custom = WeCantSpell.Hunspell.WordList.CreateFromWords(words); From 17b2ee0eaf2d8bce590ee3b010c95eac5da257ca Mon Sep 17 00:00:00 2001 From: moljac Date: Fri, 29 Apr 2022 21:32:16 +0200 Subject: [PATCH 7/7] Update Directory.Build.targets --- samples/Directory.Build.targets | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/samples/Directory.Build.targets b/samples/Directory.Build.targets index be8fae820..ff9002d0c 100644 --- a/samples/Directory.Build.targets +++ b/samples/Directory.Build.targets @@ -39,21 +39,21 @@ - - - - - - - - - - + + + + + + + + + + - + - - + + @@ -134,12 +134,13 @@ + - +