some small cleanups

Author: wheregmis

packages/cli-opt/Cargo.toml

@@ -13,7 +13,7 @@ keywords = ["dom", "ui", "gui", "react"]
 anyhow = { workspace = true }
 manganis = { workspace = true }
 manganis-core = { workspace = true }
-permissions-core = { path = "../permissions/permissions-core" }
+permissions = { path = "../permissions/permissions" }
 object = { workspace = true, features = ["wasm"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }

packages/cli-opt/src/lib.rs

@@ -19,8 +19,8 @@ mod json;
 pub use file::process_file_to;
 pub use hash::add_hash_to_asset;
 
-// Re-export SymbolData from permissions-core for convenience
-pub use permissions_core::SymbolData;
+// Re-export SymbolData from the public permissions crate for convenience
+pub use permissions::SymbolData;
 
 /// A manifest of all assets collected from dependencies
 ///

packages/cli/Cargo.toml

@@ -28,7 +28,7 @@ depinfo = { workspace = true }
 subsecond-types = { workspace = true }
 dioxus-cli-telemetry = { workspace =  true }
 dioxus-component-manifest = { workspace = true }
-permissions-core = { workspace = true }
+permissions = { workspace = true }
 
 clap = { workspace = true, features = ["derive", "cargo"] }
 convert_case = { workspace = true }

packages/cli/src/build/assets.rs

@@ -40,7 +40,7 @@ use dioxus_cli_opt::AssetManifest;
 use manganis::{AssetOptions, AssetVariant, BundledAsset, ImageFormat, ImageSize};
 use object::{File, Object, ObjectSection, ObjectSymbol, ReadCache, ReadRef, Section, Symbol};
 use pdb::FallibleIterator;
-use permissions_core::{Permission, SymbolData};
+use permissions::{Permission, SymbolData};
 use rayon::iter::{IntoParallelRefMutIterator, ParallelIterator};
 
 /// Extract all manganis symbols and their sections from the given object file.

packages/cli/src/build/permissions.rs

@@ -13,9 +13,12 @@
 use std::path::Path;
 
 use crate::Result;
-use permissions_core::{Permission, Platform};
+use permissions::Platform;
 use serde::Serialize;
 
+/// Alias the shared manifest type from the permissions crate for CLI-specific helpers
+pub type PermissionManifest = permissions::PermissionManifest;
+
 /// Android permission for Handlebars template
 #[derive(Debug, Clone, Serialize)]
 pub struct AndroidPermission {
@@ -55,36 +58,7 @@ pub(crate) async fn extract_permissions_from_file(
     // Use the unified symbol extraction which handles both assets and permissions
     let result = extract_symbols_from_file(path).await?;
 
-    Ok(PermissionManifest::new(result.permissions))
-}
-
-/// A manifest of all permissions found in a binary
-#[derive(Debug, Clone, Default)]
-pub struct PermissionManifest {
-    permissions: Vec<Permission>,
-}
-
-impl PermissionManifest {
-    pub fn new(permissions: Vec<Permission>) -> Self {
-        Self { permissions }
-    }
-
-    #[allow(dead_code)]
-    pub fn permissions(&self) -> &[Permission] {
-        &self.permissions
-    }
-
-    #[allow(dead_code)]
-    pub fn is_empty(&self) -> bool {
-        self.permissions.is_empty()
-    }
-
-    pub fn permissions_for_platform(&self, platform: Platform) -> Vec<&Permission> {
-        self.permissions
-            .iter()
-            .filter(|p| p.supports_platform(platform))
-            .collect()
-    }
+    Ok(PermissionManifest::from_permissions(result.permissions))
 }
 
 /// Get Android permissions for Handlebars template

packages/cli/src/build/request.rs

@@ -1441,13 +1441,13 @@ impl BuildRequest {
         let permission_manifest = if skip_permissions {
             super::permissions::PermissionManifest::default()
         } else {
-            let manifest = super::permissions::PermissionManifest::new(result.permissions);
+            let manifest = super::permissions::PermissionManifest::from_permissions(result.permissions);
 
             // Log permissions found for platforms that need them
             let platform = match self.bundle {
-                BundleFormat::Android => Some(permissions_core::Platform::Android),
-                BundleFormat::Ios => Some(permissions_core::Platform::Ios),
-                BundleFormat::MacOS => Some(permissions_core::Platform::Macos),
+                BundleFormat::Android => Some(permissions::Platform::Android),
+                BundleFormat::Ios => Some(permissions::Platform::Ios),
+                BundleFormat::MacOS => Some(permissions::Platform::Macos),
                 _ => None,
             };
 

packages/permissions/permissions-core/src/permission.rs

@@ -113,6 +113,11 @@ impl PermissionManifest {
         }
     }
 
+    /// Create a manifest from an existing list of permissions
+    pub fn from_permissions(permissions: Vec<Permission>) -> Self {
+        Self { permissions }
+    }
+
     /// Add a permission to the manifest
     pub fn add_permission(&mut self, permission: Permission) {
         self.permissions.push(permission);

packages/permissions/permissions/src/lib.rs

@@ -31,7 +31,7 @@
 
 pub use permissions_core::{
     CustomPermissionBuilder, LocationPrecision, Permission, PermissionBuilder, PermissionKind,
-    PermissionManifest, Platform, PlatformFlags, PlatformIdentifiers,
+    PermissionManifest, Platform, PlatformFlags, PlatformIdentifiers, SymbolData,
 };
 pub use permissions_macro::{permission, static_permission};
 

packages/platform-bridge-macro/Cargo.toml

@@ -18,8 +18,3 @@ proc-macro = true
 syn = { version = "2.0", features = ["full"] }
 quote = "1.0"
 proc-macro2 = "1.0"
-const-serialize = { path = "../const-serialize" }
-const-serialize-macro = { path = "../const-serialize-macro" }
-
-[dev-dependencies]
-

packages/platform-bridge-macro/src/android_plugin.rs

@@ -152,19 +152,18 @@ impl ToTokens for AndroidPluginParser {
                     __FILE_PATHS,
                 );
 
-            // Serialize the metadata
-            const __BUFFER: const_serialize::ConstVec<u8, 4096> = {
-                const EMPTY: const_serialize::ConstVec<u8, 4096> = const_serialize::ConstVec::new_with_max_size();
-                const_serialize::serialize_const(&__JAVA_META, EMPTY)
-            };
+            // Serialize the metadata using the shared helper
+            const __BUFFER: dioxus_platform_bridge::android::metadata::JavaMetadataBuffer =
+                dioxus_platform_bridge::android::metadata::serialize_java_metadata(&__JAVA_META);
             const __BYTES: &[u8] = __BUFFER.as_ref();
             const __LEN: usize = __BYTES.len();
 
             // Embed in linker section
             #[link_section = "__DATA,__java_source"]
             #[used]
             #[unsafe(export_name = #export_name_lit)]
-            static __LINK_SECTION: [u8; __LEN] = dioxus_platform_bridge::android::macro_helpers::copy_bytes(__BYTES);
+            static __LINK_SECTION: [u8; __LEN] =
+                dioxus_platform_bridge::android::macro_helpers::copy_bytes(__BYTES);
         };
 
         tokens.extend(link_section);