Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
600b4a2
inital commit of flogger (fluent logginf for java) template
moljac Jul 11, 2022
f6f714b
typo fixed
moljac Jul 11, 2022
000f03e
Merge branch 'main' into mu-20220710-new-packages
moljac Jul 12, 2022
d5afa33
Update config.json
moljac Jul 12, 2022
6aa847c
Merge branch 'mu-20220710-new-packages' of https://github.com/xamarin…
moljac Jul 12, 2022
52c8703
.NET SDK 6.0.300, xcode 13.2.1 et al
moljac Jul 13, 2022
4e80a41
Update Directory.Build.props
moljac Jul 13, 2022
efee940
flogger metadata initial commit
moljac Jul 13, 2022
c80c06b
build green
moljac Jul 13, 2022
22ce443
Update published-namespaces.txt
moljac Jul 13, 2022
9b0cec1
nuget id fix
moljac Jul 13, 2022
c997451
Create .gitignore
moljac Jul 13, 2022
ee4e79e
spell checking for new packages
moljac Jul 13, 2022
d21301a
samples refactored
moljac Jul 15, 2022
c0a1416
dotnet (modern/new) samples
moljac Jul 15, 2022
ab51874
Guava.ListenableFuture" Version="9999.0.0"
moljac Jul 17, 2022
ded4931
Revert "Guava.ListenableFuture" Version="9999.0.0""
moljac Jul 17, 2022
30010fc
Xamarin.AndroidX.Security.SecurityCrypto for MAUI
moljac Jul 17, 2022
9c776b5
generate ./output/Directory.packages.props
moljac Jul 17, 2022
6b51542
Merge branch 'main' into mu-20220710-new-packages
moljac Jul 22, 2022
723f47b
Update NuGet.config
moljac Jul 22, 2022
b50bd98
Update azure-pipelines.yml
moljac Jul 22, 2022
3962a09
samples cleanup
moljac Jul 22, 2022
e46645d
Merge branch 'main' into mu-20220710-new-packages
moljac Jul 22, 2022
98eba9f
Merge branch 'main' into mu-20220710-new-packages
moljac Jul 25, 2022
667ab47
samples rewritten
moljac Jul 26, 2022
f20b099
XamarinDotNetWorkloadSource updated
moljac Jul 26, 2022
eaa2116
Create workloads.json
moljac Jul 26, 2022
c636379
Merge branch 'main' into mu-20220710-new-packages
moljac Jul 27, 2022
9d85873
Merge branch 'main' into mu-20220710-new-packages
moljac Jul 28, 2022
feb7740
XamarinDotNetWorkloadSource: workloads.json
moljac Jul 29, 2022
47e00e3
Merge branch 'mu-20220710-new-packages' of https://github.com/xamarin…
moljac Jul 29, 2022
5360f23
Merge branch 'main' into mu-20220710-new-packages
moljac Aug 4, 2022
9ac9f25
Merge branch 'main' into mu-20220710-new-packages
moljac Aug 8, 2022
2941ccc
Merge branch 'main' into mu-20220710-new-packages
moljac Aug 10, 2022
92f0435
removed duplicate Title tags
moljac Aug 12, 2022
f3d187e
Flogger data for nuspec
moljac Aug 12, 2022
16f8e58
Update Directory.Build.props
moljac Aug 12, 2022
4a64541
Merge branch 'mu-20220710-new-packages' of https://github.com/xamarin…
moljac Aug 12, 2022
adc5bb7
Update published-namespaces.txt
moljac Aug 15, 2022
45e037b
Merge branch 'main' into mu-20220710-new-packages
moljac Aug 15, 2022
7d5c756
Merge branch 'main' into mu-20220710-new-packages
moljac Aug 18, 2022
2ebdb6a
config.json merge error fix
moljac Aug 18, 2022
c1aa504
Merge branch 'mu-20220710-new-packages' of https://github.com/xamarin…
moljac Aug 18, 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
7 changes: 7 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
</ItemGroup>

<ItemGroup>
<!--
must be used before `com.google.`
-->
<AndroidNamespaceReplacement Include='com.google.common.flogger' Replacement='Xamarin.Google.Flogger' />

<!-- Company namespace changes -->
<AndroidNamespaceReplacement Include='androidx.' Replacement='AndroidX' />
<AndroidNamespaceReplacement Include='com.google.gson' Replacement='GoogleGson' />
Expand Down Expand Up @@ -161,6 +166,8 @@
<AndroidNamespaceReplacement Include='wear-remote-interactions' Replacement='RemoveInteractions' />
<AndroidNamespaceReplacement Include='webkit' Replacement='WebKit' />
<AndroidNamespaceReplacement Include='poolingcontainer' Replacement='PoolingContainer' />
<AndroidNamespaceReplacement Include='appactions' Replacement='AppActions' />
<AndroidNamespaceReplacement Include='pinappwidget' Replacement='PinAppWidget' />

</ItemGroup>
</Project>
95 changes: 92 additions & 3 deletions config.json
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,14 @@
"nugetId": "Xamarin.AndroidX.Emoji2.ViewsHelper",
"dependencyOnly": false
},
{
"groupId": "androidx.enterprise",
"artifactId": "enterprise-feedback",
"version": "1.0.0",
"nugetVersion": "1.0.0",
"nugetId": "Xamarin.AndroidX.Enterprise.Feedback",
"dependencyOnly": false
},
{
"groupId": "androidx.exifinterface",
"artifactId": "exifinterface",
Expand Down Expand Up @@ -1394,6 +1402,22 @@
"nugetId": "Xamarin.AndroidX.Window.WindowJava",
"dependencyOnly": false
},
{
"groupId": "androidx.window",
"artifactId": "window-rxjava2",
"version": "1.0.0",
"nugetVersion": "1.0.0",
"nugetId": "Xamarin.AndroidX.Window.WindowRxJava2",
"dependencyOnly": false
},
{
"groupId": "androidx.window",
"artifactId": "window-rxjava3",
"version": "1.0.0",
"nugetVersion": "1.0.0",
"nugetId": "Xamarin.AndroidX.Window.WindowRxJava3",
"dependencyOnly": false
},
{
"groupId": "androidx.work",
"artifactId": "work-runtime",
Expand All @@ -1418,6 +1442,22 @@
"nugetId": "Xamarin.Google.Android.Material",
"dependencyOnly": false
},
{
"groupId": "com.google.assistant.appactions",
"artifactId": "suggestions",
"version": "1.0.0",
"nugetVersion": "1.0.0",
"nugetId": "Xamarin.Google.Assistant.AppActions.Suggestions",
"dependencyOnly": false
},
{
"groupId": "com.google.assistant.appactions",
"artifactId": "widgets",
"version": "0.0.1",
"nugetVersion": "0.0.1",
"nugetId": "Xamarin.Google.Assistant.AppActions.Widgets",
"dependencyOnly": false
},
{
"groupId": "com.google.android.material",
"artifactId": "compose-theme-adapter",
Expand Down Expand Up @@ -1745,6 +1785,15 @@
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.jetbrains.kotlinx",
"artifactId": "kotlinx-coroutines-rx3",
"version": "1.6.2",
"nugetVersion": "1.6.2",
"nugetId": "Xamarin.KotlinX.Coroutines.Rx3",
"dependencyOnly": false,
"templateSet": "kotlinx"
},
{
"groupId": "org.reactivestreams",
"artifactId": "reactive-streams",
Expand All @@ -1754,6 +1803,24 @@
"dependencyOnly": false,
"templateSet": "reactive-streams"
},
{
"groupId": "com.google.flogger",
"artifactId": "flogger",
"version": "0.4",
"nugetVersion": "0.4.0",
"nugetId": "Xamarin.Flogger",
"dependencyOnly": false,
"templateSet": "flogger"
},
{
"groupId": "com.google.flogger",
"artifactId": "flogger-system-backend",
"version": "0.4",
"nugetVersion": "0.4.0",
"nugetId": "Xamarin.Flogger.SystemBackend",
"dependencyOnly": false,
"templateSet": "flogger"
},
{
"groupId": "com.android.installreferrer",
"artifactId": "installreferrer",
Expand All @@ -1767,16 +1834,24 @@
{
"groupId": "com.google.android.gms",
"artifactId": "play-services-basement",
"version": "17.0.0",
"nugetVersion": "117.6.0.2",
"version": "18.0.2",
"nugetVersion": "118.0.2.1",
"nugetId": "Xamarin.GooglePlayServices.Basement",
"dependencyOnly": true
},
{
"groupId": "com.google.android.gms",
"artifactId": "play-services-tasks",
"version": "18.0.1",
"nugetVersion": "118.0.1.1",
"nugetId": "Xamarin.GooglePlayServices.Tasks",
"dependencyOnly": true
},
{
"groupId": "com.google.android.gms",
"artifactId": "play-services-wearable",
"version": "17.1.0",
"nugetVersion": "117.1.0.1",
"nugetVersion": "117.1.0.6",
"nugetId": "Xamarin.GooglePlayServices.Wearable",
"dependencyOnly": true
},
Expand Down Expand Up @@ -1956,6 +2031,20 @@
}
]
},
{
"name": "flogger",
"mavenRepositoryType": "MavenCentral",
"templates": [
{
"templateFile": "templates/flogger/Project.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.csproj"
},
{
"templateFile": "source/AndroidXSolutionFilter.cshtml",
"outputFileRule": "generated/{groupid}.{artifactid}/{groupid}.{artifactid}.slnf"
}
]
},
{
"name": "installreferrer",
"mavenRepositoryType": "Google",
Expand Down
15 changes: 15 additions & 0 deletions published-namespaces.txt
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ AndroidX.Emoji.Widget
AndroidX.Emoji2.Text
AndroidX.Emoji2.Text.FlatBuffer
AndroidX.Emoji2.ViewsIntegration
AndroidX.Enterprise.Feedback
AndroidX.ExifInterface.Media
AndroidX.Fragment.App
AndroidX.Fragment.App.StrictMode
Expand Down Expand Up @@ -260,6 +261,8 @@ AndroidX.Window.Embedding
AndroidX.Window.Extensions
AndroidX.Window.Java.Layout
AndroidX.Window.Layout
AndroidX.Window.RxJava2.Layout
AndroidX.Window.RxJava3.Layout
AndroidX.Work
AndroidX.Work.Impl.Background.Greedy
AndroidX.Work.Impl.Background.SystemJob
Expand All @@ -274,6 +277,7 @@ AndroidX.Work.Impl.Utils.Futures
AndroidX.Work.Impl.Utils.TaskExecutor
AndroidX.Work.Impl.Workers
AndroidX.Work.MultiProcess
Google.Android.Libraries.AppActions.Service
Google.Android.Material.Animation
Google.Android.Material.AppBar
Google.Android.Material.Badge
Expand Down Expand Up @@ -324,6 +328,10 @@ Google.Android.Material.Tooltip
Google.Android.Material.Transformation
Google.Android.Material.Transition
Google.Android.Material.Transition.Platform
Google.Assistant.AppActions.Suggestions
Google.Assistant.AppActions.Suggestions.Client
Google.Assistant.AppActions.Widgets
Google.Assistant.AppActions.Widgets.PinAppWidget
Google.AutoValue.Annotations
Google.AutoValue.Extension.Serializable
Google.AutoValue.Extension.ToPrettyString
Expand Down Expand Up @@ -478,6 +486,12 @@ Xamarin.Google.Crypto.Tink.StreamingAead
Xamarin.Google.Crypto.Tink.Subtle
Xamarin.Google.Crypto.Tink.Subtle.Prf
Xamarin.Google.Crypto.Tink.Tinkkey
Xamarin.Google.Flogger
Xamarin.Google.Flogger.Backend
Xamarin.Google.Flogger.Backend.System
Xamarin.Google.Flogger.Parameter
Xamarin.Google.Flogger.Parser
Xamarin.Google.Flogger.Util
Xamarin.Kotlin
Xamarin.KotlinX.Coroutines
Xamarin.KotlinX.Coroutines.Channels
Expand All @@ -488,6 +502,7 @@ Xamarin.KotlinX.Coroutines.Guava
Xamarin.KotlinX.Coroutines.Intrinsics
Xamarin.KotlinX.Coroutines.Reactive
Xamarin.KotlinX.Coroutines.Rx2
Xamarin.KotlinX.Coroutines.Rx3
Xamarin.KotlinX.Coroutines.Scheduling
Xamarin.KotlinX.Coroutines.Selects
Xamarin.KotlinX.Coroutines.Stream
Expand Down
24 changes: 11 additions & 13 deletions samples/NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,12 @@
<!--
https://docs.microsoft.com/en-us/nuget/consume-packages/package-source-mapping
Define mappings by adding package patterns beneath the target source.

packages restored from "Local Output":
Xamarin.AndroidX.*
Xamarin.Kotlin.*
Xamarin.KotlinX.*
Xamarin.Google.AutoValue.Annotations
GoogleGson
Xamarin.Google.Guava
Xamarin.Google.Guava.*
Xamarin.Google.J2Objc.Annotations
packages restored from nuget.org:
everything else
-->
<packageSourceMapping>
<!-- key value for <packageSource> should match key values from <packageSources> element -->
<!--
packages restored from "Local Output":
-->
<packageSource key="Local Output">
<package pattern="Xamarin.AndroidX.*" />
<package pattern="Xamarin.Google.Android.Material" />
Expand All @@ -36,13 +27,20 @@
<package pattern="Xamarin.Google.Guava.*" />
<package pattern="Xamarin.AndroidX.*" />
<package pattern="Xamarin.Google.J2Objc.Annotations" />
<package pattern="Xamarin.Flogger" />
<package pattern="Xamarin.Flogger.*" />
<package pattern="Xamarin.Google.Assistant.AppActions.*" />
<package pattern="Xamarin.Google.Android.InstallReferrer" />
<package pattern="Xamarin.CheckerFramework.CheckerQual" />
<package pattern="Xamarin.AAkira.*" />
<package pattern="Xamarin.Google.Accompanist.*" />
<package pattern="Xamarin.Google.Android.Material.*" />
</packageSource>
<packageSource key="nuget.org">
<!--
packages restored from nuget.org:
everything else
-->
<packageSource key="nuget.org">
<package pattern="*" />
<package pattern="Xamarin.AndroidX.*" />
<package pattern="Xamarin.AndroidX.Security.SecurityCrypto" />
Expand Down
2 changes: 2 additions & 0 deletions source/com.google.flogger/flogger/Transforms/EnumFields.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<enum-field-mappings>
</enum-field-mappings>
2 changes: 2 additions & 0 deletions source/com.google.flogger/flogger/Transforms/EnumMethods.xml
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,2 @@
<metadata>
</metadata>
33 changes: 33 additions & 0 deletions source/com.google.flogger/flogger/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<metadata>
<attr
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']]"
name="visibility"
>
public
</attr>
<attr
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']]"
name="managedReturn"
>
Java.Lang.Object
</attr>
<attr
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']]"
name="visibility"
>
protected
</attr>
<attr
path="/api/package[@name='com.google.common.flogger.backend']/class[@name='SimpleMessageFormatter']/method[@name='buildImpl' and count(parameter)=0]"
name="managedReturn"
>
Java.Lang.Object
</attr>
<attr
path="/api/package[@name='com.google.common.flogger.backend']/class[@name='SimpleMessageFormatter']/method[@name='buildImpl' and count(parameter)=0]"
name="visibility"
>
protected
</attr>

</metadata>
Loading