From 1599bfc2c5902eaa4a3b81d24101430ca632b497 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Sun, 2 Nov 2025 01:52:58 -0800 Subject: [PATCH] Update dependencies --- .../topjohnwu/magisk/core/data/SuLogDao.kt | 2 +- .../magisk/core/di/ServiceLocator.kt | 2 +- .../topjohnwu/magisk/core/model/UpdateInfo.kt | 6 +- app/gradle/libs.versions.toml | 8 +-- native/src/Cargo.lock | 68 +++++++++---------- native/src/Cargo.toml | 16 ++--- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/data/SuLogDao.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/data/SuLogDao.kt index da99afbf0..4f05f10ff 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/core/data/SuLogDao.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/core/data/SuLogDao.kt @@ -19,7 +19,7 @@ abstract class SuLogDatabase : RoomDatabase() { companion object { val MIGRATION_1_2 = object : Migration(1, 2) { - override fun migrate(database: SupportSQLiteDatabase) = with(database) { + override fun migrate(db: SupportSQLiteDatabase) = with(db) { execSQL("ALTER TABLE logs ADD COLUMN target INTEGER NOT NULL DEFAULT -1") execSQL("ALTER TABLE logs ADD COLUMN context TEXT NOT NULL DEFAULT ''") execSQL("ALTER TABLE logs ADD COLUMN gids TEXT NOT NULL DEFAULT ''") diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt index 1429325cb..89913ae3e 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/core/di/ServiceLocator.kt @@ -44,7 +44,7 @@ object ServiceLocator { private fun createSuLogDatabase(context: Context) = Room.databaseBuilder(context, SuLogDatabase::class.java, "sulogs.db") .addMigrations(SuLogDatabase.MIGRATION_1_2) - .fallbackToDestructiveMigration() + .fallbackToDestructiveMigration(true) .build() private fun createMarkwon(context: Context) = diff --git a/app/core/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt b/app/core/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt index 68b3632cb..f819466ee 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/core/model/UpdateInfo.kt @@ -34,7 +34,7 @@ data class ModuleJson( @JsonClass(generateAdapter = true) data class ReleaseAssets( val name: String, - @Json(name = "browser_download_url") val url: String, + @param:Json(name = "browser_download_url") val url: String, ) class DateTimeAdapter { @@ -51,12 +51,12 @@ class DateTimeAdapter { @JsonClass(generateAdapter = true) data class Release( - @Json(name = "tag_name") val tag: String, + @param:Json(name = "tag_name") val tag: String, val name: String, val prerelease: Boolean, val assets: List, val body: String, - @Json(name = "created_at") val createdTime: Instant, + @param:Json(name = "created_at") val createdTime: Instant, ) { val versionCode: Int get() { return if (tag[0] == 'v') { diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml index 1db732e59..6e064bd24 100644 --- a/app/gradle/libs.versions.toml +++ b/app/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -kotlin = "2.2.20" +kotlin = "2.2.21" android = "8.13.0" -ksp = "2.2.20-2.0.2" +ksp = "2.3.0" rikka = "1.3.0" navigation = "2.9.5" libsu = "6.0.0" -okhttp = "5.2.1" +okhttp = "5.3.0" retrofit = "3.0.0" -room = "2.8.2" +room = "2.8.3" [libraries] bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version = "1.82" } diff --git a/native/src/Cargo.lock b/native/src/Cargo.lock index 5fbd8c046..b55a51b02 100644 --- a/native/src/Cargo.lock +++ b/native/src/Cargo.lock @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.41" +version = "1.2.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7" +checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3" dependencies = [ "find-msvc-tools", "shlex", @@ -154,18 +154,18 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "clap" -version = "4.5.49" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4512b90fa68d3a9932cea5184017c5d200f5921df706d45e853537dea51508f" +checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.49" +version = "4.5.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0025e98baa12e766c67ba13ff4695a887a1eba19569aad00a472546795bd6730" +checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" dependencies = [ "anstyle", "clap_lex", @@ -398,9 +398,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.17.0-rc.7" +version = "0.17.0-rc.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ab355ec063f7a110eb627471058093aba00eb7f4e70afbd15e696b79d1077b" +checksum = "b56e025680b64794fad81dd46019037773eeb5268a990c5d4cca05bf351c7f0f" dependencies = [ "der", "digest 0.11.0-rc.3", @@ -413,9 +413,9 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.14.0-rc.15" +version = "0.14.0-rc.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3be87c458d756141f3b6ee188828132743bf90c7d14843e2835d6443e5fb03" +checksum = "e8cbb5fbebc360d8631bb2e0c0e2617e9141e32825c54547b982509c6ad8de87" dependencies = [ "base16ct", "crypto-bigint", @@ -474,9 +474,9 @@ checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe" [[package]] name = "flate2" -version = "1.1.4" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc5a4e564e38c699f2880d3fda590bedc2e69f3f84cd48b457bd892ce61d0aa9" +checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb" dependencies = [ "crc32fast", "libz-rs-sys", @@ -609,9 +609,9 @@ dependencies = [ [[package]] name = "lzma-rust2" -version = "0.14.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5999f9ccfee85f09b54a2205c5851f884c83e4e7ef056843ff68d7f2006cd82" +checksum = "2bd57dc1513725e598b9609a9505d6fe28ee280861e5b4d792b3db9d00b1a315" dependencies = [ "crc", "sha2 0.10.9", @@ -757,9 +757,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "p256" -version = "0.14.0-pre.11" +version = "0.14.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b374901df34ee468167a58e2a49e468cb059868479cafebeb804f6b855423d" +checksum = "4a35f78d0f5ae56f424c09bcb08444b56569e351084421b0def687800c17560c" dependencies = [ "ecdsa", "elliptic-curve", @@ -770,9 +770,9 @@ dependencies = [ [[package]] name = "p384" -version = "0.14.0-pre.11" +version = "0.14.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "701032b3730df6b882496d6cee8221de0ce4bc11ddc64e6d89784aa5b8a6de30" +checksum = "83ae3cc685c1f06b8df2cabb5101eef0116c4a36a413ee7d3403cfc0f0fc7323" dependencies = [ "ecdsa", "elliptic-curve", @@ -784,9 +784,9 @@ dependencies = [ [[package]] name = "p521" -version = "0.14.0-pre.11" +version = "0.14.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ba29c2906eb5c89a8c411c4f11243ee4e5517ee7d71d9a13fedc877a6057b1" +checksum = "70c973d55b113ae8afe9565bcdecd6ba2484baa7eadca3e64874bfa908dc8d8b" dependencies = [ "base16ct", "ecdsa", @@ -837,9 +837,9 @@ dependencies = [ [[package]] name = "primefield" -version = "0.14.0-pre.6" +version = "0.14.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7fcd4a163053332fd93f39b81c133e96a98567660981654579c90a99062fbf5" +checksum = "d1a69250bb6fddbe7936a87b22a1c62174b980acbf9f5ad8ef937e4f1e74349f" dependencies = [ "crypto-bigint", "ff", @@ -850,18 +850,18 @@ dependencies = [ [[package]] name = "primeorder" -version = "0.14.0-pre.9" +version = "0.14.0-rc.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c36e8766fcd270fa9c665b9dc364f570695f5a59240949441b077a397f15b74" +checksum = "36714e8f5443e0cc1497f71972788dd95f75bf7253a4393c9f33f3ff9f556cc9" dependencies = [ "elliptic-curve", ] [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] @@ -900,9 +900,9 @@ dependencies = [ [[package]] name = "rfc6979" -version = "0.5.0-rc.1" +version = "0.5.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d369f9c4f79388704648e7bcb92749c0d6cf4397039293a9b747694fa4fb4bae" +checksum = "2a165e1723c68a5c6c3746322ba13f0e167206be428305bc9c76e204eacc639c" dependencies = [ "hmac", "subtle", @@ -1072,9 +1072,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.107" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -1139,9 +1139,9 @@ checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "unicode-ident" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "unicode-width" @@ -1240,9 +1240,9 @@ checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2" [[package]] name = "zopfli" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7" +checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249" dependencies = [ "bumpalo", "crc32fast", diff --git a/native/src/Cargo.toml b/native/src/Cargo.toml index 071de1e00..bfc78bce2 100644 --- a/native/src/Cargo.toml +++ b/native/src/Cargo.toml @@ -24,16 +24,16 @@ bytemuck = "1.24.0" fdt = "0.1.5" const_format = "0.2.35" bit-set = "0.8.0" -syn = "2.0.107" +syn = "2.0.108" quote = "1.0.41" -proc-macro2 = "1.0.101" +proc-macro2 = "1.0.103" pb-rs = { version = "0.10.0", default-features = false } quick-protobuf = "0.8.1" -flate2 = { version = "1.1.4", default-features = false } +flate2 = { version = "1.1.5", default-features = false } bzip2 = "0.6.1" -zopfli = "0.8.2" +zopfli = "0.8.3" lz4 = "1.28.1" -lzma-rust2 = { version = "0.14.3", default-features = false } +lzma-rust2 = { version = "0.15.1", default-features = false } nix = "0.30.1" bitflags = "2.10.0" @@ -41,9 +41,9 @@ bitflags = "2.10.0" sha1 = "0.11.0-rc.2" sha2 = "0.11.0-rc.2" digest = "0.11.0-rc.3" -p256 = "0.14.0-pre.11" -p384 = "0.14.0-pre.11" -p521 = "0.14.0-pre.11" +p256 = "0.14.0-rc.0" +p384 = "0.14.0-rc.0" +p521 = "0.14.0-rc.0" rsa = "0.10.0-rc.9" x509-cert = "0.3.0-rc.2" der = "0.8.0-rc.9"