Skip to content

Commit

Permalink
Merge pull request #547 from icedland/bumpdeps1
Browse files Browse the repository at this point in the history
Bump deps and msrv
  • Loading branch information
wtfsck committed Apr 17, 2024
2 parents 67b5700 + 7ab04c8 commit 8fa7f0b
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build/build-rust
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ cov_out_rust_tmp=$cov_out_rust/tmp
cov_out_rust_merged=$cov_out_rust/merged

# Minimum supported Rust version
msrv="1.57.0"
msrv="1.60.0"

new_func() {
echo
Expand Down
2 changes: 1 addition & 1 deletion build/ci-install-rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if [[ "$OSTYPE" = "darwin"* ]]; then
fi

# It fails on Windows so disable auto self update
rustup toolchain install 1.57.0 --no-self-update
rustup toolchain install 1.60.0 --no-self-update
rustup target add wasm32-unknown-unknown
rustup update --no-self-update

Expand Down
6 changes: 3 additions & 3 deletions src/csharp/Intel/Iced.UnitTests/Iced.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<PackageReference Include="coverlet.msbuild" Version="6.0.2" />
<!-- NOTE: when updating this thing, make sure it hasn't gotten slower (it's happened twice now!) -->
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.console" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.console" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.8" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/java/iced-x86/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<configuration>
<archive>
<manifest>
Expand Down Expand Up @@ -118,7 +118,7 @@
</plugin>
<plugin>
<artifactId>maven-source-plugin</artifactId>
<version>3.3.0</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -151,7 +151,7 @@
</plugin>
<plugin>
<artifactId>maven-gpg-plugin</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<executions>
<execution>
<id>sign-artifacts</id>
Expand Down
2 changes: 1 addition & 1 deletion src/rust/iced-x86-fzgt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ license = "MIT"
description = "Test FuzzerGen output"
edition = "2021"
publish = false
rust-version = "1.57.0"
rust-version = "1.60.0"

[dependencies.iced-x86]
path = "../iced-x86"
Expand Down
2 changes: 1 addition & 1 deletion src/rust/iced-x86-js/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ keywords = ["disassembler", "javascript", "assembler", "x86", "amd64"]
categories = ["wasm", "development-tools::debugging", "encoding", "hardware-support"]
edition = "2021"
publish = false
rust-version = "1.57.0"
rust-version = "1.60.0"

[lib]
# Adding "rlib" increases the wasm file size, so ... don't do it
Expand Down
2 changes: 1 addition & 1 deletion src/rust/iced-x86-js/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
iced-x86 JavaScript bindings (Rust -> WebAssembly) [![npm](https://img.shields.io/npm/v/iced-x86.svg)](https://www.npmjs.com/package/iced-x86) [![GitHub builds](https://github.com/icedland/iced/workflows/GitHub%20CI/badge.svg)](https://github.com/icedland/iced/actions) ![Minimum rustc version](https://img.shields.io/badge/rustc-1.57.0+-blue.svg) ![License](https://img.shields.io/crates/l/iced-x86.svg)
iced-x86 JavaScript bindings (Rust -> WebAssembly) [![npm](https://img.shields.io/npm/v/iced-x86.svg)](https://www.npmjs.com/package/iced-x86) [![GitHub builds](https://github.com/icedland/iced/workflows/GitHub%20CI/badge.svg)](https://github.com/icedland/iced/actions) ![Minimum rustc version](https://img.shields.io/badge/rustc-1.60.0+-blue.svg) ![License](https://img.shields.io/crates/l/iced-x86.svg)

iced-x86 is a blazing fast and correct x86 (16/32/64-bit) disassembler for JavaScript (WebAssembly).

Expand Down
2 changes: 1 addition & 1 deletion src/rust/iced-x86-lua/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "iced-x86-lua"
version = "1.21.0"
edition = "2021"
publish = false
rust-version = "1.57.0"
rust-version = "1.60.0"

[lib]
name = "iced_x86"
Expand Down
2 changes: 1 addition & 1 deletion src/rust/iced-x86-py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "iced-x86-py"
version = "1.21.0"
edition = "2021"
publish = false
rust-version = "1.57.0"
rust-version = "1.60.0"

[lib]
name = "_iced_x86_py"
Expand Down
2 changes: 1 addition & 1 deletion src/rust/iced-x86-py/build-wheels.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ while [ "$#" -gt 0 ]; do
done

# Build with minimum supported Rust version since later versions require a later GLIBC
msrv="1.57.0"
msrv="1.60.0"
curl https://sh.rustup.rs | sh -s -- -y --profile=minimal --default-toolchain=$msrv
export PATH="$HOME/.cargo/bin:$PATH"

Expand Down
2 changes: 1 addition & 1 deletion src/rust/iced-x86/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ keywords = ["disassembler", "assembler", "x86", "amd64", "x86_64"]
categories = ["no-std", "development-tools::debugging", "encoding", "hardware-support", "wasm"]
# Don't include the tests when uploading to crates.io
exclude = ["/src/**/test/", "/src/**/tests/", "/src/**/test_utils/"]
rust-version = "1.57.0"
rust-version = "1.60.0"

# These features are documented in README.md / lib.rs
[features]
Expand Down
6 changes: 3 additions & 3 deletions src/rust/iced-x86/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
iced-x86
[![Latest version](https://img.shields.io/crates/v/iced-x86.svg)](https://crates.io/crates/iced-x86)
[![Documentation](https://docs.rs/iced-x86/badge.svg)](https://docs.rs/iced-x86)
[![Minimum rustc version](https://img.shields.io/badge/rustc-1.57.0+-blue.svg)](#minimum-supported-rustc-version)
[![Minimum rustc version](https://img.shields.io/badge/rustc-1.60.0+-blue.svg)](#minimum-supported-rustc-version)
![License](https://img.shields.io/crates/l/iced-x86.svg)

iced-x86 is a blazing fast and correct x86 (16/32/64-bit) instruction decoder, disassembler and assembler written in Rust.
Expand All @@ -16,7 +16,7 @@ iced-x86 is a blazing fast and correct x86 (16/32/64-bit) instruction decoder, d
- 👍 The encoder can be used to re-encode decoded instructions at any address
- 👍 API to get instruction info, eg. read/written registers, memory and rflags bits; CPUID feature flag, control flow info, etc
- 👍 Supports `#![no_std]` and `WebAssembly`
- 👍 Supports `rustc` `1.57.0` or later
- 👍 Supports `rustc` `1.60.0` or later
- 👍 Few dependencies (`lazy_static`)
- 👍 License: MIT

Expand Down Expand Up @@ -1280,7 +1280,7 @@ Output:

## Minimum supported `rustc` version

iced-x86 supports `rustc` `1.57.0` or later.
iced-x86 supports `rustc` `1.60.0` or later.
This is checked in CI builds where the minimum supported version and the latest stable version are used to build the source code and run tests.

Bumping the minimum supported version of `rustc` is considered a minor breaking change. The minor version of iced-x86 will be incremented.
2 changes: 1 addition & 1 deletion src/rust/loona/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "loona"
version = "0.1.0"
edition = "2021"
publish = false
rust-version = "1.57.0"
rust-version = "1.60.0"

[features]
default = []
Expand Down

0 comments on commit 8fa7f0b

Please sign in to comment.