Xcode 26 (#112)

Author: codefiesta

.github/workflows/codeql.yml

@@ -17,17 +17,14 @@ 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
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - 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:

.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

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)

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

Sources/VimKitCompositor/Extensions/LayerRenderer+Extensions.swift

@@ -5,7 +5,7 @@
 //  Created by Kevin McKee
 //
 
-#if canImport(CompositorServices)
+#if os(visionOS)
 import CompositorServices
 import VimKit
 

Sources/VimKitCompositor/LayerRenderer/CompositorRenderer+SpatialEvents.swift

@@ -5,7 +5,7 @@
 //  Created by Kevin McKee
 //
 
-#if canImport(CompositorServices)
+#if os(visionOS)
 import SwiftUI
 import VimKit