From 6112dd3381434f74a75db580c8b13797a9e53fc5 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 09:33:55 +0300 Subject: [PATCH] up: bump SpacemandDMM and other rust deps --- .github/workflows/ci.yml | 6 +++--- go.mod | 10 +++++----- go.sum | 16 ++++++++-------- internal/rsc/txt/about.txt | 2 +- third_party/sdmmparser/src/Cargo.lock | 26 +++++++++++++------------- third_party/sdmmparser/src/Cargo.toml | 12 ++++++------ third_party/sdmmparser/src/lib.rs | 2 +- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f38ed9d5..d5ab93ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,11 +26,11 @@ jobs: os: [ ubuntu-22.04, windows-2019, macos-11 ] include: - os: ubuntu-22.04 - rust-target: 1.69-x86_64-unknown-linux-gnu + rust-target: 1.79-x86_64-unknown-linux-gnu - os: windows-2019 - rust-target: 1.69-x86_64-pc-windows-gnu + rust-target: 1.79-x86_64-pc-windows-gnu - os: macos-11 - rust-target: 1.69-x86_64-apple-darwin + rust-target: 1.79-x86_64-apple-darwin runs-on: ${{ matrix.os }} name: Build - ${{ matrix.os }} steps: diff --git a/go.mod b/go.mod index b4a42959..28a8eab4 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,18 @@ module sdmm -go 1.20 +go 1.22 require ( github.com/SpaiR/imgui-go v1.12.1-0.20220214190844-a0bad21e1c5d - github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b + github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a github.com/go-gl/mathgl v1.1.0 github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f github.com/mazznoer/csscolorparser v0.1.3 github.com/minio/selfupdate v0.6.0 - github.com/rs/zerolog v1.32.0 + github.com/rs/zerolog v1.33.0 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 - github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf + github.com/sqweek/dialog v0.0.0-20240226140203-065105509627 github.com/stretchr/testify v1.9.0 golang.design/x/clipboard v0.7.0 ) diff --git a/go.sum b/go.sum index fdc87c4f..f7541c0f 100644 --- a/go.sum +++ b/go.sum @@ -10,10 +10,10 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/mathgl v1.1.0 h1:0lzZ+rntPX3/oGrDzYGdowSLC2ky8Osirvf5uAwfIEA= github.com/go-gl/mathgl v1.1.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -32,12 +32,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= -github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= -github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf h1:pCxn3BCfu8n8VUhYl4zS1BftoZoYY0J4qVF3dqAQ4aU= -github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw= +github.com/sqweek/dialog v0.0.0-20240226140203-065105509627 h1:2JL2wmHXWIAxDofCK+AdkFi1KEg3dgkefCsm7isADzQ= +github.com/sqweek/dialog v0.0.0-20240226140203-065105509627/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/internal/rsc/txt/about.txt b/internal/rsc/txt/about.txt index 5f4be845..ebebefa4 100644 --- a/internal/rsc/txt/about.txt +++ b/internal/rsc/txt/about.txt @@ -1,5 +1,5 @@ StrongDMM %VERSION% -Copyright (C) 2019-2023, SpaiR +Copyright (C) 2019-2024, SpaiR This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the conditions of the GNU diff --git a/third_party/sdmmparser/src/Cargo.lock b/third_party/sdmmparser/src/Cargo.lock index f6b1b3da..f1a3d62f 100644 --- a/third_party/sdmmparser/src/Cargo.lock +++ b/third_party/sdmmparser/src/Cargo.lock @@ -63,7 +63,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "builtins-proc-macro" version = "0.0.0" -source = "git+https://github.com/SpaiR/SpacemanDMM?rev=7dc22d522bdda6370516c8de9092d446fe5017a5#7dc22d522bdda6370516c8de9092d446fe5017a5" +source = "git+https://github.com/SpaiR/SpacemanDMM?rev=367bcdd75f736a91ab046d616ce56f61fb835a94#367bcdd75f736a91ab046d616ce56f61fb835a94" dependencies = [ "proc-macro2", "quote", @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "dreammaker" version = "0.1.0" -source = "git+https://github.com/SpaiR/SpacemanDMM?rev=7dc22d522bdda6370516c8de9092d446fe5017a5#7dc22d522bdda6370516c8de9092d446fe5017a5" +source = "git+https://github.com/SpaiR/SpacemanDMM?rev=367bcdd75f736a91ab046d616ce56f61fb835a94#367bcdd75f736a91ab046d616ce56f61fb835a94" dependencies = [ "ahash", "bitflags", @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -238,7 +238,7 @@ checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8" [[package]] name = "interval-tree" version = "0.8.0" -source = "git+https://github.com/SpaiR/SpacemanDMM?rev=7dc22d522bdda6370516c8de9092d446fe5017a5#7dc22d522bdda6370516c8de9092d446fe5017a5" +source = "git+https://github.com/SpaiR/SpacemanDMM?rev=367bcdd75f736a91ab046d616ce56f61fb835a94#367bcdd75f736a91ab046d616ce56f61fb835a94" [[package]] name = "itoa" @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags", "crc32fast", @@ -473,18 +473,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -493,9 +493,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", diff --git a/third_party/sdmmparser/src/Cargo.toml b/third_party/sdmmparser/src/Cargo.toml index fdc49603..6e398dd0 100644 --- a/third_party/sdmmparser/src/Cargo.toml +++ b/third_party/sdmmparser/src/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sdmmparser" version = "2.0.0" -rust-version = "1.69.0" +rust-version = "1.79.0" [lib] name = "sdmmparser" @@ -9,14 +9,14 @@ path = "lib.rs" crate-type = ["staticlib"] [dependencies] -serde = "1.0.197" -serde_derive = "1.0.137" -serde_json = "1.0.109" -png = "0.17.9" +serde = "1.0.203" +serde_derive = "1.0.203" +serde_json = "1.0.120" +png = "0.17.13" [dependencies.dreammaker] git = "https://github.com/SpaiR/SpacemanDMM" -rev = "7dc22d522bdda6370516c8de9092d446fe5017a5" +rev = "367bcdd75f736a91ab046d616ce56f61fb835a94" package = "dreammaker" [profile.release] diff --git a/third_party/sdmmparser/src/lib.rs b/third_party/sdmmparser/src/lib.rs index 0f71619c..e04ebb25 100644 --- a/third_party/sdmmparser/src/lib.rs +++ b/third_party/sdmmparser/src/lib.rs @@ -31,7 +31,7 @@ pub extern fn SdmmParseIconMetadata(native_path: *const c_char) -> *const c_char #[no_mangle] #[allow(non_snake_case)] pub extern fn SdmmFreeStr(native_str: *mut c_char) { - unsafe { CString::from_raw(native_str) }; + unsafe { let _ = CString::from_raw(native_str); }; } /// Convert a native string to a Rust string