diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a99e4671d..515c125a4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: false matrix: - rust_version: [1.65.0, stable, nightly] + rust_version: [1.70.0, stable, nightly] platform: - { target: x86_64-pc-windows-msvc, os: windows-latest, } - { target: i686-pc-windows-msvc, os: windows-latest, } @@ -54,10 +54,10 @@ jobs: - { target: x86_64-apple-darwin, os: macos-latest, } exclude: # Android is tested on stable-3 - - rust_version: '1.65.0' + - rust_version: '1.70.0' platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' } include: - - rust_version: '1.69.0' + - rust_version: '1.70.0' platform: { target: aarch64-linux-android, os: ubuntu-latest, cmd: 'apk --' } @@ -112,6 +112,6 @@ jobs: - name: Lint with clippy shell: bash - if: (matrix.rust_version == '1.65.0') && !contains(matrix.platform.options, '--no-default-features') + if: (matrix.rust_version == '1.70.0') && !contains(matrix.platform.options, '--no-default-features') run: cargo clippy --workspace --all-targets --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES -- -Dwarnings diff --git a/CHANGELOG.md b/CHANGELOG.md index f458069b7a..97e883e730 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Unreleased +- Bump MSRV from `1.65` to `1.70`. + # Version 0.31.3 - Change `Surface` to be `Send`. This makes it consistent with the context, so now they are both `Send` but not `Sync`. diff --git a/glutin-winit/Cargo.toml b/glutin-winit/Cargo.toml index a633df2426..bc78d635d9 100644 --- a/glutin-winit/Cargo.toml +++ b/glutin-winit/Cargo.toml @@ -8,6 +8,7 @@ license = "MIT" readme = "README.md" repository = "https://github.com/rust-windowing/glutin" edition = "2021" +rust-version = "1.70.0" [features] default = ["egl", "glx", "x11", "wayland", "wgl"] diff --git a/glutin-winit/build.rs b/glutin-winit/build.rs index 32078de541..c64860b7c5 100644 --- a/glutin-winit/build.rs +++ b/glutin-winit/build.rs @@ -23,4 +23,19 @@ fn main() { wgl_backend: { all(feature = "wgl", windows, not(wasm_platform)) }, cgl_backend: { all(macos_platform, not(wasm_platform)) }, } + + println!("cargo:rustc-check-cfg=cfg(android_platform)"); + println!("cargo:rustc-check-cfg=cfg(wasm_platform)"); + println!("cargo:rustc-check-cfg=cfg(macos_platform)"); + println!("cargo:rustc-check-cfg=cfg(ios_platform)"); + println!("cargo:rustc-check-cfg=cfg(apple)"); + println!("cargo:rustc-check-cfg=cfg(free_unix)"); + + println!("cargo:rustc-check-cfg=cfg(x11_platform)"); + println!("cargo:rustc-check-cfg=cfg(wayland_platform)"); + + println!("cargo:rustc-check-cfg=cfg(egl_backend)"); + println!("cargo:rustc-check-cfg=cfg(glx_backend)"); + println!("cargo:rustc-check-cfg=cfg(wgl_backend)"); + println!("cargo:rustc-check-cfg=cfg(cgl_backend)"); } diff --git a/glutin/Cargo.toml b/glutin/Cargo.toml index 8706df188c..747a4afbbd 100644 --- a/glutin/Cargo.toml +++ b/glutin/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" readme = "README.md" repository = "https://github.com/rust-windowing/glutin" documentation = "https://docs.rs/glutin" -rust-version = "1.65.0" +rust-version = "1.70.0" edition = "2021" [features] diff --git a/glutin/build.rs b/glutin/build.rs index c8eab1b931..ceaa1e0a84 100644 --- a/glutin/build.rs +++ b/glutin/build.rs @@ -21,4 +21,19 @@ fn main() { wgl_backend: { all(feature = "wgl", windows, not(wasm_platform)) }, cgl_backend: { all(macos_platform, not(wasm_platform)) }, } + + println!("cargo:rustc-check-cfg=cfg(android_platform)"); + println!("cargo:rustc-check-cfg=cfg(wasm_platform)"); + println!("cargo:rustc-check-cfg=cfg(macos_platform)"); + println!("cargo:rustc-check-cfg=cfg(ios_platform)"); + println!("cargo:rustc-check-cfg=cfg(apple)"); + println!("cargo:rustc-check-cfg=cfg(free_unix)"); + + println!("cargo:rustc-check-cfg=cfg(x11_platform)"); + println!("cargo:rustc-check-cfg=cfg(wayland_platform)"); + + println!("cargo:rustc-check-cfg=cfg(egl_backend)"); + println!("cargo:rustc-check-cfg=cfg(glx_backend)"); + println!("cargo:rustc-check-cfg=cfg(wgl_backend)"); + println!("cargo:rustc-check-cfg=cfg(cgl_backend)"); } diff --git a/glutin_egl_sys/Cargo.toml b/glutin_egl_sys/Cargo.toml index 1130acfc7c..a7c46bbc7d 100644 --- a/glutin_egl_sys/Cargo.toml +++ b/glutin_egl_sys/Cargo.toml @@ -6,7 +6,7 @@ description = "The egl bindings for glutin" repository = "https://github.com/rust-windowing/glutin" license = "Apache-2.0" readme = "README.md" -rust-version = "1.65.0" +rust-version = "1.70.0" edition = "2021" [build-dependencies] diff --git a/glutin_examples/Cargo.toml b/glutin_examples/Cargo.toml index 2da256a749..40b3c7de1d 100644 --- a/glutin_examples/Cargo.toml +++ b/glutin_examples/Cargo.toml @@ -6,7 +6,7 @@ description = "Examples for glutin" repository = "https://github.com/rust-windowing/glutin" license = "Apache-2.0" readme = "../README.md" -rust-version = "1.65.0" +rust-version = "1.70.0" edition = "2021" publish = false diff --git a/glutin_examples/build.rs b/glutin_examples/build.rs index 2fbd6cc476..c109f8ee73 100644 --- a/glutin_examples/build.rs +++ b/glutin_examples/build.rs @@ -29,6 +29,21 @@ fn main() { cgl_backend: { all(macos_platform, not(wasm_platform)) }, } + println!("cargo:rustc-check-cfg=cfg(android_platform)"); + println!("cargo:rustc-check-cfg=cfg(wasm_platform)"); + println!("cargo:rustc-check-cfg=cfg(macos_platform)"); + println!("cargo:rustc-check-cfg=cfg(ios_platform)"); + println!("cargo:rustc-check-cfg=cfg(apple)"); + println!("cargo:rustc-check-cfg=cfg(free_unix)"); + + println!("cargo:rustc-check-cfg=cfg(x11_platform)"); + println!("cargo:rustc-check-cfg=cfg(wayland_platform)"); + + println!("cargo:rustc-check-cfg=cfg(egl_backend)"); + println!("cargo:rustc-check-cfg=cfg(glx_backend)"); + println!("cargo:rustc-check-cfg=cfg(wgl_backend)"); + println!("cargo:rustc-check-cfg=cfg(cgl_backend)"); + let dest = PathBuf::from(&env::var("OUT_DIR").unwrap()); println!("cargo:rerun-if-changed=build.rs"); diff --git a/glutin_gles2_sys/Cargo.toml b/glutin_gles2_sys/Cargo.toml index be68ecbde1..a8c5d99f62 100644 --- a/glutin_gles2_sys/Cargo.toml +++ b/glutin_gles2_sys/Cargo.toml @@ -6,7 +6,7 @@ description = "The gles2 bindings for glutin" repository = "https://github.com/rust-windowing/glutin" license = "Apache-2.0" readme = "README.md" -rust-version = "1.65.0" +rust-version = "1.70.0" edition = "2021" [build-dependencies] diff --git a/glutin_glx_sys/Cargo.toml b/glutin_glx_sys/Cargo.toml index 92a5b88167..7262cf1988 100644 --- a/glutin_glx_sys/Cargo.toml +++ b/glutin_glx_sys/Cargo.toml @@ -6,7 +6,7 @@ description = "The glx bindings for glutin" repository = "https://github.com/rust-windowing/glutin" license = "Apache-2.0" readme = "README.md" -rust-version = "1.65.0" +rust-version = "1.70.0" edition = "2021" [build-dependencies] diff --git a/glutin_wgl_sys/Cargo.toml b/glutin_wgl_sys/Cargo.toml index c198513ecc..9b9a29eb9f 100644 --- a/glutin_wgl_sys/Cargo.toml +++ b/glutin_wgl_sys/Cargo.toml @@ -6,7 +6,7 @@ description = "The wgl bindings for glutin" repository = "https://github.com/rust-windowing/glutin" license = "Apache-2.0" readme = "README.md" -rust-version = "1.65.0" +rust-version = "1.70.0" edition = "2021" [build-dependencies]