diff --git a/app/buildSrc/build.gradle.kts b/app/buildSrc/build.gradle.kts index 301b10f87..632bd31f9 100644 --- a/app/buildSrc/build.gradle.kts +++ b/app/buildSrc/build.gradle.kts @@ -30,5 +30,6 @@ dependencies { implementation(libs.ksp.plugin) implementation(libs.navigation.safe.args.plugin) implementation(libs.lsparanoid.plugin) + implementation(libs.moshi.plugin) implementation(libs.jgit) } diff --git a/app/core/build.gradle.kts b/app/core/build.gradle.kts index cc993c11b..7a91562f7 100644 --- a/app/core/build.gradle.kts +++ b/app/core/build.gradle.kts @@ -2,6 +2,7 @@ plugins { id("com.android.library") kotlin("android") kotlin("plugin.parcelize") + id("dev.zacsweers.moshix") id("com.google.devtools.ksp") } @@ -48,9 +49,6 @@ dependencies { implementation(libs.okhttp.logging) implementation(libs.okhttp.dnsoverhttps) - implementation(libs.moshi) - ksp(libs.moshi.codegen) - implementation(libs.room.runtime) implementation(libs.room.ktx) ksp(libs.room.compiler) diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml index a90e950b7..424654dd1 100644 --- a/app/gradle/libs.versions.toml +++ b/app/gradle/libs.versions.toml @@ -1,11 +1,10 @@ [versions] -kotlin = "2.1.20" -android = "8.10.0" -ksp = "2.1.20-1.0.31" +kotlin = "2.1.21" +android = "8.10.1" +ksp = "2.1.21-2.0.1" rikka = "1.3.0" navigation = "2.9.0" libsu = "6.0.0" -moshi = "1.15.2" okhttp = "4.12.0" retrofit = "3.0.0" room = "2.7.1" @@ -20,8 +19,6 @@ markwon-core = { module = "io.noties.markwon:core", version = "4.6.2" } okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } okhttp-dnsoverhttps = { module = "com.squareup.okhttp3:okhttp-dnsoverhttps", version.ref = "okhttp" } okhttp-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" } -moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" } -moshi-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" } timber = { module = "com.jakewharton.timber:timber", version = "5.0.1" } jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version = "7.1.0.202411261347-r" } @@ -31,7 +28,7 @@ appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.0" } core-ktx = { module = "androidx.core:core-ktx", version = "1.16.0" } core-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" } constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" } -fragment-ktx = { module = "androidx.fragment:fragment-ktx", version = "1.8.6" } +fragment-ktx = { module = "androidx.fragment:fragment-ktx", version = "1.8.7" } navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "navigation" } navigation-ui-ktx = { module = "androidx.navigation:navigation-ui-ktx", version.ref = "navigation" } profileinstaller = { module = "androidx.profileinstaller:profileinstaller", version = "1.4.1" } @@ -65,5 +62,6 @@ android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref ksp-plugin = { module = "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin", version.ref = "ksp" } navigation-safe-args-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "navigation" } lsparanoid-plugin = { module = "org.lsposed.lsparanoid:gradle-plugin", version = "0.6.0" } +moshi-plugin = { module = "dev.zacsweers.moshix:dev.zacsweers.moshix.gradle.plugin", version = "0.30.0" } [plugins] diff --git a/native/src/Cargo.lock b/native/src/Cargo.lock index 9a9ebac9d..158259389 100644 --- a/native/src/Cargo.lock +++ b/native/src/Cargo.lock @@ -93,10 +93,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] -name = "block-buffer" -version = "0.11.0-rc.3" +name = "bitflags" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fd016a0ddc7cb13661bf5576073ce07330a693f8608a1320b4e20561cc12cdc" +checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" + +[[package]] +name = "block-buffer" +version = "0.11.0-rc.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a229bfd78e4827c91b9b95784f69492c1b77c1ab75a45a8a037b139215086f94" dependencies = [ "hybrid-array", ] @@ -109,9 +115,9 @@ checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytemuck" -version = "1.22.0" +version = "1.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" +checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c" dependencies = [ "bytemuck_derive", ] @@ -155,9 +161,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.19" +version = "1.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e3a13707ac958681c13b39b458c073d0d9bc8a22cb1b2f4c8e55eb72c13f362" +checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" dependencies = [ "shlex", ] @@ -170,18 +176,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.5.35" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8aa86934b44c19c50f87cc2790e19f54f7a67aedb64101c2e1a2e5ecfb73944" +checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.35" +version = "4.5.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2414dbb2dd0695280da6ea9261e327479e9d37b0630f6b53ba2a11c60c679fd9" +checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" dependencies = [ "anstyle", "clap_lex", @@ -250,9 +256,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.6.1" +version = "0.7.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96272c2ff28b807e09250b180ad1fb7889a3258f7455759b5c3c58b719467130" +checksum = "edaae5fb9dac79a07260e0b2006799ff4f1d342ab243fd7d0892215113b27904" dependencies = [ "hybrid-array", "num-traits", @@ -264,22 +270,21 @@ dependencies = [ [[package]] name = "crypto-common" -version = "0.2.0-rc.1" +version = "0.2.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0b8ce8218c97789f16356e7896b3714f26c2ee1079b79c0b7ae7064bb9089fa" +checksum = "8a23fa214dea9efd4dacee5a5614646b30216ae0f05d4bb51bafb50e9da1c5be" dependencies = [ - "getrandom", "hybrid-array", - "rand_core", ] [[package]] name = "crypto-primes" -version = "0.6.2" +version = "0.7.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acbaf157961745008b5a80ee1cc974150691304fe9177edf69747142bfd9878" +checksum = "ae744b9f528151f8c440cf67498f24d2d1ac0ab536b5ce7b1f87a7a5961bd1c1" dependencies = [ "crypto-bigint", + "libm", "rand_core", ] @@ -331,9 +336,9 @@ dependencies = [ [[package]] name = "der" -version = "0.8.0-rc.1" +version = "0.8.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82db698b33305f0134faf590b9d1259dc171b5481ac41d5c8146c3b3ee7d4319" +checksum = "b00a9651bf9c00a38b7c383073cb22fb42f20a5f978c9f97ad5c7128cbd3c1bd" dependencies = [ "const-oid", "der_derive", @@ -344,9 +349,9 @@ dependencies = [ [[package]] name = "der_derive" -version = "0.8.0-rc.1" +version = "0.8.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "211bea8bb45f5f61bc857104606913ef8ac8b5ec698143aa2aa96a7ffdc94991" +checksum = "d184a65ac0a9db9e66e0d629bea86d0402198b2a5cc01c9c16de7a6537f0ac4f" dependencies = [ "proc-macro2", "quote", @@ -364,9 +369,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.11.0-pre.9" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2e3d6615d99707295a9673e889bf363a04b2a466bd320c65a72536f7577379" +checksum = "460dd7f37e4950526b54a5a6b1f41b6c8e763c58eb9a8fc8fc05ba5c2f44ca7b" dependencies = [ "block-buffer", "const-oid", @@ -376,9 +381,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.17.0-pre.9" +version = "0.17.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e62f2041a28c40b8884b79fbd19bc7457d76c6397767831e9ff4029fc0473a9" +checksum = "abbc927a7e946a78fbff19c283bc5d4f8960d9000049a7e2b0d84cb2730613c4" dependencies = [ "der", "digest", @@ -386,20 +391,20 @@ dependencies = [ "rfc6979", "signature", "spki", + "zeroize", ] [[package]] name = "elliptic-curve" -version = "0.14.0-rc.1" +version = "0.14.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc43715037532dc2d061e5c97e81b684c28993d52a4fa4eb7d2ce2826d78f2f2" +checksum = "bedd367b8649edac0efb2120e420460cffc41988f94eb55f009832484a45c46f" dependencies = [ "base16ct", "crypto-bigint", "digest", "ff", "group", - "hkdf", "hybrid-array", "pem-rfc7468", "pkcs8", @@ -417,9 +422,9 @@ checksum = "784a4df722dc6267a04af36895398f59d21d07dce47232adf31ec0ff2fa45e67" [[package]] name = "ff" -version = "0.13.1" +version = "0.14.0-pre.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0b50bfb653653f9ca9095b427bed08ab8d75a137839d9ad64eb11810d5b6393" +checksum = "d42dd26f5790eda47c1a2158ea4120e32c35ddc9a7743c98a292accc01b54ef3" dependencies = [ "rand_core", "subtle", @@ -450,49 +455,41 @@ checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" [[package]] name = "getrandom" -version = "0.2.15" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4" dependencies = [ "cfg-if", "libc", + "r-efi", "wasi", ] [[package]] name = "group" -version = "0.13.0" +version = "0.14.0-pre.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" +checksum = "1ff6a0b2dd4b981b1ae9e3e6830ab146771f3660d31d57bafd9018805a91b0f1" dependencies = [ "ff", "rand_core", "subtle", ] -[[package]] -name = "hkdf" -version = "0.13.0-pre.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00176ff81091018d42ff82e8324f8e5adb0b7e0468d1358f653972562dbff031" -dependencies = [ - "hmac", -] - [[package]] name = "hmac" -version = "0.13.0-pre.4" +version = "0.13.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4b1fb14e4df79f9406b434b60acef9f45c26c50062cccf1346c6103b8c47d58" +checksum = "8dc6a2fcc35ab09136c6df2cdf9ca49790701420a3a6b5db0987dddbabc79b21" dependencies = [ "digest", ] [[package]] name = "hybrid-array" -version = "0.2.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2d35805454dc9f8662a98d6d61886ffe26bd465f5960e0e55345c70d5c0d2a9" +checksum = "891d15931895091dea5c47afa5b3c9a01ba634b311919fd4d41388fa0e3d76af" dependencies = [ "typenum", "zeroize", @@ -506,9 +503,15 @@ checksum = "0864a00c8d019e36216b69c2c4ce50b83b7bd966add3cf5ba554ec44f8bebcf5" [[package]] name = "libc" -version = "0.2.171" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + +[[package]] +name = "libm" +version = "0.2.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de" [[package]] name = "libz-rs-sys" @@ -571,7 +574,6 @@ version = "0.0.0" dependencies = [ "argh", "base", - "block-buffer", "bytemuck", "byteorder", "bzip2", @@ -589,7 +591,6 @@ dependencies = [ "pb-rs", "quick-protobuf", "rsa", - "sec1", "sha1", "sha2", "size", @@ -671,33 +672,35 @@ dependencies = [ [[package]] name = "p256" -version = "0.14.0-pre.2" +version = "0.14.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71f3fd64a9cad9c26ed7f734b152196d5e56376b9957c832bcca0de48a708080" +checksum = "635e1f1e5af6fc13e6c6a587fa1455e17fa7c8b54ba74093be5254819e34713f" dependencies = [ "ecdsa", "elliptic-curve", + "primefield", "primeorder", "sha2", ] [[package]] name = "p384" -version = "0.14.0-pre.2" +version = "0.14.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e19554fe6ee269c860a0f231cbba714e5cbef26a927c75d8e30ac9040a4b32e" +checksum = "e029b66d7fbea49e7b510de607a2cacdbb2fc79d67856689d223ad8aa7fa91e3" dependencies = [ "ecdsa", "elliptic-curve", + "primefield", "primeorder", "sha2", ] [[package]] name = "p521" -version = "0.14.0-pre.2" +version = "0.14.0-pre.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957df9b5e6a7542f6430ec5187a4cb66d8498946c38b23fd14562bce6e32e6de" +checksum = "cd3a148e2ddfbf70d45fb1350f8bafb399d20c0a3f381ba1fbb5c680ccfe4d37" dependencies = [ "base16ct", "ecdsa", @@ -719,18 +722,18 @@ dependencies = [ [[package]] name = "pem-rfc7468" -version = "1.0.0-rc.2" +version = "1.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dfbfa5c6f0906884269722c5478e72fd4d6c0e24fe600332c6d62359567ce1" +checksum = "a8e58fab693c712c0d4e88f8eb3087b6521d060bcaf76aeb20cb192d809115ba" dependencies = [ "base64ct", ] [[package]] name = "pkcs1" -version = "0.8.0-rc.1" +version = "0.8.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226eb25e2c46c166ce498ac0f606ac623142d640064879ff445938accddff1e2" +checksum = "24e16d93c725fa250577ffdec06ebbff4cae3625b0e2881ac43a5427797ee8d3" dependencies = [ "der", "pkcs8", @@ -739,9 +742,9 @@ dependencies = [ [[package]] name = "pkcs8" -version = "0.11.0-rc.2" +version = "0.11.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22636de7c995e997ed3d8d2949b7414d4faba3efa7312a6c0e75d875a14bdd4" +checksum = "3f1843d4345dfe1a55e487db747a04c01af50415b03e937410e0a41d8cc24ec7" dependencies = [ "der", "spki", @@ -755,24 +758,31 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "primefield" -version = "0.14.0-pre.0" +version = "0.14.0-pre.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f2ce0fa9cccdaf216230d151ce51a15298aef50ad76081a830128ecbc6428a" +checksum = "1bbeb92947a0d0d4b0cab5e2e6749acc44c81461eb3b1aff4dbb7acd0eb9f0ab" +dependencies = [ + "crypto-bigint", + "ff", + "rand_core", + "subtle", + "zeroize", +] [[package]] name = "primeorder" -version = "0.14.0-pre.2" +version = "0.14.0-pre.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b794117b388378d55629f78f61e64e182baa200bf59c1a8205e0c46508ce5873" +checksum = "f2e45e9e037423d1d08cad23132bef43fda87481e362154fd145831028dcf3b8" dependencies = [ "elliptic-curve", ] [[package]] name = "proc-macro2" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] @@ -795,19 +805,25 @@ dependencies = [ ] [[package]] -name = "rand_core" -version = "0.6.4" +name = "r-efi" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" + +[[package]] +name = "rand_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ "getrandom", ] [[package]] name = "rfc6979" -version = "0.5.0-pre.4" +version = "0.5.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871ee76a3eee98b0f805e5d1caf26929f4565073c580c053a55f886fc15dea49" +checksum = "f53f124bf3ec90be84ae97d7f52175ba938898525554c13c9017eb8f0a604146" dependencies = [ "hmac", "subtle", @@ -815,9 +831,9 @@ dependencies = [ [[package]] name = "rsa" -version = "0.10.0-pre.4" +version = "0.10.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e82e90f434676d49758cab5b3ff2cc1fd8f12bf7d79b70c6088bc5a4e7c63270" +checksum = "f30f0ad781aea19fe741d7a901b2ad8b4271ac3516e7045b8ecff74e201968fe" dependencies = [ "const-oid", "crypto-bigint", @@ -841,15 +857,15 @@ checksum = "a157657054ffe556d8858504af8a672a054a6e0bd9e8ee531059100c0fa11bb2" [[package]] name = "rustversion" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "sec1" -version = "0.8.0-rc.3" +version = "0.8.0-rc.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1988446eff153796413a73669dfaa4caa3f5ce8b25fac89e3821a39c611772e" +checksum = "e4855dd9b15e8e469fad23529698f7f7b7a6b250a81c88b1f9d7efe1abca7717" dependencies = [ "base16ct", "der", @@ -891,9 +907,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.11.0-pre.4" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9540978cef7a8498211c1b1c14e5ce920fe5bd524ea84f4a3d72d4602515ae93" +checksum = "6f9318facddf9ac32a33527066936837e189b3f23ced6edc1603720ead5e2b3d" dependencies = [ "cfg-if", "cpufeatures", @@ -902,9 +918,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.11.0-pre.4" +version = "0.11.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540c0893cce56cdbcfebcec191ec8e0f470dd1889b6e7a0b503e310a94a168f5" +checksum = "aa1d2e6b3cc4e43a8258a9a3b17aa5dfd2cc5186c7024bba8a64aa65b2c71a59" dependencies = [ "cfg-if", "cpufeatures", @@ -919,9 +935,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "signature" -version = "2.3.0-pre.4" +version = "3.0.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "054d71959c7051b9042c26af337f05cc930575ed2604d7d3ced3158383e59734" +checksum = "d7ae074ff622614874804868b07d9cb786223082c9fe726a6653608f32f37b02" dependencies = [ "digest", "rand_core", @@ -941,9 +957,9 @@ checksum = "1b6709c7b6754dca1311b3c73e79fcce40dd414c782c66d88e8823030093b02b" [[package]] name = "spki" -version = "0.8.0-rc.1" +version = "0.8.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ac66481418fd7afdc584adcf3be9aa572cf6c2858814494dc2a01755f050bc" +checksum = "c2f0e2bdca9b00f5be6dd3bb6647d50fd0f24a508a95f78e3bb2fe98d0403c85" dependencies = [ "base64ct", "der", @@ -963,9 +979,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.100" +version = "2.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" +checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" dependencies = [ "proc-macro2", "quote", @@ -1048,9 +1064,12 @@ checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.14.2+wasi-0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3" +dependencies = [ + "wit-bindgen-rt", +] [[package]] name = "winapi-util" @@ -1134,6 +1153,15 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "wit-bindgen-rt" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" +dependencies = [ + "bitflags", +] + [[package]] name = "x509-cert" version = "0.3.0-pre.0" diff --git a/native/src/Cargo.toml b/native/src/Cargo.toml index f1cc71792..741bada59 100644 --- a/native/src/Cargo.toml +++ b/native/src/Cargo.toml @@ -17,13 +17,13 @@ num-derive = "0.4.2" thiserror = "2.0.12" byteorder = "1.5.0" size = "0.5.0" -bytemuck = "1.22.0" +bytemuck = "1.23.0" fdt = "0.1.5" const_format = "0.2.34" bit-set = "0.8.0" -syn = "2.0.100" +syn = "2.0.101" quote = "1.0.40" -proc-macro2 = "1.0.94" +proc-macro2 = "1.0.95" argh = { version = "0.1.13", default-features = false } pb-rs = { version = "0.10.0", default-features = false } quick-protobuf = "0.8.1" @@ -34,19 +34,15 @@ lz4 = "1.28.1" xz2 = "0.1.7" # Rust crypto crates are tied together -sha1 = "=0.11.0-pre.4" -sha2 = "=0.11.0-pre.4" -digest = "=0.11.0-pre.9" -p256 = "0.14.0-pre.2" -p384 = "0.14.0-pre.2" -p521 = "0.14.0-pre.2" -rsa = "0.10.0-pre.4" +sha1 = "0.11.0-rc.0" +sha2 = "0.11.0-rc.0" +digest = "0.11.0-rc.0" +p256 = "0.14.0-pre.4" +p384 = "0.14.0-pre.4" +p521 = "0.14.0-pre.4" +rsa = "0.10.0-rc.0" x509-cert = "0.3.0-pre.0" -der = "0.8.0-rc.1" - -# Pin version to prevent cargo update breaking builds -block-buffer = "=0.11.0-rc.3" -sec1 = "=0.8.0-rc.3" +der = "0.8.0-rc.3" [patch.crates-io] pb-rs = { git = "https://github.com/tafia/quick-protobuf.git" } diff --git a/native/src/boot/Cargo.toml b/native/src/boot/Cargo.toml index 29a31dac2..1eed7e5f1 100644 --- a/native/src/boot/Cargo.toml +++ b/native/src/boot/Cargo.toml @@ -35,7 +35,3 @@ bzip2 = { workspace = true, features = ["libbz2-rs-sys"] } lz4 = { workspace = true } xz2 = { workspace = true } zopfli = { workspace = true, features = ["gzip"] } - -# Pin version to prevent cargo update break builds -block-buffer = { workspace = true } -sec1 = { workspace = true }