diff --git a/.github/actions/install-driver/action.yml b/.github/actions/install-driver/action.yml index 640442fc..ee97b43a 100644 --- a/.github/actions/install-driver/action.yml +++ b/.github/actions/install-driver/action.yml @@ -13,8 +13,10 @@ runs: sudo add-apt-repository ppa:oibaf/graphics-drivers -y sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers - - name: wgpu info + - name: Install wgpu-info shell: bash - run: | - cargo install --git "https://github.com/gfx-rs/wgpu" wgpu-info - wgpu-info + # Rev is for 0.14.1: https://github.com/gfx-rs/wgpu/tree/v0.14.1 + run: cargo install --debug --git "https://github.com/gfx-rs/wgpu" --rev 77b9a99cf4c7ca2b6d46124f9e48e510c04b605d wgpu-info + - name: wgpu-info + shell: bash + run: wgpu-info diff --git a/.github/workflows/demo-windows.yml b/.github/workflows/demo-windows.yml index 32eae168..8a70799c 100644 --- a/.github/workflows/demo-windows.yml +++ b/.github/workflows/demo-windows.yml @@ -19,7 +19,12 @@ jobs: uses: ./.github/actions/setup with: targets: x86_64-pc-windows-msvc - - uses: ilammy/msvc-dev-cmd@v1 # Provide access to lib.exe + # Setup MSVC in the msys2 environment. + # Does roughly that: https://anadoxin.org/blog/bringing-visual-studio-compiler-into-msys2-environment.html/ + - uses: ilammy/msvc-dev-cmd@v1 + - name: Fix environment + shell: bash + run: rm "C:\\msys64\usr\bin\link.exe" # Rust seems to prefer the link.exe from msys2 instead of MSVC - name: Show PATH shell: bash run: echo $PATH diff --git a/Cargo.toml b/Cargo.toml index 83255604..d60b1cd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,15 @@ members = [ "benchmarks", ] +[workspace.package] +description = "Maps for Desktop, Mobile and Web" +version = "0.1.0" +edition = "2021" +rust-version = "1.65" +license = "MIT OR Apache-2.0" +keywords = ["graphics"] +authors = ["Maximilian Ammann "] + [profile.release] lto = true codegen-units = 1 diff --git a/android/Cargo.toml b/android/Cargo.toml index 459f3c1c..37a8a525 100644 --- a/android/Cargo.toml +++ b/android/Cargo.toml @@ -1,14 +1,18 @@ [package] name = "maplibre-android" # Naming this "android" is not possible. Compilation fails. version = "0.1.0" -description = "" -categories = [] -edition = "2021" publish = false +description.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true + [dependencies] maplibre = { path = "../maplibre", features = ["thread-safe-futures"] } -maplibre-winit = { path = "../maplibre-winit", version = "0.0.1" } +maplibre-winit = { path = "../maplibre-winit", version = "0.1.0" } env_logger = "0.9.0" log = "0.4.17" ndk-glue = "0.7.0" # version is required by winit diff --git a/android/gradle/lib/build.gradle b/android/gradle/lib/build.gradle index 965aa3eb..ab33bafe 100644 --- a/android/gradle/lib/build.gradle +++ b/android/gradle/lib/build.gradle @@ -34,7 +34,7 @@ cargo { libname = "maplibre_android" targetDirectory = "${module}/../target" profile = "debug" - rustupChannel = "nightly-2022-10-23" + rustupChannel = "nightly-2022-11-12" // Also change the version in justfile features { diff --git a/apple/Cargo.toml b/apple/Cargo.toml index 3d49610a..5d4adc1e 100644 --- a/apple/Cargo.toml +++ b/apple/Cargo.toml @@ -1,14 +1,18 @@ [package] name = "apple" version = "0.1.0" -description = "" -categories = [] -edition = "2021" publish = false +description.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true + [dependencies] maplibre = { path = "../maplibre", features = ["thread-safe-futures"] } -maplibre-winit = { path = "../maplibre-winit", version = "0.0.1" } +maplibre-winit = { path = "../maplibre-winit", version = "0.1.0" } env_logger = "0.9.0" diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index f76f0d37..e753de32 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -1,9 +1,14 @@ [package] name = "benchmarks" version = "0.1.0" -description = "" -categories = [] -edition = "2021" +publish = false + +description.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true [dependencies] maplibre = { path = "../maplibre", features = ["headless", "embed-static-tiles", "thread-safe-futures"] } diff --git a/justfile b/justfile index ecaa2dd4..3476229c 100644 --- a/justfile +++ b/justfile @@ -4,8 +4,8 @@ set shell := ["bash", "-c"] -export NIGHTLY_TOOLCHAIN := "nightly-2022-10-23" -export STABLE_TOOLCHAIN := "1.64" +export NIGHTLY_TOOLCHAIN := "nightly-2022-11-12" # Also change the version in android/gradle/lib/build.gradle +export STABLE_TOOLCHAIN := "1.65" export CARGO_TERM_COLOR := "always" export RUST_BACKTRACE := "1" diff --git a/maplibre-build-tools/Cargo.toml b/maplibre-build-tools/Cargo.toml index 3c5bb87d..8e64bf6a 100644 --- a/maplibre-build-tools/Cargo.toml +++ b/maplibre-build-tools/Cargo.toml @@ -2,12 +2,14 @@ name = "maplibre-build-tools" version = "0.1.0" description = "A library with build tools for maplibre-rs" -categories = [] -edition = "2021" -authors = ["Maximilian Ammann "] -license = "MIT OR Apache-2.0" readme = "../README.md" +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true + [features] sqlite = ["rusqlite"] diff --git a/maplibre-demo/Cargo.toml b/maplibre-demo/Cargo.toml index 2cdddec2..e3dff756 100644 --- a/maplibre-demo/Cargo.toml +++ b/maplibre-demo/Cargo.toml @@ -1,21 +1,23 @@ [package] name = "maplibre-demo" version = "0.1.0" -categories = [] -edition = "2021" -authors = ["Maximilian Ammann "] -license = "MIT OR Apache-2.0" -description = "Demo of maplibre" +description = "Demo of maplibre-re" readme = "../README.md" +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true + [features] web-webgl = ["maplibre/web-webgl"] trace = ["maplibre/trace"] [dependencies] env_logger = "0.9.0" -maplibre = { path = "../maplibre", version = "0.0.2", features = ["headless", "thread-safe-futures"] } -maplibre-winit = { path = "../maplibre-winit", version = "0.0.1" } +maplibre = { path = "../maplibre", version = "0.1.0", features = ["headless", "thread-safe-futures"] } +maplibre-winit = { path = "../maplibre-winit", version = "0.1.0" } tile-grid = "0.3" diff --git a/maplibre-winit/Cargo.toml b/maplibre-winit/Cargo.toml index e817cac7..9f67bc6c 100644 --- a/maplibre-winit/Cargo.toml +++ b/maplibre-winit/Cargo.toml @@ -1,7 +1,13 @@ [package] name = "maplibre-winit" -version = "0.0.1" -edition = "2021" +version = "0.1.0" + +description.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true [target.'cfg(any(target_os = "macos", target_os = "ios", target_os = "linux", target_os = "android", target_os = "windows"))'.dependencies] tokio = { version = "1.19.2", features = ["rt"] } @@ -18,7 +24,7 @@ wasm-bindgen = "0.2.81" wasm-bindgen-futures = "0.4.31" [dependencies] -maplibre = { path = "../maplibre", version = "0.0.2" } +maplibre = { path = "../maplibre", version = "0.1.0" } winit = { version = "0.27.2", default-features = false } cgmath = "0.18.0" instant = { version = "0.1.12", features = ["wasm-bindgen"] } # TODO: Untrusted dependency diff --git a/maplibre/Cargo.toml b/maplibre/Cargo.toml index 55e6de34..1c347f48 100644 --- a/maplibre/Cargo.toml +++ b/maplibre/Cargo.toml @@ -1,13 +1,16 @@ [package] name = "maplibre" -version = "0.0.2" -edition = "2021" +version = "0.1.0" build = "build.rs" -authors = ["Maximilian Ammann "] -license = "MIT OR Apache-2.0" -description = "Native Maps for Web, Mobile and Desktop" readme = "../README.md" +description.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true + [features] default = [] web-webgl = ["wgpu/webgl"] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5d0a00ec..be569f8b 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ [toolchain] -# This library version should match the $STABLE_TOOLCHAIN version of the justfile. 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. +# 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. # This file is here to give IDEs a hint about which Rust version to use. -channel = "1.64" +# The version is set here instead of using stable, so we can make sure that a predictable version is used. +channel = "1.65" diff --git a/web/Cargo.toml b/web/Cargo.toml index f35c1615..299d1fb5 100644 --- a/web/Cargo.toml +++ b/web/Cargo.toml @@ -1,11 +1,15 @@ [package] name = "web" version = "0.1.0" -description = "" -categories = [] -edition = "2021" publish = false +description.workspace = true +edition.workspace = true +rust-version.workspace = true +license.workspace = true +keywords.workspace = true +authors.workspace = true + [features] web-webgl = ["maplibre/web-webgl"] trace = ["maplibre/trace", "tracing-wasm"] @@ -20,7 +24,7 @@ crate-type = ["cdylib", "rlib"] [dependencies] async-trait = "0.1.56" maplibre = { path = "../maplibre" } -maplibre-winit = { path = "../maplibre-winit", version = "0.0.1" } +maplibre-winit = { path = "../maplibre-winit", version = "0.1.0" } log = "0.4.17" rand = { version = "0.7", features = ["wasm-bindgen"] }