From 6e13216c53f20d98f3bba375e831820925a7863b Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:38:04 +0530 Subject: [PATCH 1/3] Revert "[mob] Fix android build (#2832)" This reverts commit 5735e050e23bb780648e5eec9a6ac6f60275d24d, reversing changes made to 7ddee7d75e0ad53a42153609f4634619e99bd406. --- mobile/android/app/build.gradle | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle index 8cbcb017a7..ad09d00b94 100644 --- a/mobile/android/app/build.gradle +++ b/mobile/android/app/build.gradle @@ -35,12 +35,6 @@ android { main.java.srcDirs += 'src/main/kotlin' } - packagingOptions { - pickFirst 'lib/arm64-v8a/libonnxruntime.so' - pickFirst 'lib/armeabi-v7a/libonnxruntime.so' - - } - lintOptions { disable 'InvalidPackage' warningsAsErrors false From 630770be568d2ec2d146cfd4b8d9a275bb01d363 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:40:06 +0530 Subject: [PATCH 2/3] Use old onnx package to unblock release --- mobile/pubspec.lock | 11 ++++++----- mobile/pubspec.yaml | 5 ++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 463a5ef926..cb234fe33a 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -1666,11 +1666,12 @@ packages: onnxruntime: dependency: "direct main" description: - name: onnxruntime - sha256: e77ec05acafc135cc5fe7bcdf11b101b39f06513c9d5e9fa02cb1929f6bac72a - url: "https://pub.dev" - source: hosted - version: "1.4.1" + path: "." + ref: ente_onnxruntime + resolved-ref: fb9393e36013790938b5bc995a4dca15fed3c944 + url: "https://github.com/ente-io/onnxruntime.git" + source: git + version: "1.1.0" open_mail_app: dependency: "direct main" description: diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index e2ebeb72b9..837c8fd5f7 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -128,7 +128,10 @@ dependencies: native_video_player: ^1.3.1 onnx_dart: path: plugins/onnx_dart - onnxruntime: ^1.4.1 + onnxruntime: + git: + url: https://github.com/ente-io/onnxruntime.git + ref: ente_onnxruntime open_mail_app: ^0.4.5 package_info_plus: ^4.1.0 page_transition: ^2.0.2 From 270acf18968c2970ce9077843b9698b132a1d4f0 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:40:30 +0530 Subject: [PATCH 3/3] [mob] Bump version v0.9.27 --- mobile/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 837c8fd5f7..3458c66b2f 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -12,7 +12,7 @@ description: ente photos application # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 0.9.26+926 +version: 0.9.27+927 publish_to: none environment: