diff --git a/bundle.json b/bundle.json index 1c774d29a92873db3f67c014a8345165e9be45f9..3e8e106645db546d80cf3fd9f23cdde02432644d 100644 --- a/bundle.json +++ b/bundle.json @@ -1,7 +1,20 @@ { + "name": "@ohos/ylong_http", + "version": "4.0", + "description": "ylong HTTP implementation", + "publishAs": "code-segment", + "homePage": "https://gitee.com/openharmony", + "repository": "https://gitee.com/openharmony/commonlibrary_rust_ylong_http", + "license": "Apache License 2.0", + "language": "", + "private": false, + "scripts": {}, + "envs": [], + "dirs": [], + "author": {}, + "contributors": [], "component": { "name": "ylong_http", - "description": "ylong HTTP implementation", "subsystem": "commonlibrary", "features": [], "rom": "100KB", @@ -20,7 +33,7 @@ "header_base": [], "header_files": [] }, - "name": "//commonlibrary/rust/ylong_http/ylong_http_client_inner:ylong_http_client_rlib" + "name": "//commonlibrary/rust/ylong_http/ylong_http_client:ylong_http_client_rlib" }, { "header": { diff --git a/patches/build.patch b/patches/build.patch deleted file mode 100644 index 992f93a0f36f5aa88a1b6c49fdc199f2771badb0..0000000000000000000000000000000000000000 --- a/patches/build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/compile_standard_whitelist.json b/compile_standard_whitelist.json -index 48644d6..58e0d85 100644 ---- a/compile_standard_whitelist.json -+++ b/compile_standard_whitelist.json -@@ -1054,7 +1054,8 @@ - "//foundation/communication/netstack/frameworks/js/napi/http:http", - "//foundation/communication/netstack/utils/napi_utils:napi_utils", - "//foundation/communication/netstack/utils/napi_utils:napi_utils_static", -- "//foundation/communication/wifi/wifi/services/wifi_standard/ipc_framework/cRPC:crpc_client", -+ "//foundation/communication/netstack/interfaces/innerkits/rust/ylong_http_client:ylong_http_client", -+ "//foundation/communication/wifi/wifi/services/wifi_standard/ipc_framework/cRPC:crpc_client", - "//foundation/communication/wifi/wifi/services/wifi_standard/ipc_framework/cRPC:crpc_server", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_manage:wifi_manager_service", - "//foundation/communication/wifi/wifi/services/wifi_standard/wifi_framework/wifi_toolkit:wifi_toolkit", -@@ -3248,4 +3249,4 @@ - "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa", - "//third_party/wpa_supplicant/wpa_supplicant-2.9_standard:wpa_updater" - ] --} -\ No newline at end of file -+} diff --git a/patches/netstack.patch b/patches/netstack.patch deleted file mode 100644 index c7166672e95fc09255186172298fa41cfc7a86a8..0000000000000000000000000000000000000000 --- a/patches/netstack.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff --git a/interfaces/innerkits/rust/ylong_http_client/BUILD.gn b/interfaces/innerkits/rust/ylong_http_client/BUILD.gn -index d430831..8817685 100644 ---- a/interfaces/innerkits/rust/ylong_http_client/BUILD.gn -+++ b/interfaces/innerkits/rust/ylong_http_client/BUILD.gn -@@ -26,12 +26,10 @@ ohos_rust_shared_library("ylong_http_client") { - edition = "2021" - clippy_lints = "none" - deps = [ -- "//third_party/rust/crates/reqwest:lib", -- "//third_party/rust/crates/tokio/tokio:lib", -- "//third_party/rust/crates/tokio/tokio-util:lib", -+ "//commonlibrary/rust/ylong_http/ylong_http_client:ylong_http_client_rlib" - ] - features = [ - "default", -- "reqwest_impl", -+ "ylong_impl", - ] - } -diff --git a/interfaces/innerkits/rust/ylong_http_client/src/lib.rs b/interfaces/innerkits/rust/ylong_http_client/src/lib.rs -index 0b57b50..3759fdb 100644 ---- a/interfaces/innerkits/rust/ylong_http_client/src/lib.rs -+++ b/interfaces/innerkits/rust/ylong_http_client/src/lib.rs -@@ -21,3 +21,6 @@ mod reqwest_impl; - - #[cfg(feature = "reqwest_impl")] - pub use reqwest_impl::*; -+ -+#[cfg(feature = "ylong_impl")] -+pub use ylong_http_client_inner::*; diff --git a/patches/patches.json b/patches/patches.json deleted file mode 100644 index 58b84b3c82bd4c2c8ae6fe2990bbcf466a8bcfb6..0000000000000000000000000000000000000000 --- a/patches/patches.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "patches": [ - { - "project":"build", - "patch_file":"build.patch", - "path":"build" - }, - { - "project":"netstack", - "patch_file":"netstack.patch", - "path":"foundation/communication/netstack" - } - ] -} \ No newline at end of file