Workaround for an issue in java.interop for kotlin

dotnet/java-interop#571
mattleibow · Feb 14, 2020 · 08614d7 · 08614d7
1 parent 6969bcc
commit 08614d7
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/binding/Square.OkHttp3/Transforms/Metadata.xml b/binding/Square.OkHttp3/Transforms/Metadata.xml
@@ -88,4 +88,19 @@
     <attr path="/api/package[@name='okhttp3']/interface[@name='WebSocket.Factory']/method[@name='newWebSocket']/parameter[1]" name="managedName">request</attr>
     <attr path="/api/package[@name='okhttp3']/interface[@name='WebSocket.Factory']/method[@name='newWebSocket']/parameter[2]" name="managedName">listener</attr>
 
+    <!--https://github.com/xamarin/java.interop/issues/571-->
+    <add-node path="/api/package[@name='okhttp3']/class[@name='Cache']">
+      <method abstract="false" deprecated="not deprecated" final="true" name="hitCount" jni-signature="()I" bridge="false" native="false" return="int" jni-return="I" static="false" synchronized="true" synthetic="false" visibility="public" />
+      <method abstract="false" deprecated="not deprecated" final="true" name="networkCount" jni-signature="()I" bridge="false" native="false" return="int" jni-return="I" static="false" synchronized="true" synthetic="false" visibility="public" />
+      <method abstract="false" deprecated="not deprecated" final="true" name="requestCount" jni-signature="()I" bridge="false" native="false" return="int" jni-return="I" static="false" synchronized="true" synthetic="false" visibility="public" />
+    </add-node>
+    <add-node path="/api/package[@name='okhttp3']/class[@name='MultipartBody']">
+      <method abstract="false" deprecated="not deprecated" final="false" name="contentType" jni-signature="()Lokhttp3/MediaType;" bridge="false" native="false" return="okhttp3.MediaType" jni-return="Lokhttp3/MediaType;" static="false" synchronized="false" synthetic="false" visibility="public" />
+    </add-node>
+    <add-node path="/api/package[@name='okhttp3']/class[@name='MultipartBody.Builder']">
+      <method abstract="false" deprecated="not deprecated" final="true" name="setType" jni-signature="(Lokhttp3/MediaType;)Lokhttp3/MultipartBody$Builder;" bridge="false" native="false" return="okhttp3.MultipartBody.Builder" jni-return="Lokhttp3/MultipartBody$Builder;" static="false" synchronized="false" synthetic="false" visibility="public">
+        <parameter name="type" type="okhttp3.MediaType" jni-type="Lokhttp3/MediaType;" />
+      </method>
+    </add-node>
+
 </metadata>
diff --git a/build.cake b/build.cake
@@ -354,6 +354,8 @@ Task ("libs")
     .IsDependentOn ("externals")
     .Does (() =>
 {
+    EnsureDirectoryExists ("./output/binlogs/");
+
     foreach (var file in GetFiles ("./binding/*/*.csproj")) {
         var id = file.GetFilenameWithoutExtension ().ToString ();
         if (packagesToBuild != null && packagesToBuild.All (x => !x.Equals (id, StringComparison.OrdinalIgnoreCase)))
@@ -382,6 +384,7 @@ Task ("libs")
         var settings = new MSBuildSettings ()
             .SetConfiguration (configuration)
             .SetVerbosity (Verbosity.Minimal)
+            .EnableBinaryLogger (MakeAbsolute ((DirectoryPath)$"./output/binlogs/{id}.binlog").FullPath)
             .WithRestore ()
             // .WithProperty ("IncludeSymbols", "true")
             .WithProperty ("DesignTimeBuild", "false")