archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Update Rust to 1.79 (#310)

Browse Source
This commit is contained in:
Max Ammann 2024-07-23 18:02:07 +02:00 committed by GitHub
parent 151ee9fb77
commit 784604e0b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -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"]

2
android/gradle/lib/build.gradle
View File

@ -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 {

4
justfile
View File

@ -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"

4
rust-toolchain.toml
View File

@ -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"