Skip to content

Commit d7be4a8

Browse files
moljacmoljac
authored
Merge pull request #582 from xamarin/mu-20220710-new-packages
Manual updates 20220710 new packages (androidx.enterprise, androidx.window:window-rxjava*...)
2 parents 8a17ca9 + c1aa504 commit d7be4a8

File tree

13 files changed

+511
-22
lines changed

13 files changed

+511
-22
lines changed

‎Directory.Build.props‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@
4343
</ItemGroup>
4444

4545
<ItemGroup>
46+
<!--
47+
must be used before `com.google.`
48+
-->
49+
<AndroidNamespaceReplacement Include='com.google.common.flogger' Replacement='Xamarin.Google.Flogger' />
50+
4651
<!-- Company namespace changes -->
4752
<AndroidNamespaceReplacement Include='androidx.' Replacement='AndroidX' />
4853
<AndroidNamespaceReplacement Include='com.google.gson' Replacement='GoogleGson' />
@@ -161,6 +166,8 @@
161166
<AndroidNamespaceReplacement Include='wear-remote-interactions' Replacement='RemoveInteractions' />
162167
<AndroidNamespaceReplacement Include='webkit' Replacement='WebKit' />
163168
<AndroidNamespaceReplacement Include='poolingcontainer' Replacement='PoolingContainer' />
169+
<AndroidNamespaceReplacement Include='appactions' Replacement='AppActions' />
170+
<AndroidNamespaceReplacement Include='pinappwidget' Replacement='PinAppWidget' />
164171

165172
</ItemGroup>
166173
</Project>

‎config.json‎

Lines changed: 92 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,14 @@
617617
"nugetId": "Xamarin.AndroidX.Emoji2.ViewsHelper",
618618
"dependencyOnly": false
619619
},
620+
{
621+
"groupId": "androidx.enterprise",
622+
"artifactId": "enterprise-feedback",
623+
"version": "1.0.0",
624+
"nugetVersion": "1.0.0",
625+
"nugetId": "Xamarin.AndroidX.Enterprise.Feedback",
626+
"dependencyOnly": false
627+
},
620628
{
621629
"groupId": "androidx.exifinterface",
622630
"artifactId": "exifinterface",
@@ -1394,6 +1402,22 @@
13941402
"nugetId": "Xamarin.AndroidX.Window.WindowJava",
13951403
"dependencyOnly": false
13961404
},
1405+
{
1406+
"groupId": "androidx.window",
1407+
"artifactId": "window-rxjava2",
1408+
"version": "1.0.0",
1409+
"nugetVersion": "1.0.0",
1410+
"nugetId": "Xamarin.AndroidX.Window.WindowRxJava2",
1411+
"dependencyOnly": false
1412+
},
1413+
{
1414+
"groupId": "androidx.window",
1415+
"artifactId": "window-rxjava3",
1416+
"version": "1.0.0",
1417+
"nugetVersion": "1.0.0",
1418+
"nugetId": "Xamarin.AndroidX.Window.WindowRxJava3",
1419+
"dependencyOnly": false
1420+
},
13971421
{
13981422
"groupId": "androidx.work",
13991423
"artifactId": "work-runtime",
@@ -1418,6 +1442,22 @@
14181442
"nugetId": "Xamarin.Google.Android.Material",
14191443
"dependencyOnly": false
14201444
},
1445+
{
1446+
"groupId": "com.google.assistant.appactions",
1447+
"artifactId": "suggestions",
1448+
"version": "1.0.0",
1449+
"nugetVersion": "1.0.0",
1450+
"nugetId": "Xamarin.Google.Assistant.AppActions.Suggestions",
1451+
"dependencyOnly": false
1452+
},
1453+
{
1454+
"groupId": "com.google.assistant.appactions",
1455+
"artifactId": "widgets",
1456+
"version": "0.0.1",
1457+
"nugetVersion": "0.0.1",
1458+
"nugetId": "Xamarin.Google.Assistant.AppActions.Widgets",
1459+
"dependencyOnly": false
1460+
},
14211461
{
14221462
"groupId": "com.google.android.material",
14231463
"artifactId": "compose-theme-adapter",
@@ -1745,6 +1785,15 @@
17451785
"dependencyOnly": false,
17461786
"templateSet": "kotlinx"
17471787
},
1788+
{
1789+
"groupId": "org.jetbrains.kotlinx",
1790+
"artifactId": "kotlinx-coroutines-rx3",
1791+
"version": "1.6.2",
1792+
"nugetVersion": "1.6.2",
1793+
"nugetId": "Xamarin.KotlinX.Coroutines.Rx3",
1794+
"dependencyOnly": false,
1795+
"templateSet": "kotlinx"
1796+
},
17481797
{
17491798
"groupId": "org.reactivestreams",
17501799
"artifactId": "reactive-streams",
@@ -1754,6 +1803,24 @@
17541803
"dependencyOnly": false,
17551804
"templateSet": "reactive-streams"
17561805
},
1806+
{
1807+
"groupId": "com.google.flogger",
1808+
"artifactId": "flogger",
1809+
"version": "0.4",
1810+
"nugetVersion": "0.4.0",
1811+
"nugetId": "Xamarin.Flogger",
1812+
"dependencyOnly": false,
1813+
"templateSet": "flogger"
1814+
},
1815+
{
1816+
"groupId": "com.google.flogger",
1817+
"artifactId": "flogger-system-backend",
1818+
"version": "0.4",
1819+
"nugetVersion": "0.4.0",
1820+
"nugetId": "Xamarin.Flogger.SystemBackend",
1821+
"dependencyOnly": false,
1822+
"templateSet": "flogger"
1823+
},
17571824
{
17581825
"groupId": "com.android.installreferrer",
17591826
"artifactId": "installreferrer",
@@ -1767,16 +1834,24 @@
17671834
{
17681835
"groupId": "com.google.android.gms",
17691836
"artifactId": "play-services-basement",
1770-
"version": "17.0.0",
1771-
"nugetVersion": "117.6.0.2",
1837+
"version": "18.0.2",
1838+
"nugetVersion": "118.0.2.1",
17721839
"nugetId": "Xamarin.GooglePlayServices.Basement",
17731840
"dependencyOnly": true
17741841
},
1842+
{
1843+
"groupId": "com.google.android.gms",
1844+
"artifactId": "play-services-tasks",
1845+
"version": "18.0.1",
1846+
"nugetVersion": "118.0.1.1",
1847+
"nugetId": "Xamarin.GooglePlayServices.Tasks",
1848+
"dependencyOnly": true
1849+
},
17751850
{
17761851
"groupId": "com.google.android.gms",
17771852
"artifactId": "play-services-wearable",
17781853
"version": "17.1.0",
1779-
"nugetVersion": "117.1.0.1",
1854+
"nugetVersion": "117.1.0.6",
17801855
"nugetId": "Xamarin.GooglePlayServices.Wearable",
17811856
"dependencyOnly": true
17821857
},
@@ -1956,6 +2031,20 @@
19562031
}
19572032
]
19582033
},
2034+
{
2035+
"name": "flogger",
2036+
"mavenRepositoryType": "MavenCentral",
2037+
"templates": [
2038+
{
2039+
"templateFile": "templates/flogger/Project.cshtml",
2040+
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
2041+
},
2042+
{
2043+
"templateFile": "source/AndroidXSolutionFilter.cshtml",
2044+
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
2045+
}
2046+
]
2047+
},
19592048
{
19602049
"name": "installreferrer",
19612050
"mavenRepositoryType": "Google",

‎published-namespaces.txt‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ AndroidX.Emoji.Widget
160160
AndroidX.Emoji2.Text
161161
AndroidX.Emoji2.Text.FlatBuffer
162162
AndroidX.Emoji2.ViewsIntegration
163+
AndroidX.Enterprise.Feedback
163164
AndroidX.ExifInterface.Media
164165
AndroidX.Fragment.App
165166
AndroidX.Fragment.App.StrictMode
@@ -260,6 +261,8 @@ AndroidX.Window.Embedding
260261
AndroidX.Window.Extensions
261262
AndroidX.Window.Java.Layout
262263
AndroidX.Window.Layout
264+
AndroidX.Window.RxJava2.Layout
265+
AndroidX.Window.RxJava3.Layout
263266
AndroidX.Work
264267
AndroidX.Work.Impl.Background.Greedy
265268
AndroidX.Work.Impl.Background.SystemJob
@@ -274,6 +277,7 @@ AndroidX.Work.Impl.Utils.Futures
274277
AndroidX.Work.Impl.Utils.TaskExecutor
275278
AndroidX.Work.Impl.Workers
276279
AndroidX.Work.MultiProcess
280+
Google.Android.Libraries.AppActions.Service
277281
Google.Android.Material.Animation
278282
Google.Android.Material.AppBar
279283
Google.Android.Material.Badge
@@ -324,6 +328,10 @@ Google.Android.Material.Tooltip
324328
Google.Android.Material.Transformation
325329
Google.Android.Material.Transition
326330
Google.Android.Material.Transition.Platform
331+
Google.Assistant.AppActions.Suggestions
332+
Google.Assistant.AppActions.Suggestions.Client
333+
Google.Assistant.AppActions.Widgets
334+
Google.Assistant.AppActions.Widgets.PinAppWidget
327335
Google.AutoValue.Annotations
328336
Google.AutoValue.Extension.Serializable
329337
Google.AutoValue.Extension.ToPrettyString
@@ -478,6 +486,12 @@ Xamarin.Google.Crypto.Tink.StreamingAead
478486
Xamarin.Google.Crypto.Tink.Subtle
479487
Xamarin.Google.Crypto.Tink.Subtle.Prf
480488
Xamarin.Google.Crypto.Tink.Tinkkey
489+
Xamarin.Google.Flogger
490+
Xamarin.Google.Flogger.Backend
491+
Xamarin.Google.Flogger.Backend.System
492+
Xamarin.Google.Flogger.Parameter
493+
Xamarin.Google.Flogger.Parser
494+
Xamarin.Google.Flogger.Util
481495
Xamarin.Kotlin
482496
Xamarin.KotlinX.Coroutines
483497
Xamarin.KotlinX.Coroutines.Channels
@@ -488,6 +502,7 @@ Xamarin.KotlinX.Coroutines.Guava
488502
Xamarin.KotlinX.Coroutines.Intrinsics
489503
Xamarin.KotlinX.Coroutines.Reactive
490504
Xamarin.KotlinX.Coroutines.Rx2
505+
Xamarin.KotlinX.Coroutines.Rx3
491506
Xamarin.KotlinX.Coroutines.Scheduling
492507
Xamarin.KotlinX.Coroutines.Selects
493508
Xamarin.KotlinX.Coroutines.Stream

‎samples/NuGet.config‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,12 @@
1010
<!--
1111
https://docs.microsoft.com/en-us/nuget/consume-packages/package-source-mapping
1212
Define mappings by adding package patterns beneath the target source.
13-
14-
packages restored from "Local Output":
15-
Xamarin.AndroidX.*
16-
Xamarin.Kotlin.*
17-
Xamarin.KotlinX.*
18-
Xamarin.Google.AutoValue.Annotations
19-
GoogleGson
20-
Xamarin.Google.Guava
21-
Xamarin.Google.Guava.*
22-
Xamarin.Google.J2Objc.Annotations
23-
packages restored from nuget.org:
24-
everything else
2513
-->
2614
<packageSourceMapping>
2715
<!-- key value for <packageSource> should match key values from <packageSources> element -->
16+
<!--
17+
packages restored from "Local Output":
18+
-->
2819
<packageSource key="Local Output">
2920
<package pattern="Xamarin.AndroidX.*" />
3021
<package pattern="Xamarin.Google.Android.Material" />
@@ -36,13 +27,20 @@
3627
<package pattern="Xamarin.Google.Guava.*" />
3728
<package pattern="Xamarin.AndroidX.*" />
3829
<package pattern="Xamarin.Google.J2Objc.Annotations" />
30+
<package pattern="Xamarin.Flogger" />
31+
<package pattern="Xamarin.Flogger.*" />
32+
<package pattern="Xamarin.Google.Assistant.AppActions.*" />
3933
<package pattern="Xamarin.Google.Android.InstallReferrer" />
4034
<package pattern="Xamarin.CheckerFramework.CheckerQual" />
4135
<package pattern="Xamarin.AAkira.*" />
4236
<package pattern="Xamarin.Google.Accompanist.*" />
4337
<package pattern="Xamarin.Google.Android.Material.*" />
4438
</packageSource>
45-
<packageSource key="nuget.org">
39+
<!--
40+
packages restored from nuget.org:
41+
everything else
42+
-->
43+
<packageSource key="nuget.org">
4644
<package pattern="*" />
4745
<package pattern="Xamarin.AndroidX.*" />
4846
<package pattern="Xamarin.AndroidX.Security.SecurityCrypto" />

‎source/com.google.flogger/flogger/Transforms/EnumFields.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<enum-field-mappings>
2+
</enum-field-mappings>

‎source/com.google.flogger/flogger/Transforms/EnumMethods.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<enum-method-mappings>
2+
</enum-method-mappings>

‎source/com.google.flogger/flogger/Transforms/Metadata.ParameterNames.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<metadata>
2+
</metadata>

‎source/com.google.flogger/flogger/Transforms/Metadata.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<metadata>
2+
<attr
3+
path="/api/package[@name='com.google.common.flogger']/class[@name='FluentLogger']/method[@name='at' and count(parameter)=1 and parameter[1][@type='java.util.logging.Level']]"
4+
name="visibility"
5+
>
6+
public
7+
</attr>
8+
<attr
9+
path="/api/package[@name='com.google.common.flogger']/class[@name='FluentLogger']/method[@name='at' and count(parameter)=1 and parameter[1][@type='java.util.logging.Level']]"
10+
name="managedReturn"
11+
>
12+
Java.Lang.Object
13+
</attr>
14+
<attr
15+
path="/api/package[@name='com.google.common.flogger.backend']/class[@name='SimpleMessageFormatter']/method[@name='addParameterImpl' and count(parameter)=3 and parameter[1][@type='int'] and parameter[2][@type='int'] and parameter[3][@type='com.google.common.flogger.parameter.Parameter']]"
16+
name="visibility"
17+
>
18+
protected
19+
</attr>
20+
<attr
21+
path="/api/package[@name='com.google.common.flogger.backend']/class[@name='SimpleMessageFormatter']/method[@name='buildImpl' and count(parameter)=0]"
22+
name="managedReturn"
23+
>
24+
Java.Lang.Object
25+
</attr>
26+
<attr
27+
path="/api/package[@name='com.google.common.flogger.backend']/class[@name='SimpleMessageFormatter']/method[@name='buildImpl' and count(parameter)=0]"
28+
name="visibility"
29+
>
30+
protected
31+
</attr>
32+
33+
</metadata>

0 commit comments

Comments
 (0)