Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mobile][locker] Rename bridge crate to ente-locker-frb

laurenspriem225f52ddae04
diff --git a/.github/workflows/mobile-lint.yml b/.github/workflows/mobile-lint.yml
index 2928d48f00..aaf99e9fdb 100644
--- a/.github/workflows/mobile-lint.yml
+++ b/.github/workflows/mobile-lint.yml
@@ -84,7 +84,7 @@ jobs:
- run: cargo clippy -p ente_photos_rust --features flutter --all-targets --locked
working-directory: rust
- - run: cargo clippy -p ente_locker_rust --features flutter --all-targets --locked
+ - run: cargo clippy -p ente-locker-frb --features flutter --all-targets --locked
working-directory: rust
- run: flutter pub get --enforce-lockfile
diff --git a/.github/workflows/warm-caches.yml b/.github/workflows/warm-caches.yml
index ebf8cc8aab..9c2f2d3611 100644
--- a/.github/workflows/warm-caches.yml
+++ b/.github/workflows/warm-caches.yml
@@ -85,7 +85,7 @@ jobs:
- run: cargo clippy -p ente_photos_rust --features flutter --all-targets --locked
- - run: cargo clippy -p ente_locker_rust --features flutter --all-targets --locked
+ - run: cargo clippy -p ente-locker-frb --features flutter --all-targets --locked
rust-wasm:
# For web-lint.yml's WASM builds.
diff --git a/mobile/apps/locker/ios/Podfile b/mobile/apps/locker/ios/Podfile
index b5efd7385b..ada3e6f72c 100644
--- a/mobile/apps/locker/ios/Podfile
+++ b/mobile/apps/locker/ios/Podfile
@@ -45,7 +45,7 @@ post_install do |installer|
target.build_configurations.each do |config|
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
- if target.name == 'ente_locker_rust' && config.name == 'Debug'
+ if target.name == 'ente_locker_frb' && config.name == 'Debug'
config.build_settings['ONLY_ACTIVE_ARCH[sdk=iphonesimulator*]'] = 'YES'
end
diff --git a/mobile/apps/locker/ios/Podfile.lock b/mobile/apps/locker/ios/Podfile.lock
index 68b75111d1..6b7044d706 100644
--- a/mobile/apps/locker/ios/Podfile.lock
+++ b/mobile/apps/locker/ios/Podfile.lock
@@ -37,7 +37,7 @@ PODS:
- DKPhotoGallery/Resource (0.0.19):
- SDWebImage
- SwiftyGif
- - ente_locker_rust (0.0.1):
+ - ente_locker_frb (0.0.1):
- Flutter
- ente_mail (0.0.1):
- Flutter
@@ -95,7 +95,7 @@ DEPENDENCIES:
- app_links (from `.symlinks/plugins/app_links/ios`)
- cupertino_http (from `.symlinks/plugins/cupertino_http/darwin`)
- device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
- - ente_locker_rust (from `.symlinks/plugins/ente_locker_rust/ios`)
+ - ente_locker_frb (from `.symlinks/plugins/ente_locker_frb/ios`)
- ente_mail (from `.symlinks/plugins/ente_mail/ios`)
- ente_screen_cover (from `.symlinks/plugins/ente_screen_cover/ios`)
- file_picker (from `.symlinks/plugins/file_picker/ios`)
@@ -132,8 +132,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/cupertino_http/darwin"
device_info_plus:
:path: ".symlinks/plugins/device_info_plus/ios"
- ente_locker_rust:
- :path: ".symlinks/plugins/ente_locker_rust/ios"
+ ente_locker_frb:
+ :path: ".symlinks/plugins/ente_locker_frb/ios"
ente_mail:
:path: ".symlinks/plugins/ente_mail/ios"
ente_screen_cover:
@@ -181,7 +181,7 @@ SPEC CHECKSUMS:
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
- ente_locker_rust: a299b4450d8ed041499171ddb182a42107719e74
+ ente_locker_frb: 493a1f7828e127b606d65a484e4fa9171d8c76ec
ente_mail: 90753dd584f49ee092759a32d4143ca51db69641
ente_screen_cover: 6792566774f1c83939f9c1d03ed0a1f1ded45ae4
file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be
@@ -206,6 +206,6 @@ SPEC CHECKSUMS:
ua_client_hints: 92fe0d139619b73ec9fcb46cc7e079a26178f586
url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
-PODFILE CHECKSUM: 495363c75992d6c5907a1fcc1bedd27d99f697bb
+PODFILE CHECKSUM: 1ea06a574e0473671dee0ea3e6eb43a416f8b3d4
COCOAPODS: 1.17.0
diff --git a/mobile/apps/locker/pubspec.yaml b/mobile/apps/locker/pubspec.yaml
index 030733c1eb..97adb1d136 100644
--- a/mobile/apps/locker/pubspec.yaml
+++ b/mobile/apps/locker/pubspec.yaml
@@ -44,7 +44,7 @@ dependencies:
path: ../../packages/legacy
ente_lock_screen:
path: ../../packages/lock_screen
- ente_locker_rust:
+ ente_locker_frb:
path: rust_builder
ente_logging:
path: ../../packages/logging
diff --git a/mobile/apps/locker/rust_builder/android/build.gradle b/mobile/apps/locker/rust_builder/android/build.gradle
index 9497e846fb..cd47bdc803 100644
--- a/mobile/apps/locker/rust_builder/android/build.gradle
+++ b/mobile/apps/locker/rust_builder/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.flutter_rust_bridge.ente_locker_rust'
+group 'com.flutter_rust_bridge.ente_locker_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_locker_rust'
+ namespace 'com.flutter_rust_bridge.ente_locker_frb'
}
// Bumping the plugin compileSdkVersion requires all clients of this plugin
@@ -45,5 +45,5 @@ android {
apply from: "../../../../cargokit/gradle/plugin.gradle"
cargokit {
manifestDir = "../../../../../rust/bindings/frb/locker"
- libname = "ente_locker_rust"
+ libname = "ente_locker_frb"
}
diff --git a/mobile/apps/locker/rust_builder/android/settings.gradle b/mobile/apps/locker/rust_builder/android/settings.gradle
index b114b03fb9..e273c09e3e 100644
--- a/mobile/apps/locker/rust_builder/android/settings.gradle
+++ b/mobile/apps/locker/rust_builder/android/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'ente_locker_rust'
+rootProject.name = 'ente_locker_frb'
diff --git a/mobile/apps/locker/rust_builder/android/src/main/AndroidManifest.xml b/mobile/apps/locker/rust_builder/android/src/main/AndroidManifest.xml
index 742fce54d3..c8a8e65781 100644
--- a/mobile/apps/locker/rust_builder/android/src/main/AndroidManifest.xml
+++ b/mobile/apps/locker/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_locker_rust">
+ package="com.flutter_rust_bridge.ente_locker_frb">
</manifest>
diff --git a/mobile/apps/locker/rust_builder/ios/ente_locker_rust.podspec b/mobile/apps/locker/rust_builder/ios/ente_locker_frb.podspec
similarity index 87%
rename from mobile/apps/locker/rust_builder/ios/ente_locker_rust.podspec
rename to mobile/apps/locker/rust_builder/ios/ente_locker_frb.podspec
index 2f1e2a8adf..23d2848722 100644
--- a/mobile/apps/locker/rust_builder/ios/ente_locker_rust.podspec
+++ b/mobile/apps/locker/rust_builder/ios/ente_locker_frb.podspec
@@ -1,9 +1,9 @@
#
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
-# Run `pod lib lint ente_locker_rust.podspec` to validate before publishing.
+# Run `pod lib lint ente_locker_frb.podspec` to validate before publishing.
#
Pod::Spec.new do |s|
- s.name = 'ente_locker_rust'
+ s.name = 'ente_locker_frb'
s.version = '0.0.1'
s.summary = 'A new Flutter FFI plugin project.'
s.description = <<-DESC
@@ -26,17 +26,17 @@ A new Flutter FFI plugin project.
s.script_phase = {
:name => 'Build Rust library',
# First argument is relative path to the `rust` folder, second is name of rust library
- :script => 'sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/locker ente_locker_rust',
+ :script => 'sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/locker ente_locker_frb',
:execution_position => :before_compile,
:input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
# Let XCode know that the static library referenced in -force_load below is
# created by this build step.
- :output_files => ["${BUILT_PRODUCTS_DIR}/libente_locker_rust.a"],
+ :output_files => ["${BUILT_PRODUCTS_DIR}/libente_locker_frb.a"],
}
s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
# Flutter.framework does not contain a i386 slice.
'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'i386',
- 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/libente_locker_rust.a',
+ 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/libente_locker_frb.a',
}
end
diff --git a/mobile/apps/locker/rust_builder/linux/CMakeLists.txt b/mobile/apps/locker/rust_builder/linux/CMakeLists.txt
index 432fdc38f7..9b17508fb1 100644
--- a/mobile/apps/locker/rust_builder/linux/CMakeLists.txt
+++ b/mobile/apps/locker/rust_builder/linux/CMakeLists.txt
@@ -4,16 +4,16 @@
cmake_minimum_required(VERSION 3.10)
# Project-level configuration.
-set(PROJECT_NAME "ente_locker_rust")
+set(PROJECT_NAME "ente_locker_frb")
project(${PROJECT_NAME} LANGUAGES CXX)
include("../../../../cargokit/cmake/cargokit.cmake")
-apply_cargokit(${PROJECT_NAME} ../../../../../rust/bindings/frb/locker ente_locker_rust "")
+apply_cargokit(${PROJECT_NAME} ../../../../../rust/bindings/frb/locker ente_locker_frb "")
# 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_locker_rust_bundled_libraries
+set(ente_locker_frb_bundled_libraries
"${${PROJECT_NAME}_cargokit_lib}"
PARENT_SCOPE
)
diff --git a/mobile/apps/locker/rust_builder/macos/ente_locker_rust.podspec b/mobile/apps/locker/rust_builder/macos/ente_locker_frb.podspec
similarity index 87%
rename from mobile/apps/locker/rust_builder/macos/ente_locker_rust.podspec
rename to mobile/apps/locker/rust_builder/macos/ente_locker_frb.podspec
index aaaa31604f..749d42c250 100644
--- a/mobile/apps/locker/rust_builder/macos/ente_locker_rust.podspec
+++ b/mobile/apps/locker/rust_builder/macos/ente_locker_frb.podspec
@@ -1,9 +1,9 @@
#
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html.
-# Run `pod lib lint ente_locker_rust.podspec` to validate before publishing.
+# Run `pod lib lint ente_locker_frb.podspec` to validate before publishing.
#
Pod::Spec.new do |s|
- s.name = 'ente_locker_rust'
+ s.name = 'ente_locker_frb'
s.version = '0.0.1'
s.summary = 'A new Flutter FFI plugin project.'
s.description = <<-DESC
@@ -27,15 +27,15 @@ A new Flutter FFI plugin project.
s.script_phase = {
:name => 'Build Rust library',
# First argument is relative path to the `rust` folder, second is name of rust library
- :script => 'sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/locker ente_locker_rust',
+ :script => 'sh "$(cd -P "$PODS_TARGET_SRCROOT" && pwd)/../../../../cargokit/build_pod.sh" ../../../../../rust/bindings/frb/locker ente_locker_frb',
:execution_position => :before_compile,
:input_files => ['${BUILT_PRODUCTS_DIR}/cargokit_phony'],
# Let XCode know that the static library referenced in -force_load below is
# created by this build step.
- :output_files => ["${BUILT_PRODUCTS_DIR}/libente_locker_rust.a"],
+ :output_files => ["${BUILT_PRODUCTS_DIR}/libente_locker_frb.a"],
}
s.pod_target_xcconfig = {
'DEFINES_MODULE' => 'YES',
- 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/libente_locker_rust.a',
+ 'OTHER_LDFLAGS' => '-force_load ${BUILT_PRODUCTS_DIR}/libente_locker_frb.a',
}
end
diff --git a/mobile/apps/locker/rust_builder/pubspec.yaml b/mobile/apps/locker/rust_builder/pubspec.yaml
index 9365ecfe36..016f59fe45 100644
--- a/mobile/apps/locker/rust_builder/pubspec.yaml
+++ b/mobile/apps/locker/rust_builder/pubspec.yaml
@@ -1,4 +1,4 @@
-name: ente_locker_rust
+name: ente_locker_frb
description: "Utility to build Rust code"
version: 0.0.1
publish_to: none
diff --git a/mobile/apps/locker/rust_builder/windows/CMakeLists.txt b/mobile/apps/locker/rust_builder/windows/CMakeLists.txt
index ac95333db5..76b2e34e33 100644
--- a/mobile/apps/locker/rust_builder/windows/CMakeLists.txt
+++ b/mobile/apps/locker/rust_builder/windows/CMakeLists.txt
@@ -5,16 +5,16 @@
cmake_minimum_required(VERSION 3.14)
# Project-level configuration.
-set(PROJECT_NAME "ente_locker_rust")
+set(PROJECT_NAME "ente_locker_frb")
project(${PROJECT_NAME} LANGUAGES CXX)
include("../../../../cargokit/cmake/cargokit.cmake")
-apply_cargokit(${PROJECT_NAME} ../../../../../../../../../rust/bindings/frb/locker ente_locker_rust "")
+apply_cargokit(${PROJECT_NAME} ../../../../../../../../../rust/bindings/frb/locker ente_locker_frb "")
# 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_locker_rust_bundled_libraries
+set(ente_locker_frb_bundled_libraries
"${${PROJECT_NAME}_cargokit_lib}"
PARENT_SCOPE
)
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 0bf68b8e47..0bdfd30297 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -611,7 +611,7 @@ packages:
url: "https://github.com/ente/ente_crypto_dart.git"
source: git
version: "1.0.0"
- ente_locker_rust:
+ ente_locker_frb:
dependency: transitive
description:
path: "apps/locker/rust_builder"
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 3e6efd9a66..d41211b5a4 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2509,6 +2509,17 @@ dependencies = [
"tiff 0.10.3",
]
+[[package]]
+name = "ente-locker-frb"
+version = "0.0.0"
+dependencies = [
+ "ente-accounts",
+ "ente-contacts",
+ "ente-core",
+ "ente-frb-log",
+ "flutter_rust_bridge",
+]
+
[[package]]
name = "ente-ml"
version = "0.0.0"
@@ -2680,17 +2691,6 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "ente_locker_rust"
-version = "0.0.0"
-dependencies = [
- "ente-accounts",
- "ente-contacts",
- "ente-core",
- "ente-frb-log",
- "flutter_rust_bridge",
-]
-
[[package]]
name = "ente_photos_napi"
version = "0.0.0"
diff --git a/rust/apps/codegen/src/main.rs b/rust/apps/codegen/src/main.rs
index c267b142b4..1bcd982255 100644
--- a/rust/apps/codegen/src/main.rs
+++ b/rust/apps/codegen/src/main.rs
@@ -299,13 +299,13 @@ fn format_frb_bindings(target: FrbTarget) -> Result<(), DynError> {
.arg("-p")
.arg("ente_photos_rust")
.arg("-p")
- .arg("ente_locker_rust");
+ .arg("ente-locker-frb");
}
FrbTarget::Photos => {
command.arg("-p").arg("ente_photos_rust");
}
FrbTarget::Locker => {
- command.arg("-p").arg("ente_locker_rust");
+ command.arg("-p").arg("ente-locker-frb");
}
}
command.current_dir(rust_root);
diff --git a/rust/bindings/frb/locker/Cargo.toml b/rust/bindings/frb/locker/Cargo.toml
index 4f04ad9af5..dffb9ce2a9 100644
--- a/rust/bindings/frb/locker/Cargo.toml
+++ b/rust/bindings/frb/locker/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "ente_locker_rust"
+name = "ente-locker-frb"
edition = "2024"
[lib]