From 8dc9148b46fcf93b08ea9d4ef9bdb5e4f700e008 Mon Sep 17 00:00:00 2001
From: Matt <85322+mattmassicotte@users.noreply.github.com>
Date: Sat, 2 Mar 2024 15:31:53 -0500
Subject: [PATCH] Expand/Moderize CI, support catalyst

---
 .github/workflows/ci.yml                 | 12 ++++++------
 Tests/TextStoryTests/TextViewTests.swift |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a02c4d..a6c5662 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,22 +14,22 @@ on:
       - main
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_15.0.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.2.app/Contents/Developer
 
 jobs:
   test:
     name: Test
-    runs-on: macOS-13
+    runs-on: macOS-14
     strategy:
       matrix:
         destination:
           - "platform=macOS"
+          - "platform=macOS,variant=Mac Catalyst"
           - "platform=iOS Simulator,name=iPhone 12"
           - "platform=tvOS Simulator,name=Apple TV"
-    
+          - "platform=visionOS Simulator,name=Apple Vision Pro"
+
     steps:
       - uses: actions/checkout@v4
-      - name: Install XCBeautify
-        run: brew install xcbeautify
       - name: Test platform ${{ matrix.destination }}
-        run: set -o pipefail && xcodebuild -scheme TextStory-Package -destination "${{ matrix.destination }}" test | xcbeautify --renderer github-actions
+        run: set -o pipefail && xcodebuild -scheme TextStory-Package -destination "${{ matrix.destination }}" test | xcbeautify
diff --git a/Tests/TextStoryTests/TextViewTests.swift b/Tests/TextStoryTests/TextViewTests.swift
index 0d8ca38..746cc85 100644
--- a/Tests/TextStoryTests/TextViewTests.swift
+++ b/Tests/TextStoryTests/TextViewTests.swift
@@ -2,7 +2,7 @@ import XCTest
 import TextStory
 import TextStoryTesting
 
-#if canImport(AppKit)
+#if canImport(AppKit) && !targetEnvironment(macCatalyst)
 extension NSTextView {
 	var text: String { string }
 }