mirror of
https://github.com/slint-ui/slint.git
synced 2025-10-17 22:08:39 +00:00
Update MSRV to 1.73
A MSRV update is required to update the image crate to 0.25, otherwise we get link error that are ficed in newer version. Also other dependency update such as env_logger needs a newer MSRV. Update to 1.73 because it has functions like `with_borrow` on thread storage which we already actually use in some platform. This is also the last release before the the drop of macOs < 10.12 in Rust 1.74
This commit is contained in:
parent
6bf40989d9
commit
fd4dcfc128
10 changed files with 14 additions and 14 deletions
8
.github/workflows/ci.yaml
vendored
8
.github/workflows/ci.yaml
vendored
|
@ -25,7 +25,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
os: [ubuntu-22.04, macos-11, windows-2022]
|
os: [ubuntu-22.04, macos-11, windows-2022]
|
||||||
rust_version: [stable, "1.70"]
|
rust_version: [stable, "1.73"]
|
||||||
include:
|
include:
|
||||||
- os: windows-2022
|
- os: windows-2022
|
||||||
extra_args: "--exclude ffmpeg --exclude gstreamer-player"
|
extra_args: "--exclude ffmpeg --exclude gstreamer-player"
|
||||||
|
@ -36,7 +36,7 @@ jobs:
|
||||||
extra_args: "--exclude ffmpeg --exclude gstreamer-player"
|
extra_args: "--exclude ffmpeg --exclude gstreamer-player"
|
||||||
exclude:
|
exclude:
|
||||||
- os: macos-11
|
- os: macos-11
|
||||||
rust_version: "1.70"
|
rust_version: "1.73"
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
|
@ -63,13 +63,11 @@ jobs:
|
||||||
toolchain: ${{ matrix.rust_version }}
|
toolchain: ${{ matrix.rust_version }}
|
||||||
key: x-v2
|
key: x-v2
|
||||||
- name: Pin dependencies to make it build with our MSRV
|
- name: Pin dependencies to make it build with our MSRV
|
||||||
if: matrix.rust_version == '1.70'
|
if: matrix.rust_version == '1.73'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
if [ ! -f ./Cargo.lock ]; then
|
if [ ! -f ./Cargo.lock ]; then
|
||||||
cargo update -p clap --precise 4.4.18
|
cargo update -p clap --precise 4.4.18
|
||||||
cargo update -p ahash --precise 0.8.7
|
|
||||||
cargo update -p bumpalo --precise 3.14.0
|
|
||||||
fi
|
fi
|
||||||
- name: Run tests
|
- name: Run tests
|
||||||
run: DYLD_FRAMEWORK_PATH=$Qt5_DIR/lib cargo test --verbose --all-features --workspace ${{ matrix.extra_args }} --exclude slint-node --exclude pyslint --exclude test-driver-node --exclude slint-node --exclude test-driver-nodejs --exclude test-driver-cpp --exclude mcu-board-support --exclude printerdemo_mcu --exclude uefi-demo --exclude slint-cpp
|
run: DYLD_FRAMEWORK_PATH=$Qt5_DIR/lib cargo test --verbose --all-features --workspace ${{ matrix.extra_args }} --exclude slint-node --exclude pyslint --exclude test-driver-node --exclude slint-node --exclude test-driver-nodejs --exclude test-driver-cpp --exclude mcu-board-support --exclude printerdemo_mcu --exclude uefi-demo --exclude slint-cpp
|
||||||
|
|
|
@ -5,6 +5,10 @@ All notable changes to this project are documented in this file.
|
||||||
|
|
||||||
## [1.6.0] - Unreleased
|
## [1.6.0] - Unreleased
|
||||||
|
|
||||||
|
## General
|
||||||
|
|
||||||
|
- The minimum Rust version is now 1.73.
|
||||||
|
|
||||||
## Slint Language
|
## Slint Language
|
||||||
|
|
||||||
- Palette: Added `color-scheme` in-out property for accessing the
|
- Palette: Added `color-scheme` in-out property for accessing the
|
||||||
|
|
|
@ -102,7 +102,7 @@ homepage = "https://slint.dev"
|
||||||
keywords = ["gui", "toolkit", "graphics", "design", "ui"]
|
keywords = ["gui", "toolkit", "graphics", "design", "ui"]
|
||||||
license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial"
|
license = "GPL-3.0-only OR LicenseRef-Slint-Royalty-free-1.1 OR LicenseRef-Slint-commercial"
|
||||||
repository = "https://github.com/slint-ui/slint"
|
repository = "https://github.com/slint-ui/slint"
|
||||||
rust-version = "1.70"
|
rust-version = "1.73"
|
||||||
version = "1.6.0"
|
version = "1.6.0"
|
||||||
|
|
||||||
[workspace.dependencies]
|
[workspace.dependencies]
|
||||||
|
|
|
@ -18,7 +18,7 @@ FetchContent_Declare(
|
||||||
FetchContent_MakeAvailable(Corrosion)
|
FetchContent_MakeAvailable(Corrosion)
|
||||||
|
|
||||||
list(PREPEND CMAKE_MODULE_PATH ${Corrosion_SOURCE_DIR}/cmake)
|
list(PREPEND CMAKE_MODULE_PATH ${Corrosion_SOURCE_DIR}/cmake)
|
||||||
find_package(Rust 1.70 REQUIRED MODULE)
|
find_package(Rust 1.73 REQUIRED MODULE)
|
||||||
|
|
||||||
option(BUILD_SHARED_LIBS "Build Slint as shared library" ON)
|
option(BUILD_SHARED_LIBS "Build Slint as shared library" ON)
|
||||||
option(SLINT_FEATURE_COMPILER "Enable support for compiling .slint files to C++ ahead of time" ON)
|
option(SLINT_FEATURE_COMPILER "Enable support for compiling .slint files to C++ ahead of time" ON)
|
||||||
|
|
|
@ -49,7 +49,7 @@ In the next section you will learn how to use the installed library in your appl
|
||||||
First you need to install the prerequisites:
|
First you need to install the prerequisites:
|
||||||
|
|
||||||
* Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). If you already
|
* Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). If you already
|
||||||
have Rust installed, make sure that it's at least version 1.70 or newer. You can check which version you have installed
|
have Rust installed, make sure that it's at least version 1.73 or newer. You can check which version you have installed
|
||||||
by running `rustc --version`. Once this is done, you should have the `rustc` compiler and the `cargo` build system installed in your path.
|
by running `rustc --version`. Once this is done, you should have the `rustc` compiler and the `cargo` build system installed in your path.
|
||||||
|
|
||||||
You can either choose to compile Slint from source along with your application or include Slint as an external CMake package.
|
You can either choose to compile Slint from source along with your application or include Slint as an external CMake package.
|
||||||
|
|
|
@ -33,7 +33,7 @@ You need to install the following components:
|
||||||
|
|
||||||
* **[Node.js](https://nodejs.org/download/release/)** (v16. or newer)
|
* **[Node.js](https://nodejs.org/download/release/)** (v16. or newer)
|
||||||
* **[npm](https://www.npmjs.com/)**
|
* **[npm](https://www.npmjs.com/)**
|
||||||
* **[Rust compiler](https://www.rust-lang.org/tools/install)** (1.70 or newer)
|
* **[Rust compiler](https://www.rust-lang.org/tools/install)** (1.73 or newer)
|
||||||
|
|
||||||
You will also need a few more dependencies, see <https://github.com/slint-ui/slint/blob/master/docs/building.md#prerequisites>
|
You will also need a few more dependencies, see <https://github.com/slint-ui/slint/blob/master/docs/building.md#prerequisites>
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@ To use Slint with Deno, ensure the following programs are installed:
|
||||||
Slint-node comes with pre-built binaries for macOS, Linux, and Windows. If you'd like to use Slint-node on a system
|
Slint-node comes with pre-built binaries for macOS, Linux, and Windows. If you'd like to use Slint-node on a system
|
||||||
without pre-built binaries, you need to additional software:
|
without pre-built binaries, you need to additional software:
|
||||||
|
|
||||||
* **[Rust compiler](https://www.rust-lang.org/tools/install)** (1.70 or newer)
|
* **[Rust compiler](https://www.rust-lang.org/tools/install)** (1.73 or newer)
|
||||||
* Depending on your operating system, you may need additional components. For a list of required system libraries,
|
* Depending on your operating system, you may need additional components. For a list of required system libraries,
|
||||||
see <https://github.com/slint-ui/slint/blob/master/docs/building.md#prerequisites>.
|
see <https://github.com/slint-ui/slint/blob/master/docs/building.md#prerequisites>.
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@ in detail.
|
||||||
## Prerequisites
|
## Prerequisites
|
||||||
|
|
||||||
* Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). If you already
|
* Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). If you already
|
||||||
have Rust installed, make sure that it's at least version 1.70 or newer. You can check which version you have installed
|
have Rust installed, make sure that it's at least version 1.73 or newer. You can check which version you have installed
|
||||||
by running `rustc --version`. Once this is done, you should have the `rustc` compiler and the `cargo` build system installed in your path. This requirement will be removed before the final release of Slint for Python.
|
by running `rustc --version`. Once this is done, you should have the `rustc` compiler and the `cargo` build system installed in your path. This requirement will be removed before the final release of Slint for Python.
|
||||||
* [Python 3](https://python.org/)
|
* [Python 3](https://python.org/)
|
||||||
* [pip](https://pypi.org/project/pip/)
|
* [pip](https://pypi.org/project/pip/)
|
||||||
|
|
|
@ -10,7 +10,7 @@ This page explains how to build and test Slint.
|
||||||
### Installing Rust
|
### Installing Rust
|
||||||
|
|
||||||
Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). If you already
|
Install Rust by following the [Rust Getting Started Guide](https://www.rust-lang.org/learn/get-started). If you already
|
||||||
have Rust installed, make sure that it's at least version 1.70 or newer. You can check which version you have installed
|
have Rust installed, make sure that it's at least version 1.73 or newer. You can check which version you have installed
|
||||||
by running `rustc --version`.
|
by running `rustc --version`.
|
||||||
|
|
||||||
Once this is done, you should have the `rustc` compiler and the `cargo` build system installed in your path.
|
Once this is done, you should have the `rustc` compiler and the `cargo` build system installed in your path.
|
||||||
|
|
|
@ -32,8 +32,6 @@ path = "wasm_main.rs"
|
||||||
name = "slint_lsp_wasm"
|
name = "slint_lsp_wasm"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
# Remove once MSRV > 1.70 (1.70 does not yet work!):
|
|
||||||
slint = []
|
|
||||||
backend-qt = ["slint/backend-qt", "preview"]
|
backend-qt = ["slint/backend-qt", "preview"]
|
||||||
|
|
||||||
backend-winit = ["slint/backend-winit", "preview"]
|
backend-winit = ["slint/backend-winit", "preview"]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue