Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mobile] Complete ente-photos-frb rename

laurenspriem9f8c87a39f74
diff --git a/apple/packages/EnteOnnxRuntime/EnteOnnxRuntime.podspec b/apple/packages/EnteOnnxRuntime/EnteOnnxRuntime.podspec
index ff8f0a08fb..cc4e07e2a1 100644
--- a/apple/packages/EnteOnnxRuntime/EnteOnnxRuntime.podspec
+++ b/apple/packages/EnteOnnxRuntime/EnteOnnxRuntime.podspec
@@ -1,7 +1,7 @@
# Download vehicle for Ente's pinned custom ONNX Runtime iOS static-library
# XCFramework. CocoaPods downloads the release ZIP at `pod install` time,
# verifies its SHA-256, and caches it. Nothing is compiled or linked here:
-# the ente_photos_rust pod's build phase points the Rust `ort` crate at the
+# the ente_photos_frb pod's build phase points the Rust `ort` crate at the
# XCFramework's static archive for the active platform via ORT_LIB_PATH.
Pod::Spec.new do |s|
s.name = 'EnteOnnxRuntime'
diff --git a/mobile/apps/photos/ios/Podfile b/mobile/apps/photos/ios/Podfile
index 98f19a79ee..f4cc3957d2 100644
--- a/mobile/apps/photos/ios/Podfile
+++ b/mobile/apps/photos/ios/Podfile
@@ -34,7 +34,7 @@ target 'Runner' do
use_modular_headers!
# Ente's custom prebuilt ONNX Runtime static libraries (download + SHA-256
- # verification handled by CocoaPods). Consumed by the ente_photos_rust
+ # verification handled by CocoaPods). Consumed by the ente_photos_frb
# build phase, which points the Rust `ort` crate at the platform slice.
pod 'EnteOnnxRuntime', :podspec => '../../../../apple/packages/EnteOnnxRuntime/EnteOnnxRuntime.podspec'
@@ -51,7 +51,7 @@ post_install do |installer|
target.build_configurations.each do |config|
config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
- if target.name == 'ente_photos_rust' && config.name == 'Debug'
+ if target.name == 'ente_photos_frb' && config.name == 'Debug'
config.build_settings['ONLY_ACTIVE_ARCH[sdk=iphonesimulator*]'] = 'YES'
end
end
diff --git a/mobile/apps/photos/ios/Podfile.lock b/mobile/apps/photos/ios/Podfile.lock
index 726cbccdcb..e7e785eb35 100644
--- a/mobile/apps/photos/ios/Podfile.lock
+++ b/mobile/apps/photos/ios/Podfile.lock
@@ -20,9 +20,9 @@ PODS:
- Flutter
- ente_panorama_viewer (0.0.1):
- Flutter
- - ente_photos_platform (0.0.1):
+ - ente_photos_frb (0.0.1):
- Flutter
- - ente_photos_rust (0.0.1):
+ - ente_photos_platform (0.0.1):
- Flutter
- ente_qr (0.0.1):
- Flutter
@@ -252,8 +252,8 @@ DEPENDENCIES:
- ente_cast (from `.symlinks/plugins/ente_cast/ios`)
- ente_mail (from `.symlinks/plugins/ente_mail/ios`)
- ente_panorama_viewer (from `.symlinks/plugins/ente_panorama_viewer/ios`)
+ - ente_photos_frb (from `.symlinks/plugins/ente_photos_frb/ios`)
- ente_photos_platform (from `.symlinks/plugins/ente_photos_platform/ios`)
- - ente_photos_rust (from `.symlinks/plugins/ente_photos_rust/ios`)
- ente_qr (from `.symlinks/plugins/ente_qr/ios`)
- ente_screen_brightness (from `.symlinks/plugins/ente_screen_brightness/ios`)
- ente_screen_cover (from `.symlinks/plugins/ente_screen_cover/ios`)
@@ -343,10 +343,10 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/ente_mail/ios"
ente_panorama_viewer:
:path: ".symlinks/plugins/ente_panorama_viewer/ios"
+ ente_photos_frb:
+ :path: ".symlinks/plugins/ente_photos_frb/ios"
ente_photos_platform:
:path: ".symlinks/plugins/ente_photos_platform/ios"
- ente_photos_rust:
- :path: ".symlinks/plugins/ente_photos_rust/ios"
ente_qr:
:path: ".symlinks/plugins/ente_qr/ios"
ente_screen_brightness:
@@ -451,8 +451,8 @@ SPEC CHECKSUMS:
ente_cast: a25feb3127397e5fc6aff03a12120916707757d4
ente_mail: 90753dd584f49ee092759a32d4143ca51db69641
ente_panorama_viewer: 87bb22e7868c3005314f80c05ee0787aa07edcd8
+ ente_photos_frb: c693c36243f0f65df25e7674552879cc74588fea
ente_photos_platform: 08757c7e4977863732f75ce0f85cc6144600e3d2
- ente_photos_rust: f372c56187e4be7b97437897aa4824f3985734d9
ente_qr: 86beaf5d2644705db9b565b32dd8b82c05fb36af
ente_screen_brightness: 7dd13c361508ee6098a2578908ebf35e9f567e28
ente_screen_cover: 6792566774f1c83939f9c1d03ed0a1f1ded45ae4
@@ -517,6 +517,6 @@ SPEC CHECKSUMS:
wakelock_plus: e29112ab3ef0b318e58cfa5c32326458be66b556
workmanager_apple: 904529ae31e97fc5be632cf628507652294a0778
-PODFILE CHECKSUM: 4450cf498e634fde2a46bbe657d08e05214be7b8
+PODFILE CHECKSUM: 50318c7062bacf98b6cddf7dc37637eb4eabed48
COCOAPODS: 1.17.0
diff --git a/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj b/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
index a5fa37d398..d8c9f0b476 100644
--- a/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
+++ b/mobile/apps/photos/ios/Runner.xcodeproj/project.pbxproj
@@ -637,8 +637,8 @@
"${BUILT_PRODUCTS_DIR}/ente_cast/ente_cast.framework",
"${BUILT_PRODUCTS_DIR}/ente_mail/ente_mail.framework",
"${BUILT_PRODUCTS_DIR}/ente_panorama_viewer/ente_panorama_viewer.framework",
+ "${BUILT_PRODUCTS_DIR}/ente_photos_frb/ente_photos_frb.framework",
"${BUILT_PRODUCTS_DIR}/ente_photos_platform/ente_photos_platform.framework",
- "${BUILT_PRODUCTS_DIR}/ente_photos_rust/ente_photos_rust.framework",
"${BUILT_PRODUCTS_DIR}/ente_qr/ente_qr.framework",
"${BUILT_PRODUCTS_DIR}/ente_screen_brightness/ente_screen_brightness.framework",
"${BUILT_PRODUCTS_DIR}/ente_screen_cover/ente_screen_cover.framework",
@@ -733,8 +733,8 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_cast.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_mail.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_panorama_viewer.framework",
+ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_photos_frb.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_photos_platform.framework",
- "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_photos_rust.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_qr.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_screen_brightness.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ente_screen_cover.framework",
diff --git a/mobile/apps/photos/pubspec.yaml b/mobile/apps/photos/pubspec.yaml
index 0886bf4ac1..59bcd2e98b 100644
--- a/mobile/apps/photos/pubspec.yaml
+++ b/mobile/apps/photos/pubspec.yaml
@@ -58,10 +58,10 @@ dependencies:
path: ../../packages/mail
ente_panorama_viewer:
path: plugins/ente_panorama_viewer
+ ente_photos_frb:
+ path: rust_builder
ente_photos_platform:
path: plugins/ente_photos_platform
- ente_photos_rust:
- path: rust_builder
ente_pure_utils:
path: ../../packages/ente_pure_utils
ente_qr:
diff --git a/mobile/apps/photos/rust_builder/android/build.gradle b/mobile/apps/photos/rust_builder/android/build.gradle
index 5869710b1b..139a080c40 100644
--- a/mobile/apps/photos/rust_builder/android/build.gradle
+++ b/mobile/apps/photos/rust_builder/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.flutter_rust_bridge.ente_photos_rust'
+group 'com.flutter_rust_bridge.ente_photos_frb'
version '1.0'
buildscript {
@@ -23,7 +23,7 @@ apply plugin: 'com.android.library'
android {
if (project.android.hasProperty("namespace")) {
- namespace 'com.flutter_rust_bridge.ente_photos_rust'
+ namespace 'com.flutter_rust_bridge.ente_photos_frb'
}
// Bumping the plugin compileSdkVersion requires all clients of this plugin
diff --git a/mobile/apps/photos/rust_builder/android/settings.gradle b/mobile/apps/photos/rust_builder/android/settings.gradle
index 51762cbd45..9b2de4b840 100644
--- a/mobile/apps/photos/rust_builder/android/settings.gradle
+++ b/mobile/apps/photos/rust_builder/android/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'ente_photos_rust'
+rootProject.name = 'ente_photos_frb'
diff --git a/mobile/apps/photos/rust_builder/android/src/main/AndroidManifest.xml b/mobile/apps/photos/rust_builder/android/src/main/AndroidManifest.xml
index d339cfb864..39c3303e58 100644
--- a/mobile/apps/photos/rust_builder/android/src/main/AndroidManifest.xml
+++ b/mobile/apps/photos/rust_builder/android/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.flutter_rust_bridge.ente_photos_rust">
+ package="com.flutter_rust_bridge.ente_photos_frb">
</manifest>
diff --git a/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec b/mobile/apps/photos/rust_builder/ios/ente_photos_frb.podspec
similarity index 98%
rename from mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec
rename to mobile/apps/photos/rust_builder/ios/ente_photos_frb.podspec
index 45b98e4a3e..4259a9e5fd 100644
--- a/mobile/apps/photos/rust_builder/ios/ente_photos_rust.podspec
+++ b/mobile/apps/photos/rust_builder/ios/ente_photos_frb.podspec
@@ -1,5 +1,5 @@
Pod::Spec.new do |s|
- s.name = 'ente_photos_rust'
+ s.name = 'ente_photos_frb'
s.version = '0.0.1'
s.summary = 'A new Flutter FFI plugin project.'
s.description = <<-DESC
diff --git a/mobile/apps/photos/rust_builder/linux/CMakeLists.txt b/mobile/apps/photos/rust_builder/linux/CMakeLists.txt
index ecf7caedc8..695512862d 100644
--- a/mobile/apps/photos/rust_builder/linux/CMakeLists.txt
+++ b/mobile/apps/photos/rust_builder/linux/CMakeLists.txt
@@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.10)
# Project-level configuration.
-set(PROJECT_NAME "ente_photos_rust")
+set(PROJECT_NAME "ente_photos_frb")
project(${PROJECT_NAME} LANGUAGES CXX)
include("../../../../cargokit/cmake/cargokit.cmake")
@@ -13,7 +13,7 @@ apply_cargokit(${PROJECT_NAME} ../../../../../rust/bindings/frb/photos ente_phot
# List of absolute paths to libraries that should be bundled with the plugin.
# This list could contain prebuilt libraries, or libraries created by an
# external build triggered from this build file.
-set(ente_photos_rust_bundled_libraries
+set(ente_photos_frb_bundled_libraries
"${${PROJECT_NAME}_cargokit_lib}"
PARENT_SCOPE
)
diff --git a/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec b/mobile/apps/photos/rust_builder/macos/ente_photos_frb.podspec
similarity index 97%
rename from mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec
rename to mobile/apps/photos/rust_builder/macos/ente_photos_frb.podspec
index a0b825495e..5f80e48a1e 100644
--- a/mobile/apps/photos/rust_builder/macos/ente_photos_rust.podspec
+++ b/mobile/apps/photos/rust_builder/macos/ente_photos_frb.podspec
@@ -1,5 +1,5 @@
Pod::Spec.new do |s|
- s.name = 'ente_photos_rust'
+ s.name = 'ente_photos_frb'
s.version = '0.0.1'
s.summary = 'A new Flutter FFI plugin project.'
s.description = <<-DESC
diff --git a/mobile/apps/photos/rust_builder/pubspec.yaml b/mobile/apps/photos/rust_builder/pubspec.yaml
index 7e3d5ccaf2..7e206f43a9 100644
--- a/mobile/apps/photos/rust_builder/pubspec.yaml
+++ b/mobile/apps/photos/rust_builder/pubspec.yaml
@@ -1,4 +1,4 @@
-name: ente_photos_rust
+name: ente_photos_frb
description: "Utility to build Rust code"
version: 0.0.1
publish_to: none
diff --git a/mobile/apps/photos/rust_builder/windows/CMakeLists.txt b/mobile/apps/photos/rust_builder/windows/CMakeLists.txt
index 2e11c2328f..22bbc83026 100644
--- a/mobile/apps/photos/rust_builder/windows/CMakeLists.txt
+++ b/mobile/apps/photos/rust_builder/windows/CMakeLists.txt
@@ -5,7 +5,7 @@
cmake_minimum_required(VERSION 3.14)
# Project-level configuration.
-set(PROJECT_NAME "ente_photos_rust")
+set(PROJECT_NAME "ente_photos_frb")
project(${PROJECT_NAME} LANGUAGES CXX)
include("../../../../cargokit/cmake/cargokit.cmake")
@@ -14,7 +14,7 @@ apply_cargokit(${PROJECT_NAME} ../../../../../../../../../rust/bindings/frb/phot
# List of absolute paths to libraries that should be bundled with the plugin.
# This list could contain prebuilt libraries, or libraries created by an
# external build triggered from this build file.
-set(ente_photos_rust_bundled_libraries
+set(ente_photos_frb_bundled_libraries
"${${PROJECT_NAME}_cargokit_lib}"
PARENT_SCOPE
)
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 5a0d7d5c8d..0fcc9044a9 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -594,7 +594,7 @@ packages:
relative: true
source: path
version: "0.0.1"
- ente_photos_rust:
+ ente_photos_frb:
dependency: transitive
description:
path: "apps/photos/rust_builder"