Merge pull request #18 from stonko1994/feature/add-visionos-support

Add visionOS support
stonko1994 · Jan 31, 2024 · fd0b125 · fd0b125
2 parents bc090eb + d5955ff
commit fd0b125
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,11 +7,41 @@ on:
       - opened
 
 jobs:
-  build:
-    runs-on: macos-latest
+  build-ios:
+    name: Build iOS
+    runs-on: macOS-14
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
+
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '15.2'
+
     - name: Build iOS
-      run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk iphonesimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-ios13.0-simulator"
-    - name: Build tvOS
-      run: swift build -Xswiftc "-sdk" -Xswiftc "`xcrun --sdk appletvsimulator --show-sdk-path`" -Xswiftc "-target" -Xswiftc "x86_64-apple-tvos13.0-simulator"
+      run: xcodebuild -scheme SimultaneouslyScrollView -destination "platform=iOS Simulator,name=iPhone 15 Pro,OS=latest"
+
+  build-tvos:
+    name: Build tvOS
+    runs-on: macOS-14
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.2'
+
+      - name: Build tvOS
+        run: xcodebuild -scheme SimultaneouslyScrollView -destination "platform=tvOS Simulator,name=Apple TV 4K (3rd generation),OS=latest"
+
+  build-visionos:
+    name: Build visionOS
+    runs-on: macOS-14
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: '15.2'
+
+      - name: Build visionOS
+        run: xcodebuild -scheme SimultaneouslyScrollView -destination "platform=visionOS Simulator,name=Apple Vision Pro,OS=latest"
diff --git a/.github/workflows/swiftlint.yml b/.github/workflows/swiftlint.yml
@@ -10,6 +10,6 @@ jobs:
   swiftlint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: SwiftLint
       uses: norio-nomura/[email protected]
diff --git a/Package.swift b/Package.swift
@@ -1,11 +1,12 @@
-// swift-tools-version:5.3
+// swift-tools-version:5.9
 import PackageDescription
 
 let package = Package(
     name: "SimultaneouslyScrollView",
     platforms: [
         .iOS(.v13),
-        .tvOS(.v13)
+        .tvOS(.v13),
+        .visionOS(.v1)
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.

diff --git a/Sources/SimultaneouslyScrollView/DefaultSimultaneouslyScrollViewHandler.swift b/Sources/SimultaneouslyScrollView/DefaultSimultaneouslyScrollViewHandler.swift
@@ -1,4 +1,4 @@
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import Combine
 import UIKit
 

diff --git a/Sources/SimultaneouslyScrollView/Extensions/UIScrollView+OffsetHelper.swift b/Sources/SimultaneouslyScrollView/Extensions/UIScrollView+OffsetHelper.swift
@@ -1,4 +1,4 @@
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import UIKit
 
 internal extension UIScrollView {

diff --git a/Sources/SimultaneouslyScrollView/Helper/ScrollViewDecorator.swift b/Sources/SimultaneouslyScrollView/Helper/ScrollViewDecorator.swift
@@ -1,4 +1,4 @@
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import Foundation
 import UIKit
 

diff --git a/Sources/SimultaneouslyScrollView/SimultaneouslyScrollViewDirection.swift b/Sources/SimultaneouslyScrollView/SimultaneouslyScrollViewDirection.swift
@@ -1,4 +1,4 @@
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import Foundation
 
 public struct SimultaneouslyScrollViewDirection: OptionSet {

diff --git a/Sources/SimultaneouslyScrollView/SimultaneouslyScrollViewHandler.swift b/Sources/SimultaneouslyScrollView/SimultaneouslyScrollViewHandler.swift
@@ -1,14 +1,15 @@
 import Combine
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
 import UIKit
 #endif
 
 /// Handler to enable simultaneously scrolling of `ScrollView`s
 @available(iOS 13, *)
 @available(tvOS 13, *)
+@available(visionOS 1, *)
 @available(macOS, unavailable)
 public protocol SimultaneouslyScrollViewHandler {
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
     /// Publisher to notify if the `ScrollView`s are scrolled to the bottom
     var scrolledToBottomPublisher: AnyPublisher<Bool, Never> { get }
 

diff --git a/Sources/SimultaneouslyScrollView/SimultaneouslyScrollViewHandlerFactory.swift b/Sources/SimultaneouslyScrollView/SimultaneouslyScrollViewHandlerFactory.swift
@@ -3,9 +3,10 @@ import Foundation
 /// Factory class to create `SimultaneouslyScrollViewHandler` instance
 @available(iOS 13, *)
 @available(tvOS 13, *)
+@available(visionOS 1, *)
 @available(macOS, unavailable)
 public class SimultaneouslyScrollViewHandlerFactory {
-#if os(iOS) || os(tvOS)
+#if os(iOS) || os(tvOS) || os(visionOS)
     /// Creates a new `SimultaneouslyScrollViewHandler` instance
     /// - Returns: A new `SimultaneouslyScrollViewHandler` instance
     public static func create() -> SimultaneouslyScrollViewHandler {