Skip to content

Commit e8df55e

Browse files
mattleibowmattleibow
authored
Cleaned up and added more logging (#1250)
* Cleaned up and added more logging * Re-gen the API files
1 parent 18fbd9c commit e8df55e

File tree

10 files changed

+48
-9
lines changed

10 files changed

+48
-9
lines changed

‎.config/dotnet-tools.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
"commands": [
88
"dotnet-cake"
99
],
10-
"rollForward": false
10+
"rollForward": true
1111
},
1212
"dotnet-test-slicer": {
1313
"version": "0.1.0-alpha7",
1414
"commands": [
1515
"dotnet-test-slicer"
1616
],
17-
"rollForward": false
17+
"rollForward": true
1818
},
1919
"api-tools": {
2020
"version": "1.4.2-preview.2",
2121
"commands": [
2222
"api-tools"
2323
],
24-
"rollForward": false
24+
"rollForward": true
2525
}
2626
}
2727
}

‎build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#tool nuget:?package=Microsoft.Android.Sdk.Windows&version=35.0.61
33

44
// Cake Addins
5-
#addin nuget:?package=Cake.FileHelpers&version=7.0.0
5+
#addin nuget:?package=Cake.FileHelpers&version=4.0.1
66
#addin nuget:?package=Newtonsoft.Json&version=13.0.3
77
#addin nuget:?package=SharpZipLib&version=1.4.2
88

‎global.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
{
2-
"sdk": {
3-
"version": "9.0.301",
4-
"rollForward": "latestMajor",
5-
"allowPrerelease": true
6-
},
72
"msbuild-sdks": {
83
"Microsoft.Build.Traversal": "4.1.0",
94
"Microsoft.Build.NoTargets": "3.7.56"

‎source/com.google.firebase/firebase-perf/PublicAPI/PublicAPI.Unshipped.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,9 @@ Firebase.Perf.Network.InstrHttpsURLConnection
142142
Firebase.Perf.Network.InstrumentApacheHttpResponseHandler
143143
Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.InstrumentApacheHttpResponseHandler(Org.Apache.Http.Client.IResponseHandler? responseHandler, Firebase.Perf.Util.Timer? timer, Firebase.Perf.Metrics.NetworkRequestMetricBuilder? builder) -> void
144144
Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.InstrumentApacheHttpResponseHandler(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
145+
Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback
146+
Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.InstrumentOkHttpEnqueueCallback(Square.OkHttp3.ICallback? callback, Firebase.Perf.Transport.TransportManager? transportManager, Firebase.Perf.Util.Timer? timer, long startTime) -> void
147+
Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.InstrumentOkHttpEnqueueCallback(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void
145148
Firebase.Perf.Network.NetworkRequestMetricBuilderUtil
146149
Firebase.Perf.PerformanceKt
147150
Firebase.Perf.Session.Gauges.CpuGaugeCollector
@@ -1138,6 +1141,9 @@ override Firebase.Perf.Network.InstrHttpsURLConnection.UsingProxy() -> bool
11381141
override Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
11391142
override Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.ThresholdClass.get -> nint
11401143
override Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.ThresholdType.get -> System.Type!
1144+
override Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
1145+
override Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.ThresholdClass.get -> nint
1146+
override Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.ThresholdType.get -> System.Type!
11411147
override Firebase.Perf.Network.NetworkRequestMetricBuilderUtil.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
11421148
override Firebase.Perf.PerformanceKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
11431149
override Firebase.Perf.Session.Gauges.CpuGaugeCollector.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
@@ -1268,6 +1274,8 @@ static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Clie
12681274
static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Client.IHttpClient? client, Org.Apache.Http.HttpHost? target, Org.Apache.Http.IHttpRequest? request, Org.Apache.Http.Client.IResponseHandler? responseHandler) -> Java.Lang.Object?
12691275
static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Client.IHttpClient? client, Org.Apache.Http.HttpHost? target, Org.Apache.Http.IHttpRequest? request, Org.Apache.Http.Client.IResponseHandler? responseHandler, Org.Apache.Http.Protocol.IHttpContext? context) -> Java.Lang.Object?
12701276
static Firebase.Perf.Network.FirebasePerfHttpClient.Execute(Org.Apache.Http.Client.IHttpClient? client, Org.Apache.Http.HttpHost? target, Org.Apache.Http.IHttpRequest? request, Org.Apache.Http.Protocol.IHttpContext? context) -> Org.Apache.Http.IHttpResponse?
1277+
static Firebase.Perf.Network.FirebasePerfOkHttpClient.Enqueue(Square.OkHttp3.ICall? call, Square.OkHttp3.ICallback? callback) -> void
1278+
static Firebase.Perf.Network.FirebasePerfOkHttpClient.Execute(Square.OkHttp3.ICall? call) -> Square.OkHttp3.Response?
12711279
static Firebase.Perf.Network.FirebasePerfUrlConnection.GetContent(Java.Net.URL? url) -> Java.Lang.Object?
12721280
static Firebase.Perf.Network.FirebasePerfUrlConnection.GetContent(Java.Net.URL? url, Java.Lang.Class![]? types) -> Java.Lang.Object?
12731281
static Firebase.Perf.Network.FirebasePerfUrlConnection.Instrument(Java.Lang.Object? connection) -> Java.Lang.Object?
@@ -1767,6 +1775,8 @@ virtual Firebase.Perf.Metrics.Trace.Stop() -> void
17671775
virtual Firebase.Perf.Metrics.Trace.UpdateSession(Firebase.Perf.Session.PerfSession? session) -> void
17681776
virtual Firebase.Perf.Metrics.Trace.WriteToParcel(Android.OS.Parcel! out, Android.OS.ParcelableWriteFlags flags) -> void
17691777
virtual Firebase.Perf.Network.InstrumentApacheHttpResponseHandler.HandleResponse(Org.Apache.Http.IHttpResponse? httpResponse) -> Java.Lang.Object?
1778+
virtual Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.OnFailure(Square.OkHttp3.ICall? call, Java.IO.IOException? e) -> void
1779+
virtual Firebase.Perf.Network.InstrumentOkHttpEnqueueCallback.OnResponse(Square.OkHttp3.ICall? call, Square.OkHttp3.Response? response) -> void
17701780
virtual Firebase.Perf.Session.Gauges.CpuGaugeCollector.CollectOnce(Firebase.Perf.Util.Timer? referenceTime) -> void
17711781
virtual Firebase.Perf.Session.Gauges.CpuGaugeCollector.StartCollecting(long cpuMetricCollectionRateMs, Firebase.Perf.Util.Timer? referenceTime) -> void
17721782
virtual Firebase.Perf.Session.Gauges.CpuGaugeCollector.StopCollecting() -> void

‎source/com.squareup.okhttp3/okhttp/PublicAPI/PublicAPI.Shipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable

‎source/com.squareup.okhttp3/okhttp/PublicAPI/PublicAPI.Unshipped.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#nullable enable

‎source/com.squareup.picasso/picasso/PublicAPI/PublicAPI.Unshipped.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Square.Picasso.ICallback
1818
Square.Picasso.ICallback.OnError(Java.Lang.Exception? p0) -> void
1919
Square.Picasso.ICallback.OnSuccess() -> void
2020
Square.Picasso.IDownloader
21+
Square.Picasso.IDownloader.Load(Square.OkHttp3.Request! uri) -> Square.OkHttp3.Response!
2122
Square.Picasso.IDownloader.Shutdown() -> void
2223
Square.Picasso.ITarget
2324
Square.Picasso.ITarget.OnBitmapFailed(Java.Lang.Exception? errorDrawable, Android.Graphics.Drawables.Drawable? p1) -> void
@@ -43,10 +44,13 @@ Square.Picasso.LruCache.Size() -> int
4344
Square.Picasso.MemoryPolicy
4445
Square.Picasso.NetworkPolicy
4546
Square.Picasso.OkHttp3Downloader
47+
Square.Picasso.OkHttp3Downloader.Load(Square.OkHttp3.Request! request) -> Square.OkHttp3.Response!
4648
Square.Picasso.OkHttp3Downloader.OkHttp3Downloader(Android.Content.Context? context) -> void
4749
Square.Picasso.OkHttp3Downloader.OkHttp3Downloader(Android.Content.Context? context, long maxSize) -> void
4850
Square.Picasso.OkHttp3Downloader.OkHttp3Downloader(Java.IO.File? cacheDir) -> void
4951
Square.Picasso.OkHttp3Downloader.OkHttp3Downloader(Java.IO.File? cacheDir, long maxSize) -> void
52+
Square.Picasso.OkHttp3Downloader.OkHttp3Downloader(Square.OkHttp3.ICallFactory? client) -> void
53+
Square.Picasso.OkHttp3Downloader.OkHttp3Downloader(Square.OkHttp3.OkHttpClient? client) -> void
5054
Square.Picasso.OkHttp3Downloader.Shutdown() -> void
5155
Square.Picasso.Picasso
5256
Square.Picasso.Picasso.Builder

‎source/com.squareup.retrofit2/retrofit/PublicAPI/PublicAPI.Unshipped.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Square.Retrofit2.ICall.Enqueue(Square.Retrofit2.ICallback? p0) -> void
172172
Square.Retrofit2.ICall.Execute() -> Square.Retrofit2.Response?
173173
Square.Retrofit2.ICall.IsCanceled.get -> bool
174174
Square.Retrofit2.ICall.IsExecuted.get -> bool
175+
Square.Retrofit2.ICall.Request() -> Square.OkHttp3.Request?
175176
Square.Retrofit2.ICall.Timeout() -> Square.OkIO.Timeout?
176177
Square.Retrofit2.ICallAdapter
177178
Square.Retrofit2.ICallAdapter.Adapt(Square.Retrofit2.ICall? p0) -> Java.Lang.Object?
@@ -192,27 +193,39 @@ Square.Retrofit2.OptionalConverterFactory
192193
Square.Retrofit2.Response
193194
Square.Retrofit2.Response.Body() -> Java.Lang.Object?
194195
Square.Retrofit2.Response.Code() -> int
196+
Square.Retrofit2.Response.ErrorBody() -> Square.OkHttp3.ResponseBody?
197+
Square.Retrofit2.Response.Headers() -> Square.OkHttp3.Headers?
195198
Square.Retrofit2.Response.IsSuccessful.get -> bool
196199
Square.Retrofit2.Response.Message() -> string?
200+
Square.Retrofit2.Response.Raw() -> Square.OkHttp3.Response?
197201
Square.Retrofit2.Retrofit
202+
Square.Retrofit2.Retrofit.BaseUrl() -> Square.OkHttp3.HttpUrl?
198203
Square.Retrofit2.Retrofit.Builder
199204
Square.Retrofit2.Retrofit.Builder.AddCallAdapterFactory(Square.Retrofit2.CallAdapterFactory? factory) -> Square.Retrofit2.Retrofit.Builder?
200205
Square.Retrofit2.Retrofit.Builder.AddConverterFactory(Square.Retrofit2.ConverterFactory? factory) -> Square.Retrofit2.Retrofit.Builder?
201206
Square.Retrofit2.Retrofit.Builder.BaseUrl(Java.Net.URL? baseUrl) -> Square.Retrofit2.Retrofit.Builder?
207+
Square.Retrofit2.Retrofit.Builder.BaseUrl(Square.OkHttp3.HttpUrl? baseUrl) -> Square.Retrofit2.Retrofit.Builder?
202208
Square.Retrofit2.Retrofit.Builder.BaseUrl(string? baseUrl) -> Square.Retrofit2.Retrofit.Builder?
203209
Square.Retrofit2.Retrofit.Builder.Build() -> Square.Retrofit2.Retrofit?
204210
Square.Retrofit2.Retrofit.Builder.Builder() -> void
205211
Square.Retrofit2.Retrofit.Builder.CallAdapterFactories() -> System.Collections.Generic.IList<Square.Retrofit2.CallAdapterFactory!>?
212+
Square.Retrofit2.Retrofit.Builder.CallFactory(Square.OkHttp3.ICallFactory? factory) -> Square.Retrofit2.Retrofit.Builder?
206213
Square.Retrofit2.Retrofit.Builder.CallbackExecutor(Java.Util.Concurrent.IExecutor? executor) -> Square.Retrofit2.Retrofit.Builder?
214+
Square.Retrofit2.Retrofit.Builder.Client(Square.OkHttp3.OkHttpClient? client) -> Square.Retrofit2.Retrofit.Builder?
207215
Square.Retrofit2.Retrofit.Builder.ConverterFactories() -> System.Collections.Generic.IList<Square.Retrofit2.ConverterFactory!>?
208216
Square.Retrofit2.Retrofit.Builder.ValidateEagerly(bool validateEagerly) -> Square.Retrofit2.Retrofit.Builder?
209217
Square.Retrofit2.Retrofit.CallAdapter(Java.Lang.Reflect.IType? returnType, Java.Lang.Annotation.IAnnotation![]? annotations) -> Square.Retrofit2.ICallAdapter?
210218
Square.Retrofit2.Retrofit.CallAdapterFactories() -> System.Collections.Generic.IList<Square.Retrofit2.CallAdapterFactory!>?
219+
Square.Retrofit2.Retrofit.CallFactory() -> Square.OkHttp3.ICallFactory?
211220
Square.Retrofit2.Retrofit.CallbackExecutor() -> Java.Util.Concurrent.IExecutor?
212221
Square.Retrofit2.Retrofit.ConverterFactories() -> System.Collections.Generic.IList<Square.Retrofit2.ConverterFactory!>?
213222
Square.Retrofit2.Retrofit.Create(Java.Lang.Class? service) -> Java.Lang.Object?
214223
Square.Retrofit2.Retrofit.NewBuilder() -> Square.Retrofit2.Retrofit.Builder?
215224
Square.Retrofit2.Retrofit.NextCallAdapter(Square.Retrofit2.CallAdapterFactory? skipPast, Java.Lang.Reflect.IType? returnType, Java.Lang.Annotation.IAnnotation![]? annotations) -> Square.Retrofit2.ICallAdapter?
225+
Square.Retrofit2.Retrofit.NextRequestBodyConverter(Square.Retrofit2.ConverterFactory? skipPast, Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? parameterAnnotations, Java.Lang.Annotation.IAnnotation![]? methodAnnotations) -> Square.Retrofit2.IConverter?
226+
Square.Retrofit2.Retrofit.NextResponseBodyConverter(Square.Retrofit2.ConverterFactory? skipPast, Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? annotations) -> Square.Retrofit2.IConverter?
227+
Square.Retrofit2.Retrofit.RequestBodyConverter(Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? parameterAnnotations, Java.Lang.Annotation.IAnnotation![]? methodAnnotations) -> Square.Retrofit2.IConverter?
228+
Square.Retrofit2.Retrofit.ResponseBodyConverter(Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? annotations) -> Square.Retrofit2.IConverter?
216229
Square.Retrofit2.Retrofit.StringConverter(Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? annotations) -> Square.Retrofit2.IConverter?
217230
Square.Retrofit2.SkipCallbackExecutorAttribute
218231
Square.Retrofit2.SkipCallbackExecutorAttribute.SkipCallbackExecutorAttribute() -> void
@@ -242,8 +255,14 @@ static Square.Retrofit2.KotlinExtensions.AwaitNullable(Square.Retrofit2.ICall! o
242255
static Square.Retrofit2.KotlinExtensions.AwaitResponse(Square.Retrofit2.ICall! obj, Kotlin.Coroutines.IContinuation! _completion) -> Java.Lang.Object?
243256
static Square.Retrofit2.KotlinExtensions.AwaitUnit(Square.Retrofit2.ICall! obj, Kotlin.Coroutines.IContinuation! _completion) -> Java.Lang.Object?
244257
static Square.Retrofit2.OptionalConverterFactory.Create() -> Square.Retrofit2.OptionalConverterFactory?
258+
static Square.Retrofit2.Response.Error(Square.OkHttp3.ResponseBody? body, Square.OkHttp3.Response? rawResponse) -> Square.Retrofit2.Response?
259+
static Square.Retrofit2.Response.Error(int code, Square.OkHttp3.ResponseBody? body) -> Square.Retrofit2.Response?
245260
static Square.Retrofit2.Response.Success(Java.Lang.Object? body) -> Square.Retrofit2.Response?
261+
static Square.Retrofit2.Response.Success(Java.Lang.Object? body, Square.OkHttp3.Headers? headers) -> Square.Retrofit2.Response?
262+
static Square.Retrofit2.Response.Success(Java.Lang.Object? body, Square.OkHttp3.Response? rawResponse) -> Square.Retrofit2.Response?
246263
static Square.Retrofit2.Response.Success(int code, Java.Lang.Object? body) -> Square.Retrofit2.Response?
264+
virtual Square.Retrofit2.ConverterFactory.RequestBodyConverter(Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? parameterAnnotations, Java.Lang.Annotation.IAnnotation![]? methodAnnotations, Square.Retrofit2.Retrofit? retrofit) -> Square.Retrofit2.IConverter?
265+
virtual Square.Retrofit2.ConverterFactory.ResponseBodyConverter(Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? annotations, Square.Retrofit2.Retrofit? retrofit) -> Square.Retrofit2.IConverter?
247266
virtual Square.Retrofit2.ConverterFactory.StringConverter(Java.Lang.Reflect.IType? type, Java.Lang.Annotation.IAnnotation![]? annotations, Square.Retrofit2.Retrofit? retrofit) -> Square.Retrofit2.IConverter?
248267
virtual Square.Retrofit2.HttpException.Code() -> int
249268
virtual Square.Retrofit2.HttpException.InvokeMessage() -> string?

‎util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/Engine.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ static async Task ProcessConfig (BindingConfig config)
4444
BindingProjectConsistencyVerifier.Verify (models);
4545

4646
if (config.DownloadExternals)
47+
{
48+
Console.WriteLine (" Downloading Maven artifacts...");
4749
MavenArtifactDownloader.Download (config, models);
50+
}
4851

4952
// This isn't really correct, as it could be .aar, but it'll do until we hit that case and need to fix it
5053
foreach (var artifact in models.Where (a => a.MavenArtifacts.First ().MavenArtifactPackaging == "bundle"))

‎util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/MavenArtifactDownloader.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ static string DownloadPayload (BindingConfig config, BindingProjectModel artifac
7070
var a = artifact.ToArtifact ();
7171

7272
if (artifact_model.MavenArtifactPackaging == "jar" || artifact_model.MavenArtifactPackaging == "aar") {
73+
Console.WriteLine ($"Downloading {a} from {repository.Name}...");
7374
if (repository.TryGetFilePath (a, FormatPayloadFileName (a, artifact_model.MavenArtifactPackaging), out var payload_path))
7475
return payload_path;
7576

@@ -78,11 +79,13 @@ static string DownloadPayload (BindingConfig config, BindingProjectModel artifac
7879

7980
// Sometimes the "MavenArtifactPackaging" isn't useful, like "bundle" for Guava or "pom" for KotlinX Coroutines.
8081
// In this case we're going to try "jar" and "aar" to try to find the real payload
82+
Console.WriteLine ($"Downloading {a} as a jar from {repository.Name}...");
8183
if (repository.TryGetFilePath (a, FormatPayloadFileName (a, "jar"), out var jar_path)) {
8284
artifact_model.MavenArtifactPackaging = "jar";
8385
return jar_path;
8486
}
8587

88+
Console.WriteLine ($"Downloading {a} as an aar from {repository.Name}...");
8689
if (repository.TryGetFilePath (a, FormatPayloadFileName (a, "aar"), out var aar_path)) {
8790
artifact_model.MavenArtifactPackaging = "aar";
8891
return aar_path;
@@ -102,18 +105,21 @@ static void DownloadAdditionalFiles (BindingConfig config, BindingProjectModel a
102105
if (config.DownloadJavaSourceJars) {
103106
var source_file = FormatMavenFileName (art) + "-sources.jar";
104107
var dest_file = base_output_file_name + "-sources.jar";
108+
Console.WriteLine ($"Downloading {art} sources jar from {repository.Name}...");
105109
TryDownloadFile (repository, art, source_file, Path.Combine (artifact_dir, dest_file));
106110
}
107111

108112
if (config.DownloadPoms) {
109113
var pom_file = FormatMavenFileName (art) + ".pom";
110114
var dest_file = base_output_file_name + ".pom";
115+
Console.WriteLine ($"Downloading {art} pom file from {repository.Name}...");
111116
TryDownloadFile (repository, art, pom_file, Path.Combine (artifact_dir, dest_file));
112117
}
113118

114119
if (config.DownloadJavaDocJars) {
115120
var javadoc_file = FormatMavenFileName (art) + "-javadoc.jar";
116121
var dest_file = base_output_file_name + "-javadoc.jar";
122+
Console.WriteLine ($"Downloading {art} javadoc jar from {repository.Name}...");
117123
TryDownloadFile (repository, art, javadoc_file, Path.Combine (artifact_dir, dest_file));
118124
}
119125
}

0 commit comments

Comments
 (0)