Skip to content
This repository has been archived by the owner on Nov 6, 2024. It is now read-only.

Commit

Permalink
Merge pull request #896 from xamarin/mu-20240725-fix-issue-754-tensor…
Browse files Browse the repository at this point in the history
…flow-missing-build

Manual updates 20240725 fix for issue 754
  • Loading branch information
moljac authored Jul 29, 2024
2 parents 7a084c8 + d7b57b2 commit 3b0d874
Show file tree
Hide file tree
Showing 6 changed files with 127 additions and 17 deletions.
6 changes: 3 additions & 3 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@
"groupId": "com.google.firebase",
"version": "19.0.3",
"nuGetId": "Xamarin.Firebase.Crashlytics",
"nuGetVersion": "19.0.3"
"nuGetVersion": "119.0.3"
}
},
"license": "The Apache Software License, Version 2.0"
Expand All @@ -1633,7 +1633,7 @@
"groupId": "com.google.firebase",
"version": "19.0.3",
"nuGetId": "Xamarin.Firebase.Crashlytics.Ktx",
"nuGetVersion": "19.0.3"
"nuGetVersion": "119.0.3"
}
},
"license": "The Apache Software License, Version 2.0"
Expand All @@ -1646,7 +1646,7 @@
"groupId": "com.google.firebase",
"version": "19.0.3",
"nuGetId": "Xamarin.Firebase.Crashlytics.NDK",
"nuGetVersion": "19.0.3"
"nuGetVersion": "119.0.3"
}
},
"license": "The Apache Software License, Version 2.0"
Expand Down
6 changes: 3 additions & 3 deletions docs/artifact-list-with-versions.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@
| 122|com.google.firebase:firebase-config-interop |16.0.1 |Xamarin.Firebase.Config.Interop |116.0.1.2 |
| 123|com.google.firebase:firebase-core |21.1.1 |Xamarin.Firebase.Core |121.1.1.9 |
| 124|com.google.firebase:firebase-crash |16.2.1 |Xamarin.Firebase.Crash |116.2.1.16 |
| 125|com.google.firebase:firebase-crashlytics |19.0.3 |Xamarin.Firebase.Crashlytics |19.0.3 |
| 126|com.google.firebase:firebase-crashlytics-ktx |19.0.3 |Xamarin.Firebase.Crashlytics.Ktx |19.0.3 |
| 127|com.google.firebase:firebase-crashlytics-ndk |19.0.3 |Xamarin.Firebase.Crashlytics.NDK |19.0.3 |
| 125|com.google.firebase:firebase-crashlytics |19.0.3 |Xamarin.Firebase.Crashlytics |119.0.3 |
| 126|com.google.firebase:firebase-crashlytics-ktx |19.0.3 |Xamarin.Firebase.Crashlytics.Ktx |119.0.3 |
| 127|com.google.firebase:firebase-crashlytics-ndk |19.0.3 |Xamarin.Firebase.Crashlytics.NDK |119.0.3 |
| 128|com.google.firebase:firebase-database |21.0.0 |Xamarin.Firebase.Database |121.0.0 |
| 129|com.google.firebase:firebase-database-collection |18.0.1 |Xamarin.Firebase.Database.Collection |118.0.1.9 |
| 130|com.google.firebase:firebase-database-connection |16.0.2 |Xamarin.Firebase.Database.Connection |116.0.2.16 |
Expand Down
6 changes: 3 additions & 3 deletions samples/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@
<PackageReference Update="Xamarin.Firebase.Config.Interop" Version="116.0.1.2" />
<PackageReference Update="Xamarin.Firebase.Core" Version="121.1.1.9" />
<PackageReference Update="Xamarin.Firebase.Crash" Version="116.2.1.16" />
<PackageReference Update="Xamarin.Firebase.Crashlytics" Version="19.0.3" />
<PackageReference Update="Xamarin.Firebase.Crashlytics.Ktx" Version="19.0.3" />
<PackageReference Update="Xamarin.Firebase.Crashlytics.NDK" Version="19.0.3" />
<PackageReference Update="Xamarin.Firebase.Crashlytics" Version="119.0.3" />
<PackageReference Update="Xamarin.Firebase.Crashlytics.Ktx" Version="119.0.3" />
<PackageReference Update="Xamarin.Firebase.Crashlytics.NDK" Version="119.0.3" />
<PackageReference Update="Xamarin.Firebase.Database" Version="121.0.0" />
<PackageReference Update="Xamarin.Firebase.Database.Collection" Version="118.0.1.9" />
<PackageReference Update="Xamarin.Firebase.Database.Connection" Version="116.0.2.16" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
#nullable restore
using System;
using System.Collections.Generic;
using Android.Runtime;
using Java.Interop;

namespace Xamarin.TensorFlow.Lite.Support.Common
{

// Metadata.xml XPath class reference: path="/api/package[@name='org.tensorflow.lite.support.common']/class[@name='TensorProcessor']"
// [global::Android.Runtime.Register ("org/tensorflow/lite/support/common/TensorProcessor", DoNotGenerateAcw=true)]
public partial class TensorProcessor // : global::Xamarin.TensorFlow.Lite.Support.Common.SequentialProcessor
{
// [global::Android.Runtime.Register ("org/tensorflow/lite/support/common/TensorProcessor$Builder", DoNotGenerateAcw=true)]
public new partial class Builder // : global::Java.Lang.Object
{
static Delegate cb_buildTensorProcessor;
#pragma warning disable 0169
static Delegate GetBuildTensorProcessorHandler ()
{
if (cb_buildTensorProcessor == null)
cb_buildTensorProcessor = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_BuildTensorProcessor));
return cb_buildTensorProcessor;
}

static IntPtr n_BuildTensorProcessor (IntPtr jnienv, IntPtr native__this)
{
var __this = global::Java.Lang.Object.GetObject<global::Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor.Builder> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
return JNIEnv.ToLocalJniHandle (__this.BuildTensorProcessor ());
}
#pragma warning restore 0169

// Metadata.xml XPath method reference: path="/api/package[@name='org.tensorflow.lite.support.common']/class[@name='TensorProcessor.Builder']/method[@name='build' and count(parameter)=0]"
[Register ("build", "()Lorg/tensorflow/lite/support/common/TensorProcessor;", "GetBuildTensorProcessorHandler")]
public virtual unsafe global::Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor BuildTensorProcessor ()
{
const string __id = "build.()Lorg/tensorflow/lite/support/common/TensorProcessor;";
try {
var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null);
return global::Java.Lang.Object.GetObject<global::Xamarin.TensorFlow.Lite.Support.Common.TensorProcessor> (__rm.Handle, JniHandleOwnership.TransferLocalRef);
} finally {
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
#nullable restore
using System;
using System.Collections.Generic;
using Android.Runtime;
using Java.Interop;

namespace Xamarin.TensorFlow.Lite.Support.Image
{

// Metadata.xml XPath class reference: path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor']"
// [global::Android.Runtime.Register ("org/tensorflow/lite/support/image/ImageProcessor", DoNotGenerateAcw=true)]
public partial class ImageProcessor // : global::Xamarin.TensorFlow.Lite.Support.Common.SequentialProcessor
{
// Metadata.xml XPath class reference: path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor.Builder']"
// [global::Android.Runtime.Register ("org/tensorflow/lite/support/image/ImageProcessor$Builder", DoNotGenerateAcw=true)]
public new partial class Builder // : global::Java.Lang.Object
{
static Delegate cb_buildImageProcessor;
#pragma warning disable 0169
static Delegate GetBuildImageProcessorHandler ()
{
if (cb_buildImageProcessor == null)
cb_buildImageProcessor = JNINativeWrapper.CreateDelegate (new _JniMarshal_PP_L (n_BuildImageProcessor));
return cb_buildImageProcessor;
}

static IntPtr n_BuildImageProcessor (IntPtr jnienv, IntPtr native__this)
{
var __this = global::Java.Lang.Object.GetObject<global::Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor.Builder> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
return JNIEnv.ToLocalJniHandle (__this.BuildImageProcessor ());
}
#pragma warning restore 0169

// Metadata.xml XPath method reference: path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor.Builder']/method[@name='build' and count(parameter)=0]"
[Register ("build", "()Lorg/tensorflow/lite/support/image/ImageProcessor;", "GetBuildImageProcessorHandler")]
public virtual unsafe global::Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor BuildImageProcessor ()
{
const string __id = "build.()Lorg/tensorflow/lite/support/image/ImageProcessor;";
try {
var __rm = _members.InstanceMethods.InvokeVirtualObjectMethod (__id, this, null);
return global::Java.Lang.Object.GetObject<global::Xamarin.TensorFlow.Lite.Support.Image.ImageProcessor> (__rm.Handle, JniHandleOwnership.TransferLocalRef);
} finally {
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
<metadata>
<remove-node
path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor.Builder']/method[@name='build' and count(parameter)=0]"
/>

<remove-node
path="/api/package[@name='org.tensorflow.lite.support.common']/class[@name='TensorProcessor.Builder']/method[@name='build' and count(parameter)=0]"
/>

<attr
path="/api/package[@name='org.tensorflow.lite.support.image']/interface[@name='ImageOperator']/method[@name='apply' and count(parameter)=1 and parameter[1][@type='org.tensorflow.lite.support.image.TensorImage']]"
name="managedReturn"
Expand Down Expand Up @@ -123,4 +115,29 @@
Java.Lang.Object
</attr>

<!--
cb_build
<attr
path="/api/package[@name='org.tensorflow.lite.support.common']/class[@name='TensorProcessor.Builder']/method[@name='build' and count(parameter)=0 and @return='org.tensorflow.lite.support.common.TensorProcessor']"
name="managedName"
>
BuildTensorProcessor
</attr>
<attr
path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor.Builder']/method[@name='build' and count(parameter)=0 and @return='org.tensorflow.lite.support.image.ImageProcessor']"
name="managedName"
>
BuildImageProcessor
</attr>
-->
<!--
-->
<remove-node
path="/api/package[@name='org.tensorflow.lite.support.common']/class[@name='TensorProcessor.Builder']/method[@name='build' and count(parameter)=0 and @return='org.tensorflow.lite.support.common.TensorProcessor']"
/>
<remove-node
path="/api/package[@name='org.tensorflow.lite.support.image']/class[@name='ImageProcessor.Builder']/method[@name='build' and count(parameter)=0 and @return='org.tensorflow.lite.support.image.ImageProcessor']"
/>

</metadata>

0 comments on commit 3b0d874

Please sign in to comment.