From 269f1c7741148e4fbfa83cf3bd82b7aab3d6aea4 Mon Sep 17 00:00:00 2001 From: Kevin McKee Date: Sun, 21 Sep 2025 09:30:37 -0700 Subject: [PATCH 1/2] Xcode 26 --- .github/workflows/codeql.yml | 7 +------ .github/workflows/swift.yml | 7 +------ README.md | 2 +- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 68c81d0..2b1173c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -17,9 +17,6 @@ jobs: # Only run this action if the PR isn't a draft and it is labled as a `security` PR if: github.event.pull_request.draft == false && contains(github.event.pull_request.labels.*.name, 'security') - env: - XCODE_VERSION: 'Xcode_16.4' - name: Analyze (${{ matrix.language }}) # Runner size impacts CodeQL analysis time. To learn more, please see: # - https://gh.io/recommended-hardware-resources-for-running-codeql @@ -27,7 +24,7 @@ jobs: # - https://gh.io/using-larger-runners (GitHub.com only) # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: macos-15 + runs-on: macos-26 timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} permissions: # required for all workflows @@ -50,8 +47,6 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s "/Applications/$XCODE_VERSION.app" - name: Initialize CodeQL uses: github/codeql-action/init@v3 with: diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index a51cd8f..e40891a 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -13,15 +13,10 @@ jobs: build: - env: - XCODE_VERSION: 'Xcode_16.4' - - runs-on: macos-15 + runs-on: macos-26 steps: - uses: actions/checkout@v4 - - name: Select Xcode - run: sudo xcode-select -s "/Applications/$XCODE_VERSION.app" - name: Install SwiftLint run: brew install swiftlint - name: Lint diff --git a/README.md b/README.md index f187167..eb2164d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Build](https://github.com/codefiesta/VimKit/actions/workflows/swift.yml/badge.svg) -![Xcode 16.4+](https://img.shields.io/badge/Xcode-16.4%2B-gold.svg) +![Xcode 26.0+](https://img.shields.io/badge/Xcode-26.0%2B-gold.svg) ![Swift 6.1+](https://img.shields.io/badge/Swift-6.1%2B-tomato.svg) ![iOS 18.0+](https://img.shields.io/badge/iOS-18.0%2B-crimson.svg) ![visionOS 2.0+](https://img.shields.io/badge/visionOS-2.0%2B-magenta.svg) From a32a32413b348080bbdd558189ad98f6da546565 Mon Sep 17 00:00:00 2001 From: Kevin McKee Date: Sun, 21 Sep 2025 09:40:09 -0700 Subject: [PATCH 2/2] Import fixes --- Sources/VimKit/Geometry.swift | 6 +++--- .../Extensions/LayerRenderer+Extensions.swift | 2 +- .../LayerRenderer/CompositorRenderer+SpatialEvents.swift | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Sources/VimKit/Geometry.swift b/Sources/VimKit/Geometry.swift index ca8685e..93c49cf 100644 --- a/Sources/VimKit/Geometry.swift +++ b/Sources/VimKit/Geometry.swift @@ -8,7 +8,7 @@ import Combine import Foundation import MetalKit import VimKitShaders -import struct SwiftUICore.Color +import struct SwiftUI.Color // The MPS function name for computing the vertex normals on the GPU private let computeVertexNormalsFunctionName = "computeVertexNormals" @@ -713,7 +713,7 @@ extension Geometry { computeEncoder.endEncoding() commandBuffer.commit() - commandBuffer.waitUntilCompleted() + await commandBuffer.completed() // Finally, write the results to a cache file and create the MTLBuffer from it let data = Data(bytes: resultsBuffer.contents(), count: resultsBuffer.length) @@ -769,7 +769,7 @@ extension Geometry { computeEncoder.endEncoding() commandBuffer.commit() - commandBuffer.waitUntilCompleted() + await commandBuffer.completed() // For now, just loop through the instances on the CPU to calculate the world bounds // In the future we could do this on the GPU but juice really isn't worth the squeeze diff --git a/Sources/VimKitCompositor/Extensions/LayerRenderer+Extensions.swift b/Sources/VimKitCompositor/Extensions/LayerRenderer+Extensions.swift index 225d1a3..6b2571d 100644 --- a/Sources/VimKitCompositor/Extensions/LayerRenderer+Extensions.swift +++ b/Sources/VimKitCompositor/Extensions/LayerRenderer+Extensions.swift @@ -5,7 +5,7 @@ // Created by Kevin McKee // -#if canImport(CompositorServices) +#if os(visionOS) import CompositorServices import VimKit diff --git a/Sources/VimKitCompositor/LayerRenderer/CompositorRenderer+SpatialEvents.swift b/Sources/VimKitCompositor/LayerRenderer/CompositorRenderer+SpatialEvents.swift index f789255..e11a0ea 100644 --- a/Sources/VimKitCompositor/LayerRenderer/CompositorRenderer+SpatialEvents.swift +++ b/Sources/VimKitCompositor/LayerRenderer/CompositorRenderer+SpatialEvents.swift @@ -5,7 +5,7 @@ // Created by Kevin McKee // -#if canImport(CompositorServices) +#if os(visionOS) import SwiftUI import VimKit