Skip to content

Commit

Permalink
Fix swift-build-xcframework errors
Browse files Browse the repository at this point in the history
  • Loading branch information
b3ll committed Nov 10, 2022
1 parent 76efdce commit 052d056
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Sources/Motion/Utilities/AnimationDriver.swift
Expand Up @@ -24,7 +24,7 @@ final class CoreAnimationDriver: AnimationDriver {

private var displayLink: CADisplayLink!

@available(iOS 15.0, macOS 12.0, *)
@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
public var preferredFrameRateRange: CAFrameRateRange {
get {
return displayLink.preferredFrameRateRange
Expand All @@ -34,7 +34,7 @@ final class CoreAnimationDriver: AnimationDriver {
}
}

@available(iOS 15.0, macOS 12.0, *)
@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
internal static var defaultPreferredFrameRateRange: CAFrameRateRange {
// Find the first connected scene that's a UIWindowScene and is active, then find the highest supported refresh rate.
let connectedScenes = UIApplication.shared.connectedScenes
Expand All @@ -51,7 +51,7 @@ final class CoreAnimationDriver: AnimationDriver {
init?() {
displayLink = CADisplayLink(target: self, selector: #selector(tick))
displayLink.add(to: .main, forMode: .common)
if #available(iOS 15.0, *) {
if #available(iOS 15.0, tvOS 15.0, *) {
displayLink.preferredFrameRateRange = Self.defaultPreferredFrameRateRange
}
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/Motion/Utilities/Animator.swift
Expand Up @@ -29,7 +29,7 @@ public class Animator: NSObject, AnimationDriverObserver {
internal var runningAnimations: NSHashTable<Animation> = .weakObjects()

#if os(iOS)
@available(iOS 15.0, macOS 12.0, *)
@available(iOS 15.0, macOS 12.0, tvOS 15.0, *)
/**
The preferred frame rate range for animations being run.
Expand All @@ -49,7 +49,7 @@ public class Animator: NSObject, AnimationDriverObserver {
var preferredFramesPerSecond: Int {
let defaultFPS = 60

if #available(iOS 15.0, macOS 12.0, *) {
if #available(iOS 15.0, macOS 12.0, tvOS 15.0, *) {
// `.default` doesn't have any values, so we want to default to 60 fps.
if let preferredFrameRateRange = (animationDriver as? CoreAnimationDriver)?.preferredFrameRateRange {
if preferredFrameRateRange == .default {
Expand Down
4 changes: 2 additions & 2 deletions Tests/MotionTests/MotionTests.swift
Expand Up @@ -177,14 +177,14 @@ final class MotionTests: XCTestCase {
func testChangingAnimatorPreferredFrameRateRange() {
let defaultFPS = 60

if #available(iOS 15.0, *) {
if #available(iOS 15.0, tvOS 15.0, *) {
Animator.shared.preferredFrameRateRange = .default
}

XCTAssert(Animator.shared.preferredFramesPerSecond == defaultFPS)

let proMotionFPS = 120
if #available(iOS 15.0, *) {
if #available(iOS 15.0, tvOS 15.0, *) {
Animator.shared.preferredFrameRateRange = CAFrameRateRange(minimum: 80.0, maximum: Float(proMotionFPS), preferred: Float(proMotionFPS))
}

Expand Down

0 comments on commit 052d056

Please sign in to comment.