Skip to content

Commit e947452

Browse files
authored
Merge pull request #826 from xamarin/mu-20231212-gps-fb-mlkit-missing-dependencies
Manual updates 20231212 GPS-FB-MLKit missing dependencies
2 parents 3e880bf + 003d65d commit e947452

File tree

7 files changed

+320
-252
lines changed

7 files changed

+320
-252
lines changed

Directory.Build.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,11 @@
214214
<AndroidNamespaceReplacement Include='Atomicfu' Replacement='AtomicFU' />
215215
<AndroidNamespaceReplacement Include='Emojipicker' Replacement='EmojiPicker' />
216216

217+
<AndroidNamespaceReplacement Include='privacysandbox' Replacement='PrivacySandbox' />
218+
<AndroidNamespaceReplacement Include='adservices' Replacement='AdServices' />
219+
<AndroidNamespaceReplacement Include='adid' Replacement='AdId' />
220+
<AndroidNamespaceReplacement Include='adselection' Replacement='AdSelection' />
221+
<AndroidNamespaceReplacement Include='appsetid' Replacement='AppSetId' />
222+
<AndroidNamespaceReplacement Include='customaudience' Replacement='CustomAudience' />
217223
</ItemGroup>
218224
</Project>

cgmanifest.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2393,6 +2393,32 @@
23932393
},
23942394
"license": "The Apache Software License, Version 2.0"
23952395
},
2396+
{
2397+
"component": {
2398+
"type": "maven",
2399+
"maven": {
2400+
"artifactId": "ads-adservices",
2401+
"groupId": "androidx.privacysandbox.ads",
2402+
"version": "1.0.0-beta05",
2403+
"nuGetId": "Xamarin.AndroidX.PrivacySandbox.Ads.AdsServices",
2404+
"nuGetVersion": "1.0.0-beta05"
2405+
}
2406+
},
2407+
"license": "The Apache Software License, Version 2.0"
2408+
},
2409+
{
2410+
"component": {
2411+
"type": "maven",
2412+
"maven": {
2413+
"artifactId": "ads-adservices-java",
2414+
"groupId": "androidx.privacysandbox.ads",
2415+
"version": "1.0.0-beta05",
2416+
"nuGetId": "Xamarin.AndroidX.PrivacySandbox.Ads.AdsServices.Java",
2417+
"nuGetVersion": "1.0.0-beta05"
2418+
}
2419+
},
2420+
"license": "The Apache Software License, Version 2.0"
2421+
},
23962422
{
23972423
"component": {
23982424
"type": "maven",

config.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1509,6 +1509,22 @@
15091509
"nugetId": "Xamarin.AndroidX.Print",
15101510
"dependencyOnly": false
15111511
},
1512+
{
1513+
"groupId": "androidx.privacysandbox.ads",
1514+
"artifactId": "ads-adservices",
1515+
"version": "1.0.0-beta05",
1516+
"nugetVersion": "1.0.0-beta05",
1517+
"nugetId": "Xamarin.AndroidX.PrivacySandbox.Ads.AdsServices",
1518+
"dependencyOnly": false
1519+
},
1520+
{
1521+
"groupId": "androidx.privacysandbox.ads",
1522+
"artifactId": "ads-adservices-java",
1523+
"version": "1.0.0-beta05",
1524+
"nugetVersion": "1.0.0-beta05",
1525+
"nugetId": "Xamarin.AndroidX.PrivacySandbox.Ads.AdsServices.Java",
1526+
"dependencyOnly": false
1527+
},
15121528
{
15131529
"groupId": "androidx.profileinstaller",
15141530
"artifactId": "profileinstaller",

docs/artifact-list-with-versions.md

Lines changed: 128 additions & 126 deletions
Large diffs are not rendered by default.

docs/artifact-list.md

Lines changed: 128 additions & 126 deletions
Large diffs are not rendered by default.

published-namespaces.txt

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,20 @@ AndroidX.PercentLayout.Widget
275275
AndroidX.Preference
276276
AndroidX.Preference.Internal
277277
AndroidX.Print
278+
AndroidX.PrivacySandbox.Ads.AdServices.AdId
279+
AndroidX.PrivacySandbox.Ads.AdServices.AdSelection
280+
AndroidX.PrivacySandbox.Ads.AdServices.AppSetId
281+
AndroidX.PrivacySandbox.Ads.AdServices.Common
282+
AndroidX.PrivacySandbox.Ads.AdServices.CustomAudience
283+
AndroidX.PrivacySandbox.Ads.AdServices.Java.AdId
284+
AndroidX.PrivacySandbox.Ads.AdServices.Java.AdSelection
285+
AndroidX.PrivacySandbox.Ads.AdServices.Java.AppSetId
286+
AndroidX.PrivacySandbox.Ads.AdServices.Java.CustomAudience
287+
AndroidX.PrivacySandbox.Ads.AdServices.Java.Internal
288+
AndroidX.PrivacySandbox.Ads.AdServices.Java.Measurement
289+
AndroidX.PrivacySandbox.Ads.AdServices.Java.Topics
290+
AndroidX.PrivacySandbox.Ads.AdServices.Measurement
291+
AndroidX.PrivacySandbox.Ads.AdServices.Topics
278292
AndroidX.ProfileInstallers
279293
AndroidX.Recommendation.App
280294
AndroidX.RecyclerView.Selection

utilities.cake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -602,6 +602,8 @@ Task ("spell-check")
602602
"PlayServicesAuth",
603603
"GoogleAndroid",
604604
"GoogleId",
605+
"PrivacySandbox",
606+
"AdsServices",
605607
"Material3Android",
606608
"WindowSizeClassAndroid",
607609
"OkIO",

0 commit comments

Comments
 (0)