diff --git a/Cargo.toml b/Cargo.toml index 711e24696..fb0a1b1de 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ description = "Maps for Desktop, Mobile and Web" version = "0.1.0" edition = "2021" # Keep this in sync with `rust-toolchain.toml` and `justfile` -rust-version = "1.76" +rust-version = "1.79" license = "MIT OR Apache-2.0" keywords = ["graphics", "maps", "webgl", "tiles"] categories = ["graphics", "science::geo"] diff --git a/android/gradle/lib/build.gradle b/android/gradle/lib/build.gradle index fb69ba878..9931bb41b 100644 --- a/android/gradle/lib/build.gradle +++ b/android/gradle/lib/build.gradle @@ -35,7 +35,7 @@ cargo { targetDirectory = "${module}/../target" profile = "debug" // This should be in sync with the justfile - rustupChannel = "nightly-2024-03-12" + rustupChannel = "nightly-2024-07-22" features { diff --git a/justfile b/justfile index 55181b92f..ce50032cb 100644 --- a/justfile +++ b/justfile @@ -6,12 +6,12 @@ set shell := ["bash", "-c"] # Keep this in sync with `android/gradle/lib/build.gradle` -export NIGHTLY_TOOLCHAIN := "nightly-2024-03-12" +export NIGHTLY_TOOLCHAIN := "nightly-2024-07-22" # Keep this in sync with `rust-toolchain.toml` and `Cargo.toml`. # Make sure the above is newer than this. -export STABLE_TOOLCHAIN := "1.76" +export STABLE_TOOLCHAIN := "1.79" export CARGO_TERM_COLOR := "always" export RUST_BACKTRACE := "1" diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c8a7cba6c..5f5d1d839 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,8 +1,8 @@ [toolchain] # The CI will not use the rust-toolchain.toml file to build this project. -# The CI might use it though to build other Rust binaries, required for building maplibre-rs. +# However, the CI might use it to build other Rust binaries, required for building maplibre-rs. # This file is here to give IDEs a hint about which Rust version to use. # The version is set here instead of using stable, so we can make sure that a predictable version is used. # # Keep this in sync with `justfile` and `Cargo.toml` -channel = "1.76" +channel = "1.79"