diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f38ed9d5..e05358b1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ on: [ push, pull_request ] jobs: lint-source-code: name: Lint Source Code - runs-on: macos-11 # use macOS to avoid installation of desktop deps + runs-on: macos-latest # use macOS to avoid installation of desktop deps steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -23,14 +23,14 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-22.04, windows-2019, macos-11 ] + os: [ ubuntu-latest, windows-latest, macos-latest ] include: - - os: ubuntu-22.04 - rust-target: 1.69-x86_64-unknown-linux-gnu - - os: windows-2019 - rust-target: 1.69-x86_64-pc-windows-gnu - - os: macos-11 - rust-target: 1.69-x86_64-apple-darwin + - os: ubuntu-latest + rust-target: 1.79-x86_64-unknown-linux-gnu + - os: windows-latest + rust-target: 1.79-x86_64-pc-windows-gnu + - os: macos-latest + rust-target: 1.79-x86_64-apple-darwin runs-on: ${{ matrix.os }} name: Build - ${{ matrix.os }} steps: @@ -81,7 +81,7 @@ jobs: release: name: Release - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: build if: startsWith(github.ref, 'refs/tags/v') # if tag starts with "v" steps: diff --git a/go.mod b/go.mod index b4a42959..313a9c92 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module sdmm -go 1.20 +go 1.22 require ( github.com/SpaiR/imgui-go v1.12.1-0.20220214190844-a0bad21e1c5d 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