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

Commit

Permalink
Merge pull request #885 from xamarin/mu-20240618-updates
Browse files Browse the repository at this point in the history
Manual updates 20240618
  • Loading branch information
moljac authored Jul 13, 2024
2 parents 0174574 + bfdaefa commit 249f09f
Show file tree
Hide file tree
Showing 23 changed files with 1,186 additions and 875 deletions.
356 changes: 184 additions & 172 deletions cgmanifest.json

Large diffs are not rendered by default.

384 changes: 208 additions & 176 deletions config.json

Large diffs are not rendered by default.

487 changes: 244 additions & 243 deletions docs/artifact-list-with-versions.md

Large diffs are not rendered by default.

383 changes: 192 additions & 191 deletions docs/artifact-list.md

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion published-namespaces.txt
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ Firebase.Analytics
Firebase.Analytics.Connector
Firebase.Analytics.Connector.Internal
Firebase.Analytics.Ktx
Firebase.Analytics.Ktx.KtxTesting
Firebase.Annotations
Firebase.Annotations.Concurrent
Firebase.AppCheck
Expand Down Expand Up @@ -444,12 +445,15 @@ Firestore.Admin.V1
Firestore.Bundle
Google.Ads
Google.Ads.Identifier
Google.Ads.InteractiveMedia.Omid.Library.AdSession
Google.Ads.InteractiveMedia.PAL
Google.Ads.InteractiveMedia.PAL.Utils
Google.Ads.InteractiveMedia.V3.Api
Google.Ads.InteractiveMedia.V3.Api.Player
Google.Ads.InteractiveMedia.V3.Api.Signals
Google.Ads.InteractiveMedia.V3.Impl
Google.Ads.InteractiveMedia.V3.Impl.Data
Google.Ads.InteractiveMedia.V3.Impl.Util
Google.Ads.Mediation
Google.Ads.Mediation.Admob
Google.AndroidLibraries.BarHopper
Expand All @@ -463,7 +467,6 @@ Google.Internal.Firebase.InAppMessaging.V1
Google.Internal.Firebase.InAppMessaging.V1.SdkServing
Google.Logging.Type
Google.Longrunning
Google.Protobuf
Google.Rpc
Google.Rpc.Context
Google.Type
Expand Down Expand Up @@ -695,6 +698,8 @@ Xamarin.GoogleAndroid.Libraries.Places.Widget.Listener
Xamarin.GoogleAndroid.Libraries.Places.Widget.Model
Xamarin.GoogleAndroid.Libraries.Vision.VisionKit.Pipeline
Xamarin.GoogleAndroid.Libraries.Vision.VisionKit.Pipeline.Alt
Xamarin.GoogleAndroid.TV.Ads
Xamarin.GoogleAndroid.TV.Ads.Controls
Xamarin.Grpc
Xamarin.Grpc.Android
Xamarin.Grpc.Core.InProcess
Expand Down
178 changes: 91 additions & 87 deletions samples/Directory.Build.targets

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<PackageReference Remove="Xamarin.GooglePlayServices.Ads.Lite" />
<PackageReference Remove="Xamarin.GooglePlayServices.Gass" />
<PackageReference Remove="Xamarin.GooglePlayServices.Measurement.Base" />
<PackageReference Remove="Xamarin.GooglePlayServices.Measurement.Sdk" />

<!-- FirebasePackages.targets -->
<!-- Duplicate managed types (due to Xamarin.AndroidX.DataStore.Core.Android and Xamarin.AndroidX.DataStore.Core.Jvm) -->
Expand All @@ -42,13 +43,20 @@
<PackageReference Remove="Xamarin.Firebase.Analytics.Impl" />
<PackageReference Remove="Xamarin.Firebase.Analytics.Ktx" />
<PackageReference Remove="Xamarin.Firebase.AppIndexing" />
<PackageReference Remove="Xamarin.Firebase.Firestore" />
<PackageReference Remove="Xamarin.Firebase.Firestore.Ktx" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging.Display" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging.Display.Ktx" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging.Ktx" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.AutoML" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.BarCode.Model" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Face.Model" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Image.Label.Model" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Internal.Vkp" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Object.Detection.Model" />
<PackageReference Remove="Xamarin.Firebase.ProtoliteWellKnownTypes" />

<!-- Google.MLKit.targets -->
<!-- Duplicate Java types -->
Expand All @@ -66,6 +74,7 @@
<PackageReference Remove="Xamarin.Google.Android.Play.Core.Ktx" />
<PackageReference Remove="Xamarin.Google.Android.Play.Feature.Delivery.Ktx" />
<PackageReference Remove="Xamarin.Google.Android.Play.Review.Ktx" />

</ItemGroup>

</Project>
8 changes: 8 additions & 0 deletions samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<PackageReference Remove="Xamarin.GooglePlayServices.Ads.Lite" />
<PackageReference Remove="Xamarin.GooglePlayServices.Gass" />
<PackageReference Remove="Xamarin.GooglePlayServices.Measurement.Base" />
<PackageReference Remove="Xamarin.GooglePlayServices.Measurement.Sdk" />

<!-- FirebasePackages.targets -->
<!-- Duplicate managed types (due to Xamarin.AndroidX.DataStore.Core.Android and Xamarin.AndroidX.DataStore.Core.Jvm) -->
Expand All @@ -76,13 +77,20 @@
<PackageReference Remove="Xamarin.Firebase.Analytics.Impl" />
<PackageReference Remove="Xamarin.Firebase.Analytics.Ktx" />
<PackageReference Remove="Xamarin.Firebase.AppIndexing" />
<PackageReference Remove="Xamarin.Firebase.Firestore" />
<PackageReference Remove="Xamarin.Firebase.Firestore.Ktx" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging.Display" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging.Display.Ktx" />
<PackageReference Remove="Xamarin.Firebase.InAppMessaging.Ktx" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.AutoML" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.BarCode.Model" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Face.Model" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Image.Label.Model" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Internal.Vkp" />
<PackageReference Remove="Xamarin.Firebase.ML.Vision.Object.Detection.Model" />
<PackageReference Remove="Xamarin.Firebase.ProtoliteWellKnownTypes" />

<!-- Google.MLKit.targets -->
<!-- Duplicate Java types -->
Expand Down
4 changes: 2 additions & 2 deletions source/GooglePlayServicesProject.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -298,11 +298,11 @@
}
@if (@Model.NuGetPackageId == "Xamarin.Firebase.Crashlytics")
{
<PackageReference Include="Xamarin.Google.Dagger" Version="2.49.0.1" />
<PackageReference Include="Xamarin.Google.Dagger" Version="2.50.0" />
}
@if (@Model.NuGetPackageId == "Xamarin.Firebase.Measurement.Connector.Impl")
{
<PackageReference Include="Xamarin.GooglePlayServices.Measurement.Base" Version="121.3.0.6" />
<PackageReference Include="Xamarin.GooglePlayServices.Measurement.Base" Version="121.3.0.7" />
}
@if
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,20 @@
>
Google.Ads.InteractiveMedia.V3.Impl.Data
</attr>

<attr
path="/api/package[@name='com.google.ads.interactivemedia.omid.library.adsession']"
name="managedName"
>
Google.Ads.InteractiveMedia.Omid.Library.AdSession
</attr>
<attr
path="/api/package[@name='com.google.ads.interactivemedia.v3.impl.util']"
name="managedName"
>
Google.Ads.InteractiveMedia.V3.Impl.Util
</attr>



</metadata>
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
<metadata>
<remove-node
path="/api/package[@name='com.google.ads.interactivemedia.v3.impl']/class[@name='AdsRequestImpl']"
/>
<remove-node
path="/api/package[@name='com.google.ads.interactivemedia.v3.impl.data']/class[@name='AdsRenderingSettingsImpl']"
/>
<remove-node
path="/api/package[@name='com.google.ads.interactivemedia.v3.impl.util']/class[@name='IdentifierInfoFactory']"
/>
<remove-node
path="/api/package[@name='com.google.ads.interactivemedia.v3.impl']/class[@name='JavaScriptMessageRouter']"
/>
<remove-node
path="/api/package[@name='com.google.ads.interactivemedia.v3.impl.data']/class[@name='NetworkResponseData']"
/>

</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,17 @@
>
Android.Gms.Measurement
</attr>
<attr
path="/api/package[@name='com.google.firebase.analytics.ktx']"
name="managedName"
>
Firebase.Analytics.Ktx
</attr>
<attr
path="/api/package[@name='com.google.firebase.analytics.ktx.ktxtesting']"
name="managedName"
>
Firebase.Analytics.Ktx.KtxTesting
</attr>

</metadata>
4 changes: 4 additions & 0 deletions source/com.google.android.tv/tv-ads/Additions/Additions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System;
using Android.Views;
using Android.Widget;
using Android.Graphics;
2 changes: 2 additions & 0 deletions source/com.google.android.tv/tv-ads/Transforms/EnumFields.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-field-mappings>
</enum-field-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-method-mappings>
</enum-method-mappings>
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<metadata>
<attr
path="/api/package[@name='com.google.android.tv.ads']"
name="managedName"
>
Xamarin.GoogleAndroid.TV.Ads
</attr>
<attr
path="/api/package[@name='com.google.android.tv.ads.controls']"
name="managedName"
>
Xamarin.GoogleAndroid.TV.Ads.Controls
</attr>
</metadata>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<metadata>
</metadata>
3 changes: 3 additions & 0 deletions source/com.google.android.tv/tv-ads/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<metadata>

</metadata>
7 changes: 5 additions & 2 deletions source/com.google.dagger/dagger/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
<attr path="/api/package[@name='dagger.internal']/class[@name='ProviderOfLazy']/method[@name='get' and count(parameter)=0]" name="managedName">GetLazy</attr>
<remove-node path="/api/package[@name='dagger.internal']/class[@name='MapProviderFactory']/implements" />

<remove-node
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='DoubleCheck']"
/>
<remove-node
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='SingleCheck']"
/>
<remove-node
path="/api/package[@name='dagger.internal']/class[@name='LazyClassKeyMap']"
/>

</metadata>
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,27 @@
<remove-node path="/api/package[@name='com.google.api']/class[@name='JwtLocation']/implements[@name='com.google.api.JwtLocationOrBuilder']" />
<remove-node path="/api/package[@name='com.google.rpc.context']/class[@name='AttributeContext']/implements[@name='com.google.rpc.context.AttributeContextOrBuilder']" />
<remove-node path="/api/package[@name='com.google.type']/class[@name='DateTime']/implements[@name='com.google.type.DateTimeOrBuilder']" />


<!--
error XA4215: The Java type
`com.google.protobuf.DescriptorProtos$ServiceOptionsOrBuilder`
is generated by more than one managed type.
DescriptorProtos appears in:
https://maven.google.com/web/index.html?q=well#com.google.firebase:protolite-well-known-types:18.0.0
2021
https://mvnrepository.com/artifact/com.google.protobuf/protobuf-javalite/4.27.1
2024-06
-->

<remove-node
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos']"
/>


</metadata>
Original file line number Diff line number Diff line change
@@ -1,2 +1,118 @@
<metadata>

<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='JavaFeaturesProto.JavaFeaturesOrBuilder']/method[@name='getUtf8Validation' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='JavaFeaturesProto.JavaFeatures.Builder']/method[@name='getUtf8Validation' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FeatureSetOrBuilder']/method[@name='getEnumType' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FeatureSet.Builder']/method[@name='getEnumType' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FeatureSetOrBuilder']/method[@name='getFieldPresence' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FeatureSet.Builder']/method[@name='getFieldPresence' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FeatureSetOrBuilder']/method[@name='getJsonFormat' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FeatureSet.Builder']/method[@name='getJsonFormat' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FeatureSetOrBuilder']/method[@name='getMessageEncoding' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FeatureSet.Builder']/method[@name='getMessageEncoding' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FeatureSetOrBuilder']/method[@name='getRepeatedFieldEncoding' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FeatureSet.Builder']/method[@name='getRepeatedFieldEncoding' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FeatureSetOrBuilder']/method[@name='getRepeatedFieldEncoding' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FeatureSet.Builder']/method[@name='getRepeatedFieldEncoding' and count(parameter)=0]"
name="propertyName"
></attr>

<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FeatureSetOrBuilder']/method[@name='getUtf8Validation' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FeatureSet.Builder']/method[@name='getUtf8Validation' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FieldDescriptorProtoOrBuilder']/method[@name='getLabel' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FieldDescriptorProto.Builder']/method[@name='getLabel' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FieldOptionsOrBuilder']/method[@name='getFeatureSupport' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FieldOptions.Builder']/method[@name='getFeatureSupport' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.GeneratedCodeInfo.AnnotationOrBuilder']/method[@name='getSemantic' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.GeneratedCodeInfo.Annotation.Builder']/method[@name='getSemantic' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.MethodOptionsOrBuilder']/method[@name='getIdempotencyLevel' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.MethodOptions.Builder']/method[@name='getIdempotencyLevel' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.UninterpretedOption.NamePartOrBuilder']/method[@name='getNamePart' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.UninterpretedOption.NamePart.Builder']/method[@name='getNamePart' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/interface[@name='DescriptorProtos.FieldDescriptorProtoOrBuilder']/method[@name='getType' and count(parameter)=0]"
name="propertyName"
></attr>
<attr
path="/api/package[@name='com.google.protobuf']/class[@name='DescriptorProtos.FieldDescriptorProto.Builder']/method[@name='getType' and count(parameter)=0]"
name="propertyName"
></attr>


</metadata>
Loading

0 comments on commit 249f09f

Please sign in to comment.