From 37c4c30db74afaa9708b8ce13483293467e95abc Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 15 Nov 2024 12:00:32 +0100 Subject: [PATCH] Update Skia Bindings This allows reverting 18db3210d6609828436408fb9f8e05b41b7f89d0 and Fixes #6615 --- .github/workflows/cpp_package.yaml | 4 ---- .github/workflows/nightly_snapshot.yaml | 8 -------- .github/workflows/publish_npm_package.yaml | 4 ---- .github/workflows/slint_tool_binary.yaml | 4 ---- internal/renderers/skia/Cargo.toml | 8 ++++---- 5 files changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/cpp_package.yaml b/.github/workflows/cpp_package.yaml index c117f7980c1..e18e38800a7 100644 --- a/.github/workflows/cpp_package.yaml +++ b/.github/workflows/cpp_package.yaml @@ -58,10 +58,6 @@ jobs: - name: Prepare licenses run: bash -x ../../scripts/prepare_binary_package.sh ../.. working-directory: api/cpp/ - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - uses: ilammy/msvc-dev-cmd@v1 - name: Select MSVC (windows) run: | diff --git a/.github/workflows/nightly_snapshot.yaml b/.github/workflows/nightly_snapshot.yaml index 9659a19ec2c..239b0eb6ffc 100644 --- a/.github/workflows/nightly_snapshot.yaml +++ b/.github/workflows/nightly_snapshot.yaml @@ -124,10 +124,6 @@ jobs: target: x86_64-apple-darwin - name: Install cargo-bundle run: cargo install --version=0.6.0 cargo-bundle - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - name: Build Main LSP Bundle working-directory: tools/lsp run: cargo bundle --release --features ${{ env.SLINT_BINARY_FEATURES }} @@ -151,10 +147,6 @@ jobs: - uses: ./.github/actions/setup-rust with: target: aarch64-apple-darwin - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - name: Build AArch64 LSP run: cargo build --target aarch64-apple-darwin --features ${{ env.SLINT_BINARY_FEATURES }} --release -p slint-lsp - name: Create artifact directory diff --git a/.github/workflows/publish_npm_package.yaml b/.github/workflows/publish_npm_package.yaml index a0243d05f45..dd904b2f79e 100644 --- a/.github/workflows/publish_npm_package.yaml +++ b/.github/workflows/publish_npm_package.yaml @@ -87,10 +87,6 @@ jobs: - name: Upgrade LLVM for Skia build on Windows if: runner.os == 'Windows' run: choco upgrade llvm - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' # Setup .npmrc file to publish to npm - uses: actions/setup-node@v4 with: diff --git a/.github/workflows/slint_tool_binary.yaml b/.github/workflows/slint_tool_binary.yaml index 3074894b5da..0e1521e6bc2 100644 --- a/.github/workflows/slint_tool_binary.yaml +++ b/.github/workflows/slint_tool_binary.yaml @@ -163,10 +163,6 @@ jobs: - uses: ./.github/actions/setup-rust with: target: aarch64-apple-darwin - # Pin Python version until https://github.com/slint-ui/slint/issues/6615 is fixed. - - uses: actions/setup-python@v5 - with: - python-version: '3.12' - uses: baptiste0928/cargo-install@v3 with: crate: cargo-about diff --git a/internal/renderers/skia/Cargo.toml b/internal/renderers/skia/Cargo.toml index 57beed4a69b..132fe7d2972 100644 --- a/internal/renderers/skia/Cargo.toml +++ b/internal/renderers/skia/Cargo.toml @@ -42,7 +42,7 @@ pin-weak = "1" scoped-tls-hkt = "0.1" raw-window-handle = { version = "0.6", features = ["std"] } -skia-safe = { version = "0.78.0", features = ["textlayout", "gl"] } +skia-safe = { version = "0.80.0", features = ["textlayout", "gl"] } glow = { version = "0.13" } unicode-segmentation = { version = "1.8.0" } @@ -58,7 +58,7 @@ bytemuck = { workspace = true } [target.'cfg(target_family = "windows")'.dependencies] windows = { version = "0.58.0", features = ["Win32", "Win32_System_Com", "Win32_Graphics", "Win32_Graphics_Dxgi", "Win32_Graphics_Direct3D12", "Win32_Graphics_Direct3D", "Win32_Foundation", "Win32_Graphics_Dxgi_Common", "Win32_System_Threading", "Win32_Security"] } -skia-safe = { version = "0.78.0", features = ["d3d"] } +skia-safe = { version = "0.80.0", features = ["d3d"] } [target.'cfg(target_vendor = "apple")'.dependencies] objc2 = { version = "0.5.2" } @@ -66,11 +66,11 @@ objc2-metal = { version = "0.2.2", features = ["MTLCommandQueue", "MTLCommandBuf objc2-foundation = { version = "0.2.2"} objc2-quartz-core = { version = "0.2.2" } objc2-app-kit = { version = "0.2.2" } -skia-safe = { version = "0.78.0", features = ["metal"] } +skia-safe = { version = "0.80.0", features = ["metal"] } raw-window-metal = "1.0" [target.'cfg(not(any(target_vendor = "apple", target_family = "windows")))'.dependencies] -skia-safe = { version = "0.78.0", features = ["gl"] } +skia-safe = { version = "0.80.0", features = ["gl"] } [build-dependencies] cfg_aliases = { workspace = true }