From f45ef22c82e9389933fcb93d6a22fd5fcdd5d4f0 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Mon, 8 Dec 2025 16:21:00 +0330 Subject: [PATCH 01/23] Build: Modify the root cargo.toml to hc 0.6.0 --- Cargo.lock | 106 ++++++++++++++++++++++++++--------------------------- Cargo.toml | 6 +-- flake.lock | 74 ++++++++++++++----------------------- 3 files changed, 84 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a645520c..efc37f15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1906,9 +1906,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "fixt" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cb33117f6764f4b969176841541b2da12ea2cf3071b439d8d27337efe28b458" +checksum = "20f2db2cbe99353c4c5e26046ebcb77e0335bd0b70a79bf963ca7ff97e8f0658" dependencies = [ "holochain_serialized_bytes", "lazy_static", @@ -2580,9 +2580,9 @@ dependencies = [ [[package]] name = "hdi" -version = "0.7.0-rc.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02762996609e6902e204de4efcba1092a7b8595cdc811b495f8779dbc9e75c69" +checksum = "c318d6153db1a7d77b0dea6c89a74345bac9d7ada3046f539e21cc00e4d243db" dependencies = [ "getrandom 0.3.2", "hdk_derive", @@ -2600,9 +2600,9 @@ dependencies = [ [[package]] name = "hdk" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de2b6ea67033ab96e6dbf4ef4e8160a09cc7ad4ec5e13a40be342ed3bb4adb7a" +checksum = "c3c5a6731e79600361357cf9abc22ffd12d54036534592e9ffaff1da1fed453a" dependencies = [ "getrandom 0.3.2", "hdi", @@ -2618,9 +2618,9 @@ dependencies = [ [[package]] name = "hdk_derive" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e01539ae9e4b73d1e31e917a9c1b5f0346d340c44c70c06760e90983bdd033" +checksum = "c3b9cecd43529636ef83f04becec2d0aa44d9489feee4ae918934a6785e6e002" dependencies = [ "darling 0.21.3", "heck 0.5.0", @@ -2673,9 +2673,9 @@ dependencies = [ [[package]] name = "holo_hash" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61baf110c6512507269dad9c459c4b87b302b074b0a827932f26227d02756c59" +checksum = "8d4d7ada0089a52dc48498e4deab38c056b665a666b5f8717161c8d0248fd31e" dependencies = [ "base64 0.22.1", "blake2b_simd", @@ -2699,9 +2699,9 @@ dependencies = [ [[package]] name = "holochain" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b2b265955840b1db9f4679131f1fd189543f00a2294a6f123fbe5324b36702" +checksum = "2b69fcc76ad9206c6e6caf0e49f8b033bb88c8c8790cc0144df3174f3bc0c085" dependencies = [ "anyhow", "async-trait", @@ -2834,9 +2834,9 @@ dependencies = [ [[package]] name = "holochain_cascade" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e065c656948d8d1aeaa78ad9b00ee13db5a6c8c6f1754ae62d8e04d29f482bb9" +checksum = "ebd8b6b61ddb8dfd47d704480ece0140f22e698f5ac6ea1de651429579f3306b" dependencies = [ "async-trait", "fixt", @@ -2861,9 +2861,9 @@ dependencies = [ [[package]] name = "holochain_chc" -version = "0.3.0-rc.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28cd66d6c9b93eb82795b3889d291e3b49721e72c90305cb930866a1d47c407" +checksum = "760f6929214bdaa7af36fb9879de3eac6ee0106ebc651edae70d314b2580d729" dependencies = [ "async-trait", "derive_more 2.0.1", @@ -2887,9 +2887,9 @@ dependencies = [ [[package]] name = "holochain_conductor_api" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48b21d643cd094b47ddedbef690d6bd45577a2ff2d4909eb4c56ac0fe5f142e0" +checksum = "4b26c6f904fbeed71fc65059e259704c95b807c27f03c6fd59cd3b8166ded5f2" dependencies = [ "derive_more 2.0.1", "holo_hash", @@ -2916,9 +2916,9 @@ dependencies = [ [[package]] name = "holochain_conductor_config" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b060c5626763074017f3e15229f1a697f326e6d147090a4c9a8aa7173fca3b8" +checksum = "792605b446543d458d00c82b94d95e74a64b600b26ce2afdfa7d527674cbf113" dependencies = [ "ansi_term", "anyhow", @@ -2934,9 +2934,9 @@ dependencies = [ [[package]] name = "holochain_integrity_types" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5ef18260dabc48df1aa6364f349ede502955e6cfd914918954c515927d93350" +checksum = "23114491d121f97fe2d5095b412cfcb84c009187bfe1fcaca6c32ff0119f1a4b" dependencies = [ "derive_builder", "holo_hash", @@ -2954,9 +2954,9 @@ dependencies = [ [[package]] name = "holochain_keystore" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b70f8c95e63c28d4642345df370e07f9bf363e7470a6e3ca5bca6fa34bf8e3bd" +checksum = "788bc4d6249f03bbaf3e3003fdb8cbb1fabefc7a4ccd156e13891ab97b3252bc" dependencies = [ "base64 0.22.1", "derive_more 2.0.1", @@ -2983,9 +2983,9 @@ dependencies = [ [[package]] name = "holochain_metrics" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "457270449938fcb283118f3067ae584e2d686b163bb8791223f8ce9a4be75e29" +checksum = "ebb58d2e933d7797879191671cf17539fb532385f1a2f231fe12cea87585e3f7" dependencies = [ "influxive", "opentelemetry_api", @@ -2994,9 +2994,9 @@ dependencies = [ [[package]] name = "holochain_nonce" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4620e096156dc686b357f6a57e82b892afd5bdc35455315c9120090aa890a8" +checksum = "75da59d1c721c95502fee9a346a34fab6fd6364a39eb5e78f19688ff9cb9abbb" dependencies = [ "getrandom 0.3.2", "holochain_secure_primitive", @@ -3005,9 +3005,9 @@ dependencies = [ [[package]] name = "holochain_p2p" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed8eabedc733be2f028938c1abc188b953aab71195b52e54ec0cdca4c2e7eae" +checksum = "b0172204dffcf65f29826b6bd47082e1970ae623c22c626d31b0f48b3bf216d0" dependencies = [ "async-trait", "base64 0.22.1", @@ -3046,9 +3046,9 @@ dependencies = [ [[package]] name = "holochain_secure_primitive" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68ea560bfce0af93524966a1df55e25ce2abf1cd0bd9bcb80ca715460d40c34" +checksum = "9e28bdc1ec5fc4a8a7d96a95d12762297fe5c819b881273b2927d2fa19456ded" dependencies = [ "paste", "serde", @@ -3082,9 +3082,9 @@ dependencies = [ [[package]] name = "holochain_sqlite" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb469e3b687fa12ea2c2bf729608ccd00046751cb6f98d12c954de2373df3ce" +checksum = "c1aa0a5bdc8e85e16d2867ef3be51e9e3a7d5e3e8fc5783602fbf59d561f9493" dependencies = [ "anyhow", "async-trait", @@ -3125,9 +3125,9 @@ dependencies = [ [[package]] name = "holochain_state" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab2b80faf5440303a3288aba42ecb2bf4296c5128725c23a2b6881f3c498c43" +checksum = "c024c6acfd21c330600dcdbb3388d7c351c917ef998331dbb7adafd2f594f06c" dependencies = [ "async-recursion", "chrono", @@ -3155,9 +3155,9 @@ dependencies = [ [[package]] name = "holochain_state_types" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3d6a8a88a43854e83ea265f572604f6a276f0238bc0e054ba7bd32a320235b" +checksum = "bda33d9f4c38cc8b155e0cb6f100935624e9dacdf1f40a7411c8321d8c83008f" dependencies = [ "holo_hash", "holochain_integrity_types", @@ -3166,9 +3166,9 @@ dependencies = [ [[package]] name = "holochain_timestamp" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf827e0e43b5c52d26a9af981e33306e1f5c4bb349294abcb367f3d45c35379" +checksum = "f6baf669811b4b70912408b9191127836a1a38c9ea690bcaa4c245d09fcf9253" dependencies = [ "chrono", "rusqlite", @@ -3177,9 +3177,9 @@ dependencies = [ [[package]] name = "holochain_trace" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23581c584865b8a55b596f0dec4307c20cd4ce19addbef3cf45113c6147503ad" +checksum = "3ec6a516d857ccc4e4894b9aebb82bfe679a03343dfba1c1011a737a837de2d3" dependencies = [ "chrono", "derive_more 2.0.1", @@ -3194,9 +3194,9 @@ dependencies = [ [[package]] name = "holochain_types" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133d0ea8529d212c80f4f7034d4d7e3d7f06834b3a98a5df50d9e12c5091d3b2" +checksum = "b8bdeb03038e8766a31eaea7b8056f3ba05cea579f21ca6f27b3419eaea99680" dependencies = [ "anyhow", "async-trait", @@ -3242,9 +3242,9 @@ dependencies = [ [[package]] name = "holochain_util" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "341c2fd30f7169009d4c3f8e8034ef74b9fb488caa577f131a4c59510ef13fb0" +checksum = "3d10cf3ca40b04f1e180817d9b059d1fe11b3e05e3127c0a5f0ad4651ddad6cb" dependencies = [ "backtrace", "cfg-if", @@ -3304,9 +3304,9 @@ dependencies = [ [[package]] name = "holochain_websocket" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69007ef38719b63f71642de8ff7ee8c300dc4c7ae1d9d9ffb0ecfcfd322cc38b" +checksum = "98b31a46b64bb9d9ae0574aa0f43b039c573081670b0d37f30678b0bcc6e56a8" dependencies = [ "async-trait", "bytes", @@ -3323,9 +3323,9 @@ dependencies = [ [[package]] name = "holochain_zome_types" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4780c6128da312ed6ae03c9da2e1a8e8b96bd1f60891ba12fa5732841ec99a96" +checksum = "d2b31902b3b626e91bfcc0f102bd04fe065eca18f10dab4b15e058d55cd5958f" dependencies = [ "derive_builder", "derive_more 2.0.1", @@ -4615,9 +4615,9 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mr_bundle" -version = "0.6.0-rc.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17e05dc3bd43745690a101417dd887ac4158af2cac8dbd953666c884f0b4579" +checksum = "3c37488b9e75bf10de7fcea730b4fbfaab95c7b1325b227025363d4c9c06df12" dependencies = [ "bytes", "dunce", @@ -5637,7 +5637,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425" dependencies = [ "anyhow", - "itertools 0.13.0", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.100", diff --git a/Cargo.toml b/Cargo.toml index d126e75f..a55f4052 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,9 +21,9 @@ keywords = ["holochain", "android", "tauri", "p2p"] license = "MIT OR Apache-2.0" [workspace.dependencies] -holochain = "0.6.0-rc.0" -holochain_conductor_api = "0.6.0-rc.0" -holochain_types = "0.6.0-rc.0" +holochain = "0.6.0" +holochain_conductor_api = "0.6.0" +holochain_types = "0.6.0" holochain_serialized_bytes = "0.0.56" sodoken = "0.1.0" url2 = "0.0.6" diff --git a/flake.lock b/flake.lock index d2ba8ee7..d31a6896 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1762189950, - "narHash": "sha256-aotggLUXjlDGqKWibGPQcMZJGgdr79S21ISrv1Wz6RI=", + "lastModified": 1763511871, + "narHash": "sha256-KKZWi+ij7oT0Ag8yC6MQkzfHGcytyjMJDD+47ZV1YNU=", "owner": "ipetkov", "repo": "crane", - "rev": "50700219af884287ad7c85507e2f163b23a027a9", + "rev": "099f9014bc8d0cd6e445470ea1df0fd691d5a548", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762040540, - "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0010412d62a25d959151790968765a70c436598b", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -67,23 +67,6 @@ } }, "hc-launch": { - "flake": false, - "locked": { - "lastModified": 1762454524, - "narHash": "sha256-sIeKq64AtMlN60UWVst3g6FsMXZFhUBbbCyWzPD68es=", - "owner": "holochain", - "repo": "hc-launch", - "rev": "a7fcb9447cd37dcb5978b3327eaee077871822c1", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "hc-launch", - "type": "github" - } - }, - "hc-launch_2": { "flake": false, "locked": { "lastModified": 1752056054, @@ -103,16 +86,16 @@ "hc-scaffold": { "flake": false, "locked": { - "lastModified": 1760566803, - "narHash": "sha256-fWflEEb2JQyVHfGglbx6dCR6X+4ECGM9pbxQYrKSZtQ=", + "lastModified": 1764163563, + "narHash": "sha256-KigJ3h25yNJfeQunPm5QYFPtLSk6nU3IEEvZY8w01Vo=", "owner": "holochain", "repo": "scaffolding", - "rev": "751a16e98ddb35db5763cbf4b882a849b642e7e7", + "rev": "87e997a7361d4aa7c1bb96261483ebba50223bd0", "type": "github" }, "original": { "owner": "holochain", - "ref": "0.600.0-dev.0", + "ref": "v0.600.1", "repo": "scaffolding", "type": "github" } @@ -137,16 +120,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1762372467, - "narHash": "sha256-8LoKyzjkAoHOlJ0+8hUrwc0LTX7/2TdVODoLwMZMNVA=", + "lastModified": 1764549384, + "narHash": "sha256-OaVXXiTL9VTOX68+h52Ne1nyMBKYGGAvCv3EiFLZ/Bc=", "owner": "holochain", "repo": "holochain", - "rev": "90f56b5bf15b572cd9fdbd63d5a40a288143ff5f", + "rev": "36da4bf0975b5b266dee79022abe8c55f2b1cb04", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.6.0-rc.0", + "ref": "holochain-0.7.0-dev.1", "repo": "holochain", "type": "github" } @@ -212,7 +195,6 @@ "inputs": { "crane": "crane", "flake-parts": "flake-parts", - "hc-launch": "hc-launch", "hc-scaffold": "hc-scaffold", "holochain": "holochain", "kitsune2": "kitsune2", @@ -222,11 +204,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762474536, - "narHash": "sha256-Wj3vWvx6CEKbT+M00y5LXwCv+vEY0eK8gcNPNm4Yjw8=", + "lastModified": 1764653509, + "narHash": "sha256-DuGio3hX5SlT+eJa/43/pOlnsCrWTx4+KtnD77pLyJg=", "owner": "holochain", "repo": "holonix", - "rev": "b3319d607c19f0a2cd57887a1d4c6569bd1a0941", + "rev": "83ef6637289dd387e8694d6918da0a8e797e46ee", "type": "github" }, "original": { @@ -239,7 +221,7 @@ "inputs": { "crane": "crane_2", "flake-parts": "flake-parts_2", - "hc-launch": "hc-launch_2", + "hc-launch": "hc-launch", "hc-scaffold": "hc-scaffold_2", "holochain": "holochain_2", "kitsune2": "kitsune2_2", @@ -266,16 +248,16 @@ "kitsune2": { "flake": false, "locked": { - "lastModified": 1762303720, - "narHash": "sha256-tC2k+1kPxpVYRYJLWYXQPvFlUwgfF4cKoFKbkak0vxU=", + "lastModified": 1763403287, + "narHash": "sha256-dqQJMoDbcD0ekttrv5+8ph5Yf25EdXwKktsxNjV57Iw=", "owner": "holochain", "repo": "kitsune2", - "rev": "112099b30381ea0d23b8b3af21f5b5bb81ced6c5", + "rev": "22de6e42100aa960d05f5f30427a236ad922bd80", "type": "github" }, "original": { "owner": "holochain", - "ref": "v0.3.0", + "ref": "v0.3.2", "repo": "kitsune2", "type": "github" } @@ -333,11 +315,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762233356, - "narHash": "sha256-cGS3lLTYusbEP/IJIWGgnkzIl+FA5xDvtiHyjalGr4k=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ca534a76c4afb2bdc07b681dbc11b453bab21af8", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -449,11 +431,11 @@ ] }, "locked": { - "lastModified": 1762396738, - "narHash": "sha256-BarSecuxtzp1boERdABLkkoxQTi6s/V33lJwUbWLrLY=", + "lastModified": 1763692705, + "narHash": "sha256-tCKCyMYU0Vy+ph/xswlNsYXXjnFVweWBV+ew/5FS9tA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c63598992afd54d215d54f2b764adc0484c2b159", + "rev": "6fbf5d328dce1828d887b8ee7d44a785196a34e7", "type": "github" }, "original": { From 02d91037cb95dd4409222a405689f1c60a5eaa43 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Mon, 8 Dec 2025 16:24:32 +0330 Subject: [PATCH 02/23] Build: Bump crates/runtime versions. --- Cargo.lock | 6 +++--- crates/runtime-ffi/Cargo.toml | 2 +- crates/runtime-types-ffi/Cargo.toml | 2 +- crates/runtime/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index efc37f15..5110b495 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2783,7 +2783,7 @@ dependencies = [ [[package]] name = "holochain-conductor-runtime" -version = "0.2.3" +version = "0.2.4" dependencies = [ "holochain", "holochain_types", @@ -2803,7 +2803,7 @@ dependencies = [ [[package]] name = "holochain-conductor-runtime-ffi" -version = "0.2.3" +version = "0.2.4" dependencies = [ "android_logger 0.14.1", "hc_uniffi", @@ -2822,7 +2822,7 @@ dependencies = [ [[package]] name = "holochain-conductor-runtime-types-ffi" -version = "0.2.3" +version = "0.2.4" dependencies = [ "bytes", "hc_uniffi", diff --git a/crates/runtime-ffi/Cargo.toml b/crates/runtime-ffi/Cargo.toml index f111e7fd..12167402 100644 --- a/crates/runtime-ffi/Cargo.toml +++ b/crates/runtime-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain-conductor-runtime-ffi" -version = "0.2.3" +version = "0.2.4" edition = "2021" diff --git a/crates/runtime-types-ffi/Cargo.toml b/crates/runtime-types-ffi/Cargo.toml index 80d461ed..02451d13 100644 --- a/crates/runtime-types-ffi/Cargo.toml +++ b/crates/runtime-types-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain-conductor-runtime-types-ffi" -version = "0.2.3" +version = "0.2.4" edition = "2021" description = "Types used in holochain-conductor-runtime-ffi, used by both client and service." license = "MIT OR Apache-2.0" diff --git a/crates/runtime/Cargo.toml b/crates/runtime/Cargo.toml index 348d3e3a..24531c54 100644 --- a/crates/runtime/Cargo.toml +++ b/crates/runtime/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "holochain-conductor-runtime" -version = "0.2.3" +version = "0.2.4" edition = "2021" From cad32ecc65ee2f5a8e22ed4c6a5ba5bb6edc0c13 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Mon, 8 Dec 2025 16:39:11 +0330 Subject: [PATCH 03/23] Build: Bump crate version in tauri-plugin-client --- Cargo.lock | 2 +- crates/tauri-plugin-client/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5110b495..622bb6a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7764,7 +7764,7 @@ dependencies = [ [[package]] name = "tauri-plugin-holochain-service-client" -version = "0.2.3" +version = "0.2.4" dependencies = [ "bytes", "holochain-conductor-runtime-types-ffi", diff --git a/crates/tauri-plugin-client/Cargo.toml b/crates/tauri-plugin-client/Cargo.toml index 2e4715af..57828368 100644 --- a/crates/tauri-plugin-client/Cargo.toml +++ b/crates/tauri-plugin-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-holochain-service-client" -version = "0.2.3" +version = "0.2.4" exclude = ["/examples", "/webview-dist", "/webview-src", "/node_modules"] links = "tauri-plugin-holochain-service-client" description = "Tauri plugin enabling an Android app to run as a client of the tauri-plugin-holochain-service" From 22e822e2bb919a8c3c7406270502675b9564a193 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Mon, 8 Dec 2025 16:53:44 +0330 Subject: [PATCH 04/23] Build: Bump runtime-types-ffi in tuari-plugin-client. --- crates/tauri-plugin-client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/tauri-plugin-client/Cargo.toml b/crates/tauri-plugin-client/Cargo.toml index 57828368..63ff4932 100644 --- a/crates/tauri-plugin-client/Cargo.toml +++ b/crates/tauri-plugin-client/Cargo.toml @@ -11,7 +11,7 @@ edition.workspace = true license.workspace = true [dependencies] -holochain-conductor-runtime-types-ffi = { path = "../runtime-types-ffi", version = "0.2.3" } +holochain-conductor-runtime-types-ffi = { path = "../runtime-types-ffi", version = "0.2.4" } tauri = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } From d497f150a275a32cd1caaf4681b651a1a6794b69 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Mon, 8 Dec 2025 18:29:09 +0330 Subject: [PATCH 05/23] Build: add registry for holochain-conductor-runtime-types-ffi --- crates/tauri-plugin-client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/tauri-plugin-client/Cargo.toml b/crates/tauri-plugin-client/Cargo.toml index 63ff4932..f4e54928 100644 --- a/crates/tauri-plugin-client/Cargo.toml +++ b/crates/tauri-plugin-client/Cargo.toml @@ -11,7 +11,7 @@ edition.workspace = true license.workspace = true [dependencies] -holochain-conductor-runtime-types-ffi = { path = "../runtime-types-ffi", version = "0.2.4" } +holochain-conductor-runtime-types-ffi = { path = "../runtime-types-ffi", version = "0.2.4", registry = "cargo-hosted" } tauri = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } From 884654467e1b414e859ea6ab15df4352a08e9346 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Mon, 8 Dec 2025 18:42:06 +0330 Subject: [PATCH 06/23] Build: Bump crate version in tauri-plugin-service --- Cargo.lock | 2 +- crates/tauri-plugin-service/Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 622bb6a6..c53cf4e7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7753,7 +7753,7 @@ dependencies = [ [[package]] name = "tauri-plugin-holochain-service" -version = "0.2.3" +version = "0.2.4" dependencies = [ "holochain-conductor-runtime-types-ffi", "serde", diff --git a/crates/tauri-plugin-service/Cargo.toml b/crates/tauri-plugin-service/Cargo.toml index 227c4736..77d858a2 100644 --- a/crates/tauri-plugin-service/Cargo.toml +++ b/crates/tauri-plugin-service/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-holochain-service" -version = "0.2.3" +version = "0.2.4" exclude = ["/examples", "/webview-dist", "/webview-src", "/node_modules"] links = "tauri-plugin-holochain-service" description = "Tauri plugin enabling an Android app to run Holochain as a foreground service" @@ -14,7 +14,7 @@ edition.workspace = true tauri = { workspace = true } serde = { workspace = true } thiserror = { workspace = true } -holochain-conductor-runtime-types-ffi = { path = "../runtime-types-ffi", version = "0.2.3" } +holochain-conductor-runtime-types-ffi = { path = "../runtime-types-ffi", version = "0.2.4", registry = "cargo-hosted" } [build-dependencies] tauri-plugin = { workspace = true, features = ["build"] } From 35ff3f2be579b0cc457556da5de93b9e3808f88e Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Mon, 8 Dec 2025 19:07:41 +0330 Subject: [PATCH 07/23] Build: Bump the Maven client --- crates/tauri-plugin-client/android/build.gradle.kts | 2 +- libraries/client/README.md | 2 +- libraries/client/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/tauri-plugin-client/android/build.gradle.kts b/crates/tauri-plugin-client/android/build.gradle.kts index 5f6529ab..2a25b2b0 100644 --- a/crates/tauri-plugin-client/android/build.gradle.kts +++ b/crates/tauri-plugin-client/android/build.gradle.kts @@ -47,7 +47,7 @@ android { dependencies { // Subprojects implementation(project(":tauri-android")) - implementation("org.holochain.androidserviceruntime:client:0.0.20") + implementation("org.holochain.androidserviceruntime:client:0.0.21") // Kotlin implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.appcompat:appcompat:1.6.0") diff --git a/libraries/client/README.md b/libraries/client/README.md index 4901ae16..490a5b32 100644 --- a/libraries/client/README.md +++ b/libraries/client/README.md @@ -23,7 +23,7 @@ Add the library to your dependencies list in your project's `build.gradle.kts` ```kotlin dependencies { ... - implementation("org.holochain.androidserviceruntime:client:0.0.20") + implementation("org.holochain.androidserviceruntime:client:0.0.21") } ``` diff --git a/libraries/client/build.gradle.kts b/libraries/client/build.gradle.kts index 6c2d9dcc..2ac3c1e6 100644 --- a/libraries/client/build.gradle.kts +++ b/libraries/client/build.gradle.kts @@ -49,7 +49,7 @@ mavenPublishing { signAllPublications() } - coordinates("org.holochain.androidserviceruntime", "client", "0.0.20") + coordinates("org.holochain.androidserviceruntime", "client", "0.0.21") pom { name.set("Holochain Service Client") From c6e23b6f7bcd1d5099f527a132479d92d13e0abe Mon Sep 17 00:00:00 2001 From: Erfan Abdi Date: Mon, 8 Dec 2025 21:29:55 +0330 Subject: [PATCH 08/23] release-library-client: Fix client lib building --- .github/workflows/release-library-client.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/release-library-client.yml b/.github/workflows/release-library-client.yml index d1797f13..71ad493b 100644 --- a/.github/workflows/release-library-client.yml +++ b/.github/workflows/release-library-client.yml @@ -18,11 +18,17 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install packages + run: | + apt-get update + apt-get install -y sudo build-essential curl openjdk-11-jdk unzip git + - name: Install nix uses: cachix/install-nix-action@v31 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} nix_path: nixpkgs=channel:nixos-24.05 + enable_kvm: false - uses: cachix/cachix-action@v15 env: From be732f3133a6ae0657727f411f09148713440d08 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Tue, 9 Dec 2025 17:24:22 +0330 Subject: [PATCH 09/23] Build: Bump the Maven service --- libraries/service/README.md | 2 +- libraries/service/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/service/README.md b/libraries/service/README.md index 7473a91e..daf3ec0f 100644 --- a/libraries/service/README.md +++ b/libraries/service/README.md @@ -23,7 +23,7 @@ Add the library to your dependencies list in your project's `build.gradle.kts` ```kotlin dependencies { ... - implementation("org.holochain.androidserviceruntime:service:0.0.20") + implementation("org.holochain.androidserviceruntime:service:0.0.21") } ``` diff --git a/libraries/service/build.gradle.kts b/libraries/service/build.gradle.kts index fa201c63..2466e987 100644 --- a/libraries/service/build.gradle.kts +++ b/libraries/service/build.gradle.kts @@ -49,7 +49,7 @@ mavenPublishing { signAllPublications() } - coordinates("org.holochain.androidserviceruntime", "service", "0.0.20") + coordinates("org.holochain.androidserviceruntime", "service", "0.0.21") pom { name.set("Holochain Service") From 3d1e78e296e26dc0322a9142a405488fafef8a97 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Tue, 9 Dec 2025 17:55:50 +0330 Subject: [PATCH 10/23] Build: Solve the service/client gradle issue. --- libraries/client/build.gradle.kts | 8 +------- libraries/service/build.gradle.kts | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/libraries/client/build.gradle.kts b/libraries/client/build.gradle.kts index 2ac3c1e6..ab6419f6 100644 --- a/libraries/client/build.gradle.kts +++ b/libraries/client/build.gradle.kts @@ -43,13 +43,7 @@ android { } mavenPublishing { - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) - - if (!project.gradle.startParameter.taskNames.any { it.contains("publishToMavenLocal") }) { - signAllPublications() - } - - coordinates("org.holochain.androidserviceruntime", "client", "0.0.21") + coordinates("org.holochain.androidserviceruntime", "client", "0.0.19") pom { name.set("Holochain Service Client") diff --git a/libraries/service/build.gradle.kts b/libraries/service/build.gradle.kts index 2466e987..5d0aa926 100644 --- a/libraries/service/build.gradle.kts +++ b/libraries/service/build.gradle.kts @@ -43,13 +43,7 @@ android { } mavenPublishing { - publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL) - - if (!project.gradle.startParameter.taskNames.any { it.contains("publishToMavenLocal") }) { - signAllPublications() - } - - coordinates("org.holochain.androidserviceruntime", "service", "0.0.21") + coordinates("org.holochain.androidserviceruntime", "service", "0.0.19") pom { name.set("Holochain Service") From 9d0933405b47a2ec272afa02b70da23781034e73 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Tue, 9 Dec 2025 17:56:41 +0330 Subject: [PATCH 11/23] Build: Solve the CI issue for building the gradle/client --- .github/workflows/release-library-client.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-library-client.yml b/.github/workflows/release-library-client.yml index 71ad493b..1ef5dbc3 100644 --- a/.github/workflows/release-library-client.yml +++ b/.github/workflows/release-library-client.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v3 - name: Install packages run: | @@ -24,7 +24,7 @@ jobs: apt-get install -y sudo build-essential curl openjdk-11-jdk unzip git - name: Install nix - uses: cachix/install-nix-action@v31 + uses: cachix/install-nix-action@v27 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} nix_path: nixpkgs=channel:nixos-24.05 From 2ce0f1afe96d232946b018fc8b282a6f553d55a0 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Tue, 9 Dec 2025 17:58:01 +0330 Subject: [PATCH 12/23] Build: Bump the gradle/client to 21 --- libraries/client/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/client/build.gradle.kts b/libraries/client/build.gradle.kts index ab6419f6..74ab0f33 100644 --- a/libraries/client/build.gradle.kts +++ b/libraries/client/build.gradle.kts @@ -43,7 +43,7 @@ android { } mavenPublishing { - coordinates("org.holochain.androidserviceruntime", "client", "0.0.19") + coordinates("org.holochain.androidserviceruntime", "client", "0.0.21") pom { name.set("Holochain Service Client") From 378360fd55ba6e1323480f31f3425518e91c6543 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Tue, 9 Dec 2025 18:21:48 +0330 Subject: [PATCH 13/23] Build: Bump the gradle/service to 21 --- libraries/service/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/service/build.gradle.kts b/libraries/service/build.gradle.kts index 5d0aa926..8bf28831 100644 --- a/libraries/service/build.gradle.kts +++ b/libraries/service/build.gradle.kts @@ -43,7 +43,7 @@ android { } mavenPublishing { - coordinates("org.holochain.androidserviceruntime", "service", "0.0.19") + coordinates("org.holochain.androidserviceruntime", "service", "0.0.21") pom { name.set("Holochain Service") From 4ec3694ef0e7f3b80132177861f1da68689dc41a Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Wed, 10 Dec 2025 17:14:41 +0330 Subject: [PATCH 14/23] Build: Update nix env to hc 0.6.0 --- flake.lock | 39 ++++++++++++++++++++------------------- flake.nix | 2 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/flake.lock b/flake.lock index d31a6896..b164237e 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1763511871, - "narHash": "sha256-KKZWi+ij7oT0Ag8yC6MQkzfHGcytyjMJDD+47ZV1YNU=", + "lastModified": 1763938834, + "narHash": "sha256-j8iB0Yr4zAvQLueCZ5abxfk6fnG/SJ5JnGUziETjwfg=", "owner": "ipetkov", "repo": "crane", - "rev": "099f9014bc8d0cd6e445470ea1df0fd691d5a548", + "rev": "d9e753122e51cee64eb8d2dddfe11148f339f5a2", "type": "github" }, "original": { @@ -35,11 +35,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -120,16 +120,16 @@ "holochain": { "flake": false, "locked": { - "lastModified": 1764549384, - "narHash": "sha256-OaVXXiTL9VTOX68+h52Ne1nyMBKYGGAvCv3EiFLZ/Bc=", + "lastModified": 1763554421, + "narHash": "sha256-uCVTHeoJpDcc3Ky6gXt1oZX7XxVL3CmY9pFVQ5AEXtM=", "owner": "holochain", "repo": "holochain", - "rev": "36da4bf0975b5b266dee79022abe8c55f2b1cb04", + "rev": "a6d4e805a0971ccbc0dcb3f3ed6a9e2fac980a3b", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.7.0-dev.1", + "ref": "holochain-0.6.0", "repo": "holochain", "type": "github" } @@ -204,15 +204,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1764653509, - "narHash": "sha256-DuGio3hX5SlT+eJa/43/pOlnsCrWTx4+KtnD77pLyJg=", + "lastModified": 1764604731, + "narHash": "sha256-IW9tFLUMqoaIAfAU9eH7wL7ws93nf+gEhl2v9Aipzak=", "owner": "holochain", "repo": "holonix", - "rev": "83ef6637289dd387e8694d6918da0a8e797e46ee", + "rev": "2fec8bf3772bf0df6f37734da3e063b9aa285aca", "type": "github" }, "original": { "owner": "holochain", + "ref": "main-0.6", "repo": "holonix", "type": "github" } @@ -315,11 +316,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763622513, - "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", + "lastModified": 1763948260, + "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", + "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", "type": "github" }, "original": { @@ -431,11 +432,11 @@ ] }, "locked": { - "lastModified": 1763692705, - "narHash": "sha256-tCKCyMYU0Vy+ph/xswlNsYXXjnFVweWBV+ew/5FS9tA=", + "lastModified": 1764297505, + "narHash": "sha256-qrLpVu2/hA9Cu6IovMEsgh9YRyvmmWS+bSx7C1JGChA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6fbf5d328dce1828d887b8ee7d44a785196a34e7", + "rev": "9623580f8ce09ec444b9aca107566ec5db110e62", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 16382754..35cd4340 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Template for Holochain app development"; inputs = { - holonix.url = "github:holochain/holonix"; + holonix.url = "github:holochain/holonix/main-0.6"; nixpkgs.follows = "holonix/nixpkgs"; flake-parts.follows = "holonix/flake-parts"; From ba994a6ecf0be3df2a8937ca8bad38a07bec2978 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Wed, 10 Dec 2025 17:16:07 +0330 Subject: [PATCH 15/23] Fix: Add icon for system-setting build. --- apps/android-service-runtime/src-tauri/build.rs | 3 ++- .../src/main/res/mipmap-hdpi/ic_setting_dark.png | Bin 0 -> 959 bytes .../src/main/res/mipmap-mdpi/ic_setting_dark.png | Bin 0 -> 959 bytes .../src/main/res/mipmap-xhdpi/ic_setting_dark.png | Bin 0 -> 959 bytes .../main/res/mipmap-xxhdpi/ic_setting_dark.png | Bin 0 -> 959 bytes .../main/res/mipmap-xxxhdpi/ic_setting_dark.png | Bin 0 -> 959 bytes 6 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_setting_dark.png create mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_setting_dark.png create mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_setting_dark.png create mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_setting_dark.png create mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_setting_dark.png diff --git a/apps/android-service-runtime/src-tauri/build.rs b/apps/android-service-runtime/src-tauri/build.rs index 332042ba..d4b1b221 100644 --- a/apps/android-service-runtime/src-tauri/build.rs +++ b/apps/android-service-runtime/src-tauri/build.rs @@ -10,7 +10,8 @@ r#" + android:exported="true" + android:icon="@mipmap/ic_setting_dark"> diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_setting_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb GIT binary patch literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ literal 0 HcmV?d00001 diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_setting_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb GIT binary patch literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ literal 0 HcmV?d00001 diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_setting_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb GIT binary patch literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ literal 0 HcmV?d00001 diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_setting_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb GIT binary patch literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ literal 0 HcmV?d00001 diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_setting_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb GIT binary patch literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ literal 0 HcmV?d00001 From ee5c373d2498c41879bb811c92be7a6f7373fdb0 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Wed, 10 Dec 2025 17:17:26 +0330 Subject: [PATCH 16/23] Build: Add the volla nexus repository for gradle build. --- crates/tauri-plugin-client/android/settings.gradle | 6 ++++++ crates/tauri-plugin-service/android/build.gradle.kts | 4 ++-- crates/tauri-plugin-service/android/settings.gradle | 8 +++++++- libraries/service/build.gradle.kts | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/crates/tauri-plugin-client/android/settings.gradle b/crates/tauri-plugin-client/android/settings.gradle index 4ff2f337..fab6731e 100644 --- a/crates/tauri-plugin-client/android/settings.gradle +++ b/crates/tauri-plugin-client/android/settings.gradle @@ -1,6 +1,9 @@ pluginManagement { repositories { mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } @@ -25,6 +28,9 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } diff --git a/crates/tauri-plugin-service/android/build.gradle.kts b/crates/tauri-plugin-service/android/build.gradle.kts index 0455321d..c1786ea2 100644 --- a/crates/tauri-plugin-service/android/build.gradle.kts +++ b/crates/tauri-plugin-service/android/build.gradle.kts @@ -59,8 +59,8 @@ java { dependencies { // Subprojects implementation(project(":tauri-android")) - implementation("org.holochain.androidserviceruntime:service:0.0.20") - implementation("org.holochain.androidserviceruntime:client:0.0.20") + implementation("org.holochain.androidserviceruntime:service:0.0.21") + implementation("org.holochain.androidserviceruntime:client:0.0.21") // Kotlin implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.appcompat:appcompat:1.6.0") diff --git a/crates/tauri-plugin-service/android/settings.gradle b/crates/tauri-plugin-service/android/settings.gradle index 4ff2f337..51a7aced 100644 --- a/crates/tauri-plugin-service/android/settings.gradle +++ b/crates/tauri-plugin-service/android/settings.gradle @@ -1,6 +1,9 @@ pluginManagement { repositories { - mavenLocal() + mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } @@ -25,6 +28,9 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } diff --git a/libraries/service/build.gradle.kts b/libraries/service/build.gradle.kts index 8bf28831..a36190ec 100644 --- a/libraries/service/build.gradle.kts +++ b/libraries/service/build.gradle.kts @@ -98,7 +98,7 @@ configure { dependencies { // Subprojects - implementation("org.holochain.androidserviceruntime:client:0.0.19") + implementation("org.holochain.androidserviceruntime:client:0.0.21") // Kotlin implementation("androidx.core:core-ktx:1.7.0") implementation("androidx.appcompat:appcompat:1.6.0") From 788ca03a4f0b31a0ad089bc50b0a8cc8ea1bf0e2 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Wed, 10 Dec 2025 17:18:37 +0330 Subject: [PATCH 17/23] Build: Upgrade to hc 0.6.0 --- Cargo.toml | 2 +- apps/example-client-app/Cargo.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a55f4052..de646b20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ holochain_types = "0.6.0" holochain_serialized_bytes = "0.0.56" sodoken = "0.1.0" url2 = "0.0.6" -lair_keystore_api = "0.6.2" +lair_keystore_api = "0.6.3" rustls = "0.23.25" tauri = "2.5.1" diff --git a/apps/example-client-app/Cargo.toml b/apps/example-client-app/Cargo.toml index 095907fd..184ef509 100644 --- a/apps/example-client-app/Cargo.toml +++ b/apps/example-client-app/Cargo.toml @@ -9,8 +9,8 @@ members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*", "src-tauri" resolver = "2" [workspace.dependencies] -hdi = "0.7.0-rc.0" -hdk = "0.6.0-rc.0" +hdi = "0.6.6" +hdk = "0.6.0" serde = "1.0" holochain_serialized_bytes = "0.0.56" From ccdc4b9842d188f165b71ba4b7a7eae57884c1c1 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Wed, 10 Dec 2025 17:31:23 +0330 Subject: [PATCH 18/23] Chore: Release the volla cloud service v0.2.0 --- CHANGELOG.md | 5 +++++ Cargo.lock | 2 +- apps/android-service-runtime/package.json | 2 +- apps/android-service-runtime/src-tauri/Cargo.toml | 2 +- apps/android-service-runtime/src-tauri/tauri.conf.json | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d1ccc9e9..0c511896 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ - The 'Open Settings' button will first attempt to open the android-service-runtime app via the system settings (i.e. for 'system' builds). If that fails it will fallback to opening the app via the launcher (i.e. for 'user' builds). +# 0.2.4 +- bump to holochain 0.6.0 +- fix system-settings app icon +- make the repository self-hosted + # 0.2.3 - integrate with Volla-Messages - bump to holochain 0.6.0-rc.0 diff --git a/Cargo.lock b/Cargo.lock index c53cf4e7..a70404ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,7 +90,7 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" [[package]] name = "android-service-runtime" -version = "0.1.6" +version = "0.2.0" dependencies = [ "log", "simple_logger", diff --git a/apps/android-service-runtime/package.json b/apps/android-service-runtime/package.json index c3f89073..74b28488 100644 --- a/apps/android-service-runtime/package.json +++ b/apps/android-service-runtime/package.json @@ -1,7 +1,7 @@ { "name": "android-service-runtime", "private": true, - "version": "0.1.6", + "version": "0.2.0", "type": "module", "scripts": { "dev": "vite", diff --git a/apps/android-service-runtime/src-tauri/Cargo.toml b/apps/android-service-runtime/src-tauri/Cargo.toml index f3d43d48..691dd0fb 100644 --- a/apps/android-service-runtime/src-tauri/Cargo.toml +++ b/apps/android-service-runtime/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "android-service-runtime" -version = "0.1.6" +version = "0.2.0" description = "Volla Holochain Admin" authors = ["you"] license = "" diff --git a/apps/android-service-runtime/src-tauri/tauri.conf.json b/apps/android-service-runtime/src-tauri/tauri.conf.json index 0d1d8097..7cbcdc46 100644 --- a/apps/android-service-runtime/src-tauri/tauri.conf.json +++ b/apps/android-service-runtime/src-tauri/tauri.conf.json @@ -1,6 +1,6 @@ { "productName": "Holochain Service Runtime", - "version": "0.1.6", + "version": "0.2.0", "identifier": "org.holochain.androidserviceruntime.app", "build": { "beforeDevCommand": "pnpm dev", From 30bb37e5be5eec039ddc28a3c48f8c6b9c7d63a4 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Wed, 10 Dec 2025 19:12:23 +0330 Subject: [PATCH 19/23] Build: Upgrade hdk version to 0.7.0 --- apps/example-client-app/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/example-client-app/Cargo.toml b/apps/example-client-app/Cargo.toml index 184ef509..4876cf3c 100644 --- a/apps/example-client-app/Cargo.toml +++ b/apps/example-client-app/Cargo.toml @@ -10,7 +10,7 @@ resolver = "2" [workspace.dependencies] hdi = "0.6.6" -hdk = "0.6.0" +hdk = "0.7.0" serde = "1.0" holochain_serialized_bytes = "0.0.56" From 5323e73a3c3c4b5835802fa667a0478ef9174640 Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Sat, 13 Dec 2025 13:24:16 +0330 Subject: [PATCH 20/23] Build: Add the volla nexus repository. --- .../src-tauri/gen/android/build.gradle.kts | 6 ++++++ .../src-tauri/gen/android/build.gradle.kts | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/apps/android-service-runtime/src-tauri/gen/android/build.gradle.kts b/apps/android-service-runtime/src-tauri/gen/android/build.gradle.kts index 3287cb5b..fbf2f3be 100644 --- a/apps/android-service-runtime/src-tauri/gen/android/build.gradle.kts +++ b/apps/android-service-runtime/src-tauri/gen/android/build.gradle.kts @@ -1,6 +1,9 @@ buildscript { repositories { mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } @@ -15,6 +18,9 @@ buildscript { allprojects { repositories { mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } diff --git a/apps/example-client-app/src-tauri/gen/android/build.gradle.kts b/apps/example-client-app/src-tauri/gen/android/build.gradle.kts index 3287cb5b..5ce485c5 100644 --- a/apps/example-client-app/src-tauri/gen/android/build.gradle.kts +++ b/apps/example-client-app/src-tauri/gen/android/build.gradle.kts @@ -1,6 +1,9 @@ buildscript { repositories { mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } @@ -15,6 +18,9 @@ buildscript { allprojects { repositories { mavenLocal() + maven { + url = uri("https://nexus.volla.tech/repository/maven-releases/") + } maven { url = uri("https://repo1.maven.org/maven2") } From 14b5d6bab10cfc1a388039b06b40ee528aaf78bd Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Sat, 13 Dec 2025 14:17:28 +0330 Subject: [PATCH 21/23] Build: Modify the hdi & hdk version to be compatible with hc-0.6.0 --- apps/example-client-app/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/example-client-app/Cargo.toml b/apps/example-client-app/Cargo.toml index 4876cf3c..df083162 100644 --- a/apps/example-client-app/Cargo.toml +++ b/apps/example-client-app/Cargo.toml @@ -9,8 +9,8 @@ members = ["dnas/*/zomes/coordinator/*", "dnas/*/zomes/integrity/*", "src-tauri" resolver = "2" [workspace.dependencies] -hdi = "0.6.6" -hdk = "0.7.0" +hdi = "0.7.0" +hdk = "0.6.0" serde = "1.0" holochain_serialized_bytes = "0.0.56" From 958ac2e1ebfd6ed1d21f0941382f2b69c36163fd Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Sat, 13 Dec 2025 16:19:11 +0330 Subject: [PATCH 22/23] Build: Update flake.lock file. --- flake.lock | 56 ++++++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 37 deletions(-) diff --git a/flake.lock b/flake.lock index b164237e..73afdf39 100644 --- a/flake.lock +++ b/flake.lock @@ -66,23 +66,6 @@ "type": "github" } }, - "hc-launch": { - "flake": false, - "locked": { - "lastModified": 1752056054, - "narHash": "sha256-iLHhGQXrSfgAibzLSx+mdOQnnTzq4mrRXto7+a+MDLM=", - "owner": "holochain", - "repo": "hc-launch", - "rev": "612aa244ceb4d2136e5adbf181ff0cc123daff65", - "type": "github" - }, - "original": { - "owner": "holochain", - "ref": "holochain-weekly", - "repo": "hc-launch", - "type": "github" - } - }, "hc-scaffold": { "flake": false, "locked": { @@ -103,16 +86,16 @@ "hc-scaffold_2": { "flake": false, "locked": { - "lastModified": 1743001074, - "narHash": "sha256-FtFGAFY+d6eEP85PkkyhwD2G9fXx4jrQiNjik3Hyqmk=", + "lastModified": 1764163563, + "narHash": "sha256-KigJ3h25yNJfeQunPm5QYFPtLSk6nU3IEEvZY8w01Vo=", "owner": "holochain", "repo": "scaffolding", - "rev": "2ad60188fe6a2bba7b68b414f0d6528967d48400", + "rev": "87e997a7361d4aa7c1bb96261483ebba50223bd0", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-weekly", + "ref": "v0.600.1", "repo": "scaffolding", "type": "github" } @@ -177,16 +160,16 @@ "holochain_2": { "flake": false, "locked": { - "lastModified": 1759884228, - "narHash": "sha256-T78qKjwfqb7g7if23N5suotGqnPPxMGsH72pzc/KHM8=", + "lastModified": 1763554421, + "narHash": "sha256-uCVTHeoJpDcc3Ky6gXt1oZX7XxVL3CmY9pFVQ5AEXtM=", "owner": "holochain", "repo": "holochain", - "rev": "799be91c8122c3767d55b8c2f0abf13129a6212b", + "rev": "a6d4e805a0971ccbc0dcb3f3ed6a9e2fac980a3b", "type": "github" }, "original": { "owner": "holochain", - "ref": "holochain-0.6.0-dev.28", + "ref": "holochain-0.6.0", "repo": "holochain", "type": "github" } @@ -222,7 +205,6 @@ "inputs": { "crane": "crane_2", "flake-parts": "flake-parts_2", - "hc-launch": "hc-launch", "hc-scaffold": "hc-scaffold_2", "holochain": "holochain_2", "kitsune2": "kitsune2_2", @@ -232,16 +214,16 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1759961726, - "narHash": "sha256-1TYjgyp8kbn9bwj8LbQLGhtR+XedJRNuAE7GsRDQn1s=", + "lastModified": 1764604731, + "narHash": "sha256-IW9tFLUMqoaIAfAU9eH7wL7ws93nf+gEhl2v9Aipzak=", "owner": "holochain", "repo": "holonix", - "rev": "81345a6c742a646fb160a2341ced4eb0a9ca9f84", + "rev": "2fec8bf3772bf0df6f37734da3e063b9aa285aca", "type": "github" }, "original": { "owner": "holochain", - "ref": "main", + "ref": "main-0.6", "repo": "holonix", "type": "github" } @@ -266,16 +248,16 @@ "kitsune2_2": { "flake": false, "locked": { - "lastModified": 1751453889, - "narHash": "sha256-U0iB9rhYWLoie9i/L3vASZyUHUQNukyPlvkIe79prTU=", + "lastModified": 1763403287, + "narHash": "sha256-dqQJMoDbcD0ekttrv5+8ph5Yf25EdXwKktsxNjV57Iw=", "owner": "holochain", "repo": "kitsune2", - "rev": "d260ba4b3c9be0481d754876c501d08e76a3a45b", + "rev": "22de6e42100aa960d05f5f30427a236ad922bd80", "type": "github" }, "original": { "owner": "holochain", - "ref": "v0.2.11", + "ref": "v0.3.2", "repo": "kitsune2", "type": "github" } @@ -534,11 +516,11 @@ "webkitnixpkgs": "webkitnixpkgs" }, "locked": { - "lastModified": 1760380471, - "narHash": "sha256-HMPfs8Uoiv9vHD8OI0TbUOer2qm7Po7NJbuJq66P4ug=", + "lastModified": 1765397287, + "narHash": "sha256-gPkHHmA84XdRI/1g64fL9XeUWvYOFJChdqRXEsiNpnk=", "owner": "darksoil-studio", "repo": "tauri-plugin-holochain", - "rev": "d10b06841dfbce4727c84db36240a5d72c463289", + "rev": "cc1502d4562ff5b84f04413fc69fce1a43b9960b", "type": "github" }, "original": { From bf2b7517ced72fd174aa8ef56cacc878fae53fcd Mon Sep 17 00:00:00 2001 From: Amirhesp Date: Sat, 13 Dec 2025 19:13:31 +0330 Subject: [PATCH 23/23] Fix: Add the icon for system variant. --- apps/android-service-runtime/src-tauri/build.rs | 6 ++++-- .../app/src/main/res/drawable/ic_settings.xml | 13 +++++++++++++ .../src/main/res/mipmap-hdpi/ic_setting_dark.png | Bin 959 -> 0 bytes .../src/main/res/mipmap-mdpi/ic_setting_dark.png | Bin 959 -> 0 bytes .../src/main/res/mipmap-xhdpi/ic_setting_dark.png | Bin 959 -> 0 bytes .../main/res/mipmap-xxhdpi/ic_setting_dark.png | Bin 959 -> 0 bytes .../main/res/mipmap-xxxhdpi/ic_setting_dark.png | Bin 959 -> 0 bytes 7 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/drawable/ic_settings.xml delete mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_setting_dark.png delete mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_setting_dark.png delete mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_setting_dark.png delete mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_setting_dark.png delete mode 100644 apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_setting_dark.png diff --git a/apps/android-service-runtime/src-tauri/build.rs b/apps/android-service-runtime/src-tauri/build.rs index d4b1b221..8b47f51b 100644 --- a/apps/android-service-runtime/src-tauri/build.rs +++ b/apps/android-service-runtime/src-tauri/build.rs @@ -10,11 +10,13 @@ r#" + android:exported="true"> + + + + diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-hdpi/ic_setting_dark.png deleted file mode 100644 index a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-mdpi/ic_setting_dark.png deleted file mode 100644 index a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xhdpi/ic_setting_dark.png deleted file mode 100644 index a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxhdpi/ic_setting_dark.png deleted file mode 100644 index a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$ diff --git a/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_setting_dark.png b/apps/android-service-runtime/src-tauri/gen/android/app/src/main/res/mipmap-xxxhdpi/ic_setting_dark.png deleted file mode 100644 index a8b771c3c8c9aa0f5dc31c8f5d7a4f86ca5230bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 959 zcmV;w13>(VP)Px&c}YY;RA@u(nT@ebK@f%eWk3dGKm>>Y5g-CYfCvx)BH%@U2oM1okOBKu&AggD zw|oBXwQslTb=B5Z?VX=<`gHg7ojtP?x3d$+Z&w5^Tfr?AxNBy&%$@ zD}8>L*_ZTL&3`Qc06yITd{%(%1qC69yh_A+=k1M~B>?aj3Ha2;GU@#+kr@Jb{N;ql zTSQR=H6YV%qXb@8yiS~dGPAE{_C19KzhNkLBjpCUa=+q$H)i&{mq9N90DRoVESsz0 zxwpx48F0`3k5d>zObrLzOUYkdtCzsH^(zoAcqqJOz-6MlBn?2@2HAE4Q`rU58Xs{ZX;dqNI8RsKsR%MBzhx66=iB zc7T{?Gl238r<6dz)Kk&aG3Oeh9sz9|Zl@$HJqj2~TPbfDa?H_k>xCFZb06g?#-RqD zY>Q&z5%?{@w0z-lREjJLxv1x1ohUDG5O_-G>?N{C;IAOlF(!0Q8jD3{=%s@{207D=3>1XeL#oT9uDcgma@Tz2pO-mTmJ8QUbhz(V5PguBZ8< zNlemHATDf+5URGj6=rys3R7zrnu?DS08cB4XVqYy=79EOi+*T^fS1T?K>iNENWeR>!;bja2n=5&920@)TBX{m91DTyVoO_#MP3~Pf#|k-(KdKh;j#$OMo{Mg z?_KWFTGL}SFN+UFpuAq^FDPD$ytg@=+zgx1W^PSAADKIK+wCdPdp$A&t~C~~)1EX# zMi=r3{I6zB_XaG$y*8pnxcWZ8Lt>P>A-(GEURVYKHeWI3zo7OmsAd;#{Xa0f?!o3= h5jdEugN;sJfqwxR)-lr7XGZ`4002ovPDHLkV1fqOvN!+$