Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Manual updates 20220215 split MLKit #606

Merged
merged 9 commits into from
Apr 30, 2022
Merged

Manual updates 20220215 split MLKit #606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2f5578d
Update config.json
moljac Apr 23, 2022
295a9ba
MLKit updates
moljac Apr 27, 2022
4047b9b
Update Directory.Build.targets
moljac Apr 27, 2022
efac6cf
new package dependency
moljac Apr 27, 2022
a3cd30c
Update Metadata.Namespaces.xml
moljac Apr 27, 2022
8ef2126
spell check updates
moljac Apr 28, 2022
3df4103
Merge branch 'main' into mu-20220215-split-mlkit
moljac Apr 29, 2022
17b2ee0
Update Directory.Build.targets
moljac Apr 29, 2022
a6f28cf
Merge branch 'main' into mu-20220215-split-mlkit
moljac Apr 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 30 additions & 22 deletions config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,8 @@
{
"groupId": "com.google.android.gms",
"artifactId": "play-services-mlkit-barcode-scanning",
"version": "17.0.0",
"nugetVersion": "117.0.0",
"version": "16.2.1",
"nugetVersion": "116.2.1",
"nugetId": "Xamarin.GooglePlayServices.MLKit.BarcodeScanning",
"dependencyOnly": false
},
Expand All @@ -442,6 +442,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",
Expand Down Expand Up @@ -1097,8 +1105,8 @@
{
"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
},
Expand All @@ -1121,24 +1129,24 @@
{
"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
},
Expand Down Expand Up @@ -1177,8 +1185,8 @@
{
"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
},
Expand All @@ -1201,24 +1209,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
},
Expand Down Expand Up @@ -1249,8 +1257,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
},
Expand All @@ -1273,8 +1281,8 @@
{
"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
},
Expand Down
23 changes: 12 additions & 11 deletions samples/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@
<PackageReference Update="Xamarin.GooglePlayServices.Measurement.Impl" Version="119.0.2" />
<PackageReference Update="Xamarin.GooglePlayServices.Measurement.Sdk" Version="119.0.2" />
<PackageReference Update="Xamarin.GooglePlayServices.Measurement.Sdk.Api" Version="119.0.2" />
<PackageReference Update="Xamarin.GooglePlayServices.MLKit.BarcodeScanning" Version="117.0.0" />
<PackageReference Update="Xamarin.GooglePlayServices.MLKit.BarcodeScanning" Version="116.2.1" />
<PackageReference Update="Xamarin.GooglePlayServices.MLKit.FaceDetection" Version="116.2.0" />
<PackageReference Update="Xamarin.GooglePlayServices.MLKit.ImageLabeling" Version="116.0.5" />
<PackageReference Update="Xamarin.GooglePlayServices.MLKit.LanguageId" Version="116.0.0-beta2" />
<PackageReference Update="Xamarin.GooglePlayServices.MLKit.Text.Recognition" Version="116.3.0" />
<PackageReference Update="Xamarin.GooglePlayServices.Nearby" Version="118.0.2" />
<PackageReference Update="Xamarin.GooglePlayServices.Oss.Licenses" Version="117.0.0.5" />
Expand Down Expand Up @@ -132,29 +133,29 @@
<PackageReference Update="Xamarin.Firebase.Storage" Version="120.0.0.5" />
<PackageReference Update="Xamarin.Firebase.Storage.Common" Version="117.0.0.5" />
<PackageReference Update="Xamarin.Firebase.ProtoliteWellKnownTypes" Version="118.0.0.5" />
<PackageReference Update="Xamarin.Google.MLKit.BarcodeScanning" Version="116.1.2.5" />
<PackageReference Update="Xamarin.Google.MLKit.BarcodeScanning" Version="116.2.0" />
<PackageReference Update="Xamarin.Google.MLKit.BarcodeScanning.Common" Version="116.0.0" />
<PackageReference Update="Xamarin.Google.MLKit.Common" Version="117.5.0" />
<PackageReference Update="Xamarin.Google.MLKit.DigitalInk.Recognition" Version="117.0.0.5" />
<PackageReference Update="Xamarin.Google.MLKit.FaceDetection" Version="116.1.1.5" />
<PackageReference Update="Xamarin.Google.MLKit.ImageLabeling" Version="117.0.4.5" />
<PackageReference Update="Xamarin.Google.MLKit.DigitalInk.Recognition" Version="117.0.1" />
<PackageReference Update="Xamarin.Google.MLKit.FaceDetection" Version="116.1.2" />
<PackageReference Update="Xamarin.Google.MLKit.ImageLabeling" Version="117.0.5" />
<PackageReference Update="Xamarin.Google.MLKit.ImageLabeling.AutoML" Version="116.2.1.6" />
<PackageReference Update="Xamarin.Google.MLKit.ImageLabeling.Common" Version="117.1.0" />
<PackageReference Update="Xamarin.Google.MLKit.ImageLabeling.Custom" Version="116.3.1.5" />
<PackageReference Update="Xamarin.Google.MLKit.ImageLabeling.Default.Common" Version="116.0.1" />
<PackageReference Update="Xamarin.Google.MLKit.Language.Id" Version="116.1.1.5" />
<PackageReference Update="Xamarin.Google.MLKit.Language.Id" Version="117.0.0" />
<PackageReference Update="Xamarin.Google.MLKit.LinkFirebase" Version="116.1.1.5" />
<PackageReference Update="Xamarin.Google.MLKit.MediaPipe.Internal" Version="116.0.0.5" />
<PackageReference Update="Xamarin.Google.MLKit.ObjectDetection" Version="116.2.4.5" />
<PackageReference Update="Xamarin.Google.MLKit.ObjectDetection.Common" Version="117.0.1.5" />
<PackageReference Update="Xamarin.Google.MLKit.ObjectDetection.Custom" Version="116.3.2.5" />
<PackageReference Update="Xamarin.Google.MLKit.ObjectDetection" Version="116.2.8" />
<PackageReference Update="Xamarin.Google.MLKit.ObjectDetection.Common" Version="117.2.0" />
<PackageReference Update="Xamarin.Google.MLKit.ObjectDetection.Custom" Version="116.3.4" />
<PackageReference Update="Xamarin.Google.MLKit.PoseDetection" Version="117.0.0.5" />
<PackageReference Update="Xamarin.Google.MLKit.PoseDetection.Accurate" Version="117.0.0.5" />
<PackageReference Update="Xamarin.Google.MLKit.PoseDetection.Common" Version="117.0.0.5" />
<PackageReference Update="Xamarin.Google.MLKit.SmartReply" Version="116.1.1.5" />
<PackageReference Update="Xamarin.Google.MLKit.SmartReply" Version="116.2.0" />
<PackageReference Update="Xamarin.Google.MLKit.Translate" Version="116.1.2.5" />
<PackageReference Update="Xamarin.Google.MLKit.Vision.Common" Version="116.7.0" />
<PackageReference Update="Xamarin.Google.MLKit.Vision.Internal.Vkp" Version="118.1.1.5" />
<PackageReference Update="Xamarin.Google.MLKit.Vision.Internal.Vkp" Version="118.2.1" />
<PackageReference Update="Xamarin.Google.Android.ODML.Image" Version="1.0.0.0-beta1" />
<PackageReference Update="Xamarin.Protobuf.JavaLite" Version="3.14.0.3" />
<PackageReference Update="Xamarin.Protobuf.Lite" Version="3.0.1.3" />
Expand Down
24 changes: 20 additions & 4 deletions ...com.google.android.gms/play-services-mlkit-language-id/Transforms/Metadata.Namespaces.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
<metadata>
<!--
<attr
path="/api/package[@name='package']"
path="/api/package[@name='com.google.mlkit.nl.languageid']"
name="managedName"
>
Package
Xamarin.Google.MLKit.NL.LanguageId
</attr>
<attr
path="/api/package[@name='com.google.mlkit.ml.languageid.internal']"
name="managedName"
>
Xamarin.Google.MLKit.ML.LanguageId.Internal
</attr>
<attr
path="/api/package[@name='com.google.mlkit.vision.barcode.common.internal']"
name="managedName"
>
Xamarin.Google.MLKit.Vision.Barcode.Common.Internal
</attr>
<attr
path="/api/package[@name='com.google.mlkit.nl.languageid.internal']"
name="managedName"
>
Xamarin.Google.MLKit.NL.LanguageId.Internal
</attr>
-->
</metadata>
7 changes: 6 additions & 1 deletion source/com.google.mlkit/language-id/Transforms/Metadata.Namespaces.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@
>
Xamarin.Google.MLKit.LanguageId.Internal
</attr>

<attr
path="/api/package[@name='com.google.android.gms.dynamite.descriptors.com.google.mlkit.dynamite.langid']"
name="managedName"
>
Android.Gms.Dynamite.Descriptors.MLKit.Dynamite.LangId
</attr>


</metadata>
1 change: 1 addition & 0 deletions utilities.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ Task ("spell-check")
"UrlConnection",
"PerfMark",
"PerfMarkApi",
"LanguageId",
"AppSet",
"Ktx",
"Proto",
Expand Down