diff --git a/Cargo.lock b/Cargo.lock index f190954..bb7f854 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -26,7 +26,7 @@ dependencies = [ "anyhow", "apk_frauder", "log", - "pyo3 0.20.0", + "pyo3", "pyo3-log", "rayon", "serde", @@ -245,15 +245,6 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "itoa" version = "1.0.10" @@ -321,17 +312,6 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -339,21 +319,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -364,7 +330,7 @@ checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall", "smallvec", "windows-targets", ] @@ -384,18 +350,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "pyo3" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35100f9347670a566a67aa623369293703322bb9db77d99d7df7313b575ae0c8" -dependencies = [ - "cfg-if", - "libc", - "parking_lot 0.11.2", - "pyo3-build-config 0.14.5", -] - [[package]] name = "pyo3" version = "0.20.0" @@ -407,22 +361,13 @@ dependencies = [ "indoc", "libc", "memoffset", - "parking_lot 0.12.1", - "pyo3-build-config 0.20.0", + "parking_lot", + "pyo3-build-config", "pyo3-ffi", "pyo3-macros", "unindent", ] -[[package]] -name = "pyo3-build-config" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d12961738cacbd7f91b7c43bc25cfeeaa2698ad07a04b3be0aa88b950865738f" -dependencies = [ - "once_cell", -] - [[package]] name = "pyo3-build-config" version = "0.20.0" @@ -440,18 +385,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "214929900fd25e6604661ed9cf349727c8920d47deff196c4e28165a6ef2a96b" dependencies = [ "libc", - "pyo3-build-config 0.20.0", + "pyo3-build-config", ] [[package]] name = "pyo3-log" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f47b0777feb17f61eea78667d61103758b243a871edc09a7786500a50467b605" +checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd" dependencies = [ "arc-swap", "log", - "pyo3 0.14.5", + "pyo3", ] [[package]] @@ -537,15 +482,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - [[package]] name = "redox_syscall" version = "0.3.5" @@ -668,28 +604,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-targets" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index 2f453a6..f82d2ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,3 +6,4 @@ members = [ "androscalpel_serializer_derive", "androscalpel", ] +resolver = "2" diff --git a/androscalpel/Cargo.toml b/androscalpel/Cargo.toml index f176681..5954747 100644 --- a/androscalpel/Cargo.toml +++ b/androscalpel/Cargo.toml @@ -14,9 +14,14 @@ androscalpel_serializer = { version = "0.1.0", path = "../androscalpel_serialize anyhow = { version = "1.0.75", features = ["backtrace"] } apk_frauder = { version = "0.1.0", path = "../apk_frauder" } log = "0.4.20" -pyo3 = { version = "0.20.0", features = ["anyhow"] } -pyo3-log = "0.8.3" +pyo3 = { version = "0.20.0", features = ["anyhow", "abi3-py38"] } +pyo3-log = "0.9.0" rayon = "1.9.0" serde = { version = "1.0.195", features = ["derive"] } serde_json = "1.0.111" sha1 = "0.10.6" + + +#[features] +#extension-module = ["pyo3/extension-module"] +#default = [""] diff --git a/androscalpel/pyproject.toml b/androscalpel/pyproject.toml index 0659e09..5448275 100644 --- a/androscalpel/pyproject.toml +++ b/androscalpel/pyproject.toml @@ -4,13 +4,12 @@ build-backend = "maturin" [project] name = "androscalpel" -requires-python = ">=3.7" +requires-python = ">=3.8" classifiers = [ "Programming Language :: Rust", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] - [tool.maturin] features = ["pyo3/extension-module"]