Skip to content

Commit

Permalink
AVRO-3793: [Rust] Bump minimum supported version of Rust to 1.65.0 (#…
Browse files Browse the repository at this point in the history
…2329)

Use [workspace.package] in the parent Cargo.toml to reduce duplication

Signed-off-by: Martin Tzvetanov Grigorov <[email protected]>
  • Loading branch information
martin-g authored Jul 8, 2023
1 parent 07f7f8c commit 126c19b
Show file tree
Hide file tree
Showing 10 changed files with 51 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-lang-rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- stable
- beta
- nightly
- 1.60.0 # MSRV
- 1.65.0 # MSRV
target:
- x86_64-unknown-linux-gnu
- wasm32-unknown-unknown
Expand Down
2 changes: 1 addition & 1 deletion BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ The following packages must be installed before Avro can be built:
Math::BigInt, JSON::XS, Try::Tiny, Regexp::Common, Encode,
IO::String, Object::Tiny, Compress::ZLib, Error::Simple,
Test::More, Test::Exception, Test::Pod
- Rust: rustc and Cargo 1.60.0 or greater
- Rust: rustc and Cargo 1.65.0 or greater
- Apache Ant 1.7
- md5sum, sha1sum, used by top-level dist target

Expand Down
12 changes: 12 additions & 0 deletions lang/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,15 @@ members = [
exclude = [
"fuzz"
]

[workspace.package]
version = "0.15.0"
authors = ["Apache Avro team <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/avro"
edition = "2021"
rust-version = "1.65.0"
keywords = ["avro", "data", "serialization"]
categories = ["encoding"]
documentation = "https://docs.rs/apache-avro"
20 changes: 10 additions & 10 deletions lang/rust/avro/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@

[package]
name = "apache-avro"
version = "0.15.0"
authors = ["Apache Avro team <[email protected]>"]
description = "A library for working with Apache Avro in Rust"
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/avro"
edition = "2021"
rust-version = "1.60.0"
keywords = ["avro", "data", "serialization"]
categories = ["encoding"]
documentation = "https://docs.rs/apache-avro"
version.workspace = true
authors.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
edition.workspace = true
rust-version.workspace = true
keywords.workspace = true
categories.workspace = true
documentation.workspace = true

[features]
bzip = ["bzip2"]
Expand Down
2 changes: 1 addition & 1 deletion lang/rust/avro/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ assert_eq!(false, SchemaCompatibility::can_read(&writers_schema, &readers_schema

## Minimal supported Rust version

1.60.0
1.65.0

## License
This project is licensed under [Apache License 2.0](https://github.com/apache/avro/blob/master/LICENSE.txt).
Expand Down
16 changes: 8 additions & 8 deletions lang/rust/avro_derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

[package]
name = "apache-avro-derive"
version = "0.15.0"
authors = ["Apache Avro team <[email protected]>"]
version.workspace = true
authors.workspace = true
description = "A library for deriving Avro schemata from Rust structs and enums"
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/avro"
edition = "2021"
rust-version = "1.60.0"
license.workspace = true
readme.workspace = true
repository.workspace = true
edition.workspace = true
rust-version.workspace = true
keywords = ["avro", "data", "serialization", "derive"]
categories = ["encoding"]
categories.workspace = true
documentation = "https://docs.rs/apache-avro-derive"

[lib]
Expand Down
16 changes: 8 additions & 8 deletions lang/rust/avro_test_helper/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@

[package]
name = "apache-avro-test-helper"
version = "0.15.0"
edition = "2021"
rust-version = "1.60.0"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
description = "Apache Avro tests helper."
authors = ["Apache Avro team <[email protected]>"]
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/avro"
authors.workspace = true
license.workspace = true
readme.workspace = true
repository.workspace = true
keywords = ["avro", "data", "serialization", "test"]
categories = ["encoding"]
categories.workspace = true
documentation = "https://docs.rs/apache-avro-test-helper"


Expand Down
2 changes: 1 addition & 1 deletion lang/rust/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ name = "apache-avro-fuzz"
version = "0.0.0"
publish = false
edition = "2021"
rust-version = "1.60.0"
rust-version = "1.65.0"

[package.metadata]
cargo-fuzz = true
Expand Down
16 changes: 8 additions & 8 deletions lang/rust/wasm-demo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
[package]
name = "hello-wasm"
version = "0.1.0"
authors = ["Apache Avro team <[email protected]>"]
authors.workspace = true
description = "A demo project for testing apache_avro in WebAssembly"
license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/avro"
edition = "2021"
rust-version = "1.60.0"
license.workspace = true
readme.workspace = true
repository.workspace = true
edition.workspace = true
rust-version.workspace = true
keywords = ["avro", "data", "serialization", "wasm", "web assembly"]
categories = ["encoding"]
documentation = "https://docs.rs/apache-avro"
categories.workspace = true
documentation.workspace = true
publish = false


Expand Down
2 changes: 1 addition & 1 deletion share/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ RUN gem install bundler --no-document && \
cd /tmp/lang/ruby && bundle install

# Install Rust
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.60.0
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.65.0

# Note: This "ubertool" container has two JDK versions:
# - OpenJDK 8
Expand Down

0 comments on commit 126c19b

Please sign in to comment.