diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1231b58417..425ac41aa7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,16 +9,14 @@ on: jobs: build-package: name: "Build Package" - # The macos-11 image includes Xcode 12 releases, but the macos-12 - # image only includes Xcode 13 releases. We still need to use macos-11 - # on this job to build using Swift 5.3 and Swift 5.4. - runs-on: macos-11 + runs-on: macos-12 strategy: + fail-fast: false matrix: xcode: - - '12.4' # Swift 5.3 - - '12.5.1' # Swift 5.4 - - '13.2' # Swift 5.5 + - '13.2.1' # Swift 5.5 + - '13.4.1' # Swift 5.6 + - '14.0.1' # Swift 5.7 steps: - uses: actions/checkout@v2 - uses: ./.github/actions/setup diff --git a/Package.swift b/Package.swift index 279f319766..d0e136756e 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:5.5 import PackageDescription let package = Package( diff --git a/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift b/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift index ec83009ea5..1a017ab3b7 100644 --- a/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift +++ b/Sources/Private/CoreAnimation/Animations/CALayer+addAnimation.swift @@ -233,8 +233,8 @@ extension CALayer { NSNumber(value: Float(context.progressTime(for: keyframeModel.time))) } - var timingFunctions = self.timingFunctions(for: keyframes) - let calculationMode = self.calculationMode(for: keyframes) + var timingFunctions = timingFunctions(for: keyframes) + let calculationMode = calculationMode(for: keyframes) let animation = CAKeyframeAnimation(keyPath: property.caLayerKeypath) diff --git a/Sources/Private/Utility/Debugging/LayerDebugging.swift b/Sources/Private/Utility/Debugging/LayerDebugging.swift index 41a91fb83b..15e736e4f7 100644 --- a/Sources/Private/Utility/Debugging/LayerDebugging.swift +++ b/Sources/Private/Utility/Debugging/LayerDebugging.swift @@ -75,7 +75,7 @@ extension CALayer { @nonobjc func setDebuggingState(visible: Bool) { - var sublayers = self.sublayers + var sublayers = sublayers if let cust = self as? CustomLayerDebugging { sublayers = cust.layerForDebugging().sublayers } diff --git a/Sources/Private/Utility/Extensions/AnimationKeypathExtension.swift b/Sources/Private/Utility/Extensions/AnimationKeypathExtension.swift index 95e9e9dd84..52119974c0 100644 --- a/Sources/Private/Utility/Extensions/AnimationKeypathExtension.swift +++ b/Sources/Private/Utility/Extensions/AnimationKeypathExtension.swift @@ -225,8 +225,8 @@ extension String { } if let index = firstIndex(of: "*") { // Wildcard search. - let prefix = String(self.prefix(upTo: index)) - let suffix = String(self.suffix(from: self.index(after: index))) + let prefix = String(prefix(upTo: index)) + let suffix = String(suffix(from: self.index(after: index))) if prefix.count > 0 { // Match prefix. diff --git a/Sources/Public/Animation/LottieAnimationView.swift b/Sources/Public/Animation/LottieAnimationView.swift index eb3bf25bf0..284a397974 100644 --- a/Sources/Public/Animation/LottieAnimationView.swift +++ b/Sources/Public/Animation/LottieAnimationView.swift @@ -1121,8 +1121,8 @@ final public class LottieAnimationView: LottieAnimationViewBase { """) - let animationContext = self.animationContext - let currentFrame = self.currentFrame + let animationContext = animationContext + let currentFrame = currentFrame makeAnimationLayer(usingEngine: .mainThread) diff --git a/lottie-ios.podspec b/lottie-ios.podspec index cd8a884d15..8de79263d6 100644 --- a/lottie-ios.podspec +++ b/lottie-ios.podspec @@ -22,7 +22,7 @@ Lottie enables designers to create and ship beautiful animations without an engi s.author = { 'Brandon Withrow' => 'buba447@gmail.com', 'Cal Stephens' => 'cal.stephens@airbnb.com' } s.source = { :git => 'https://github.com/airbnb/lottie-ios.git', :tag => s.version.to_s } - s.swift_version = '5.3' + s.swift_version = '5.5' s.ios.deployment_target = '11.0' s.osx.deployment_target = '10.10' s.tvos.deployment_target = '11.0'