Changed MotionOptions optionset to use lower case to match newer Swift naming convention

Author: poetmountain

Package.swift

@@ -32,13 +32,16 @@ let package = Package(
     platforms: [
         .iOS(.v8), .tvOS(.v9)
     ],
+    products: [
+        .library(name: "MotionMachine", targets: ["MotionMachine"])
+    ],
     targets: [
         .target(name: "MotionMachine", path: "Sources/"),
         .testTarget(
-          name: "MotionMachineTests",
-          dependencies: ["MotionMachine"],
-          path: "Tests/Tests/"
-      )
+            name: "MotionMachineTests",
+            dependencies: ["MotionMachine"],
+            path: "Tests/Tests/"
+        )
     ],
     swiftLanguageVersions: [.v5]
 )

README.md

@@ -1,6 +1,6 @@
 ![MotionMachine logo](Guides/mmlogo.png)
 
-![swift](https://img.shields.io/badge/Swift-4.2-005AA5.svg)
+![swift](https://img.shields.io/badge/Swift-5.0-005AA5.svg)
 ![platforms](https://img.shields.io/badge/platforms-iOS%20%7C%20tvOS-005AA5.svg)
 ![license](https://img.shields.io/badge/license-MIT-005AA5.svg)
 
@@ -170,7 +170,7 @@ Or add the Sources directory to your project.
 ## Compatibility
 
 MotionMachine currently requires:
-* Swift 4.2
+* Swift 5.0
 * Xcode 10.0 or later
 * iOS 8.0 or later, tvOS 9.0 or later
 

Sources/Motion.swift

@@ -522,7 +522,7 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
      *      - easing: An optional `EasingUpdateClosure` easing equation to use when moving the values of the given properties. `EasingLinear.easeNone()` is the default equation if none is provided.
      *      - options: An optional set of `MotionsOptions`.
      */
-    public convenience init(target targetObject: NSObject, properties: [PropertyData], duration: TimeInterval, easing: EasingUpdateClosure?=EasingLinear.easeNone(), options: MotionOptions?=MotionOptions.None) {
+    public convenience init(target targetObject: NSObject, properties: [PropertyData], duration: TimeInterval, easing: EasingUpdateClosure?=EasingLinear.easeNone(), options: MotionOptions? = .none) {
 
         self.init(target: targetObject, properties: properties, statesForProperties: nil, duration: duration, easing: easing, options: options)
 
@@ -537,7 +537,7 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
      *      - easing: An optional `EasingUpdateClosure` easing equation to use when moving the values of the given properties. `EasingLinear.easeNone()` is the default equation if none is provided.
      *      - options: An optional set of `MotionsOptions`.
      */
-    public convenience init(target targetObject: NSObject, duration: TimeInterval, easing: EasingUpdateClosure?=EasingLinear.easeNone(), options: MotionOptions?=MotionOptions.None) {
+    public convenience init(target targetObject: NSObject, duration: TimeInterval, easing: EasingUpdateClosure?=EasingLinear.easeNone(), options: MotionOptions? = .none) {
 
         self.init(target: targetObject, properties: [], statesForProperties: nil, duration: duration, easing: easing, options: options)
     }
@@ -552,13 +552,13 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
      *      - easing: An optional `EasingUpdateClosure` easing equation to use when moving the values of the given properties. `EasingLinear.easeNone()` is the default equation if none is provided.
      *      - options: An optional set of `MotionsOptions`.
      */
-    public convenience init(target targetObject: NSObject, statesForProperties templateObjects: [PropertyStates], duration: TimeInterval, easing: EasingUpdateClosure?=EasingLinear.easeNone(), options: MotionOptions?=MotionOptions.None) {
+    public convenience init(target targetObject: NSObject, statesForProperties templateObjects: [PropertyStates], duration: TimeInterval, easing: EasingUpdateClosure?=EasingLinear.easeNone(), options: MotionOptions? = .none) {
 
         self.init(target: targetObject, properties: nil, statesForProperties: templateObjects, duration: duration, easing: easing, options: options)
     }
 
 
-    private init(target targetObject: NSObject, properties props: [PropertyData]?, statesForProperties: [PropertyStates]?, duration: TimeInterval, easing: EasingUpdateClosure?, options: MotionOptions?) {
+    private init(target targetObject: NSObject, properties props: [PropertyData]?, statesForProperties: [PropertyStates]?, duration: TimeInterval, easing: EasingUpdateClosure?, options: MotionOptions? = .none) {
 
         var properties = props ?? []
 
@@ -578,9 +578,11 @@ public class Motion: Moveable, Additive, TempoDriven, PropertyDataDelegate {
         #endif
 
         // unpack options values
-        repeating = options!.contains(.Repeat)
-        reversing = options!.contains(.Reverse)
-        resetObjectStateOnRepeat = options!.contains(.ResetStateOnRepeat)
+        if let unwrappedOptions = options {
+            repeating = unwrappedOptions.contains(.repeats)
+            reversing = unwrappedOptions.contains(.reverses)
+            resetObjectStateOnRepeat = unwrappedOptions.contains(.resetsStateOnRepeat)
+        }
 
         motionState = .stopped
         motionDirection = .forward

Sources/MotionGroup.swift

@@ -468,11 +468,13 @@ public class MotionGroup: Moveable, MoveableCollection, TempoDriven, MotionUpdat
      *      - motions: An array of `Moveable` objects which the MotionGroup should control.
      *      - options: An optional set of `MotionsOptions`.
      */
-    public init(motions: [Moveable]=[], options: MotionOptions?=MotionOptions.None) {
+    public init(motions: [Moveable] = [], options: MotionOptions? = .none) {
 
         // unpack options values
-        repeating = options!.contains(.Repeat)
-        _reversing = options!.contains(.Reverse)
+        if let unwrappedOptions = options {
+            repeating = unwrappedOptions.contains(.repeats)
+            _reversing = unwrappedOptions.contains(.reverses)
+        }
 
         motionState = .stopped
         motionDirection = .forward

Sources/MotionMachine.swift

@@ -505,20 +505,20 @@ public struct MotionOptions : OptionSet {
     public init(rawValue: Int) { self.rawValue = rawValue }
 
     /// No options are specified.
-    public static let None                     = MotionOptions(rawValue: 0)
+    public static let none                     = MotionOptions(rawValue: 0)
 
     /// Specifies that a motion should repeat.
-    public static let Repeat                   = MotionOptions(rawValue: 1 << 0)
+    public static let repeats                   = MotionOptions(rawValue: 1 << 0)
 
     /// Specifies that a motion should reverse directions after moving in the forward direction.
-    public static let Reverse                  = MotionOptions(rawValue: 1 << 1)
+    public static let reverses                  = MotionOptions(rawValue: 1 << 1)
 
     /**
      *  Specifies that a motion's property (or parent, if property is not KVC-compliant) should be reset to its starting value on repeats or restarts.
      *
      *  - remark: `Motion` and `PhysicsMotion` are the only MotionMachine classes that currently accept this option.
      */
-    public static let ResetStateOnRepeat       = MotionOptions(rawValue: 1 << 2)
+    public static let resetsStateOnRepeat       = MotionOptions(rawValue: 1 << 2)
 }
 
 

Sources/MotionSequence.swift

@@ -485,11 +485,13 @@ public class MotionSequence: Moveable, MoveableCollection, TempoDriven, MotionUp
      *      - steps: An array of `Moveable` objects the MotionSequence should control. The positions of the objects in the Array will determine the order in which the child motions should move.
      *      - options: An optional set of `MotionsOptions`.
      */
-    public init(steps: [Moveable]=[], options: MotionOptions?=MotionOptions.None) {
+    public init(steps: [Moveable] = [], options: MotionOptions? = .none) {
 
         // unpack options values
-        repeating = options!.contains(.Repeat)
-        _reversing = options!.contains(.Reverse)
+        if let unwrappedOptions = options {
+            repeating = unwrappedOptions.contains(.repeats)
+            _reversing = unwrappedOptions.contains(.reverses)
+        }
 
         motionState = .stopped
         motionDirection = .forward

Sources/PhysicsMotion.swift

@@ -547,7 +547,7 @@ public class PhysicsMotion: Moveable, Additive, TempoDriven, PropertyDataDelegat
      *      - friction: The friction used to calculate new values in the `PhysicsSolving` system. Acceptable values are 0.0 (no friction) to 1.0 (no movement); values outside of this range will be clamped to the nearest edge.
      *      - options: An optional set of `MotionsOptions`.
      */
-    public convenience init(target targetObject: NSObject, properties: [PropertyData], velocity: Double, friction: Double, options: MotionOptions?=MotionOptions.None) {
+    public convenience init(target targetObject: NSObject, properties: [PropertyData], velocity: Double, friction: Double, options: MotionOptions? = .none) {
 
         self.init(targetObject: targetObject, properties: properties, velocity: velocity, friction: friction, options: options)
 
@@ -562,13 +562,13 @@ public class PhysicsMotion: Moveable, Additive, TempoDriven, PropertyDataDelegat
      *      - friction: The friction used to calculate new values in the `PhysicsSolving` system. Acceptable values are 0.0 (no friction) to 1.0 (no movement); values outside of this range will be clamped to the nearest edge.
      *      - options: An optional set of `MotionsOptions`.
      */
-    public convenience init(target targetObject: NSObject, velocity: Double, friction: Double, options: MotionOptions?=MotionOptions.None) {
+    public convenience init(target targetObject: NSObject, velocity: Double, friction: Double, options: MotionOptions? = .none) {
 
         self.init(targetObject: targetObject, properties: [], velocity: velocity, friction: friction, options: options)
     }
 
 
-    private init(targetObject: NSObject, properties props: [PropertyData]?, velocity: Double, friction: Double, options: MotionOptions?) {
+    private init(targetObject: NSObject, properties props: [PropertyData]?, velocity: Double, friction: Double, options: MotionOptions? = .none) {
 
         let properties = props ?? []
 
@@ -583,9 +583,11 @@ public class PhysicsMotion: Moveable, Additive, TempoDriven, PropertyDataDelegat
         #endif
 
         // unpack options values
-        repeating = options!.contains(.Repeat)
-        reversing = options!.contains(.Reverse)
-        resetObjectStateOnRepeat = options!.contains(.ResetStateOnRepeat)
+        if let unwrappedOptions = options {
+            repeating = unwrappedOptions.contains(.repeats)
+            reversing = unwrappedOptions.contains(.reverses)
+            resetObjectStateOnRepeat = unwrappedOptions.contains(.resetsStateOnRepeat)
+        }
 
         motionState = .stopped
         motionDirection = .forward

Tests/Tests/MotionGroupTests.swift

@@ -165,7 +165,7 @@ class MotionGroupTests: XCTestCase {
         let did_repeat = expectation(description: "group called cycleRepeated notify closure")
         let did_complete = expectation(description: "group called completed notify closure")
 
-        let group = MotionGroup(motions: [motion, motion2], options: [.Repeat])
+        let group = MotionGroup(motions: [motion, motion2], options: [.repeats])
         .cycleRepeated({ (group) in
             XCTAssertEqual(group.totalProgress, 0.5)
             XCTAssertEqual(group.cycleProgress, 0.0)
@@ -206,7 +206,7 @@ class MotionGroupTests: XCTestCase {
         let did_reverse = expectation(description: "group called reversed notify closure")
         let did_complete = expectation(description: "group called completed notify closure")
 
-        let group = MotionGroup(motions: [motion, motion2], options: [.Reverse])
+        let group = MotionGroup(motions: [motion, motion2], options: [.reverses])
             .reversed({ (group) in
                 XCTAssertTrue(group.totalProgress <= 0.5)
                 XCTAssertTrue(group.cycleProgress <= 0.5)

Tests/Tests/MotionSequenceTests.swift

@@ -173,7 +173,7 @@ class MotionSequenceTests: XCTestCase {
         let motion3 = Motion(target: tester, properties: [PropertyData("value", 40.0)], duration: 0.2)
         let motion4 = Motion(target: tester, properties: [PropertyData("value", 60.0)], duration: 0.2)
 
-        let sequence = MotionSequence(steps: [group, motion3, motion4], options: [.Repeat])
+        let sequence = MotionSequence(steps: [group, motion3, motion4], options: [.repeats])
         .cycleRepeated { (sequence) in
             let motion = sequence.steps.first as! MotionGroup
             XCTAssertTrue(sequence.currentStep() === motion)
@@ -214,7 +214,7 @@ class MotionSequenceTests: XCTestCase {
         let motion3 = Motion(target: tester, properties: [PropertyData("value", 40.0)], duration: 0.2)
         let motion4 = Motion(target: tester, properties: [PropertyData("value", 60.0)], duration: 0.2)
 
-        let sequence = MotionSequence(steps: [group, motion3, motion4], options: [.Reverse])
+        let sequence = MotionSequence(steps: [group, motion3, motion4], options: [.reverses])
         .reversed({ (sequence) in
             let motion = sequence.steps.last as! Motion
 
@@ -279,7 +279,7 @@ class MotionSequenceTests: XCTestCase {
         let motion5 = Motion(target: tester, properties: [PropertyData("value", 80.0)], duration: 0.2)
         let sub_sequence = MotionSequence(steps: [motion3, motion4])
 
-        let sequence = MotionSequence(steps: [group, sub_sequence, motion5], options: [.Reverse])
+        let sequence = MotionSequence(steps: [group, sub_sequence, motion5], options: [.reverses])
             .reversed({ (sequence) in
                 let motion = sequence.steps.last as! Motion
                 let subsequence = sequence.steps[1] as! MotionSequence
@@ -350,7 +350,7 @@ class MotionSequenceTests: XCTestCase {
         let motion4 = Motion(target: tester, properties: [PropertyData("value", 60.0)], duration: 0.2)
         let sub_sequence = MotionSequence(steps: [motion3, motion4])
 
-        let sequence = MotionSequence(steps: [group, sub_sequence], options: [.Reverse])
+        let sequence = MotionSequence(steps: [group, sub_sequence], options: [.reverses])
             .reversed({ (sequence) in
                 let motion = sequence.steps.first as! MotionGroup
                 let subsequence = sequence.steps.last as! MotionSequence
@@ -419,7 +419,7 @@ class MotionSequenceTests: XCTestCase {
         let sub_sequence = MotionSequence(steps: [motion3, motion4])
         let motion5 = Motion(target: tester, properties: [PropertyData("value", 80.0)], duration: 0.2)
 
-        let sequence = MotionSequence(steps: [group, sub_sequence, motion5], options: [.Reverse])
+        let sequence = MotionSequence(steps: [group, sub_sequence, motion5], options: [.reverses])
             .reversed({ (sequence) in
                 let motion = sequence.steps.last as! Motion
                 let subsequence = sequence.steps[1] as! MotionSequence
@@ -486,7 +486,7 @@ class MotionSequenceTests: XCTestCase {
         let motion3 = Motion(target: tester, properties: [PropertyData("value", 40.0)], duration: 0.2)
         let motion4 = Motion(target: tester, properties: [PropertyData("value", 60.0)], duration: 0.2)
 
-        let sequence = MotionSequence(steps: [group, motion3, motion4], options: [.Reverse])
+        let sequence = MotionSequence(steps: [group, motion3, motion4], options: [.reverses])
             .reversed({ (sequence) in
                 let motion = sequence.steps.last as! Motion
 

Tests/Tests/MotionTests.swift

@@ -287,7 +287,7 @@ class MotionTests: XCTestCase {
         let did_repeat = expectation(description: "motion called cycleRepeated notify closure")
         let did_complete = expectation(description: "motion called completed notify closure")
 
-        let motion = Motion(target: tester, properties: [PropertyData("value", 100.0)], duration: 0.2, options:[.Repeat])
+        let motion = Motion(target: tester, properties: [PropertyData("value", 100.0)], duration: 0.2, options:[.repeats])
             .cycleRepeated({ (motion) in
                 XCTAssertEqual(motion.totalProgress, 0.5)
                 XCTAssertEqual(motion.cycleProgress, 0.0)
@@ -318,7 +318,7 @@ class MotionTests: XCTestCase {
         let did_reverse = expectation(description: "motion called reversed notify closure")
         let did_complete = expectation(description: "motion called completed notify closure")
 
-        let motion = Motion(target: tester, properties: [PropertyData("value", 100.0)], duration: 0.4, options:[.Reverse])
+        let motion = Motion(target: tester, properties: [PropertyData("value", 100.0)], duration: 0.4, options:[.reverses])
             .reversed({ (motion) in
                 XCTAssertTrue(motion.totalProgress <= 0.5)
                 XCTAssertTrue(motion.cycleProgress <= 0.5)
@@ -348,7 +348,7 @@ class MotionTests: XCTestCase {
         let did_repeat = expectation(description: "motion called cycleRepeated notify closure")
         let did_complete = expectation(description: "motion called completed notify closure")
 
-        let motion = Motion(target: tester, properties: [PropertyData("value", 100.0)], duration: 0.4, options:[.Reverse, .Repeat])
+        let motion = Motion(target: tester, properties: [PropertyData("value", 100.0)], duration: 0.4, options:[.reverses, .repeats])
             .reversed({ (motion) in
                 if (motion.cyclesCompletedCount == 0) {
                     XCTAssertTrue(motion.totalProgress <= 0.25)

Tests/Tests/PhysicsMotionTests.swift

@@ -163,7 +163,7 @@ class PhysicsMotionTests: XCTestCase {
         let did_repeat = expectation(description: "motion called cycleRepeated notify closure")
         let did_complete = expectation(description: "motion called completed notify closure")
 
-        let motion = PhysicsMotion(target: tester, properties: [PropertyData("value")], velocity: 2.0, friction: 0.98, options: [.Repeat])
+        let motion = PhysicsMotion(target: tester, properties: [PropertyData("value")], velocity: 2.0, friction: 0.98, options: [.repeats])
             .cycleRepeated({ (motion) in
                 XCTAssertEqual(motion.totalProgress, 0.5)
                 XCTAssertEqual(motion.cycleProgress, 0.0)
@@ -192,7 +192,7 @@ class PhysicsMotionTests: XCTestCase {
         let did_reverse = expectation(description: "motion called reversed notify closure")
         let did_complete = expectation(description: "motion called completed notify closure")
 
-        let motion = PhysicsMotion(target: tester, properties: [PropertyData("value")], velocity: 2.0, friction: 0.98, options: [.Reverse])
+        let motion = PhysicsMotion(target: tester, properties: [PropertyData("value")], velocity: 2.0, friction: 0.98, options: [.reverses])
             .reversed({ (motion) in
                 XCTAssertTrue(motion.totalProgress <= 0.5)
                 XCTAssertTrue(motion.cycleProgress <= 0.5)
@@ -220,7 +220,7 @@ class PhysicsMotionTests: XCTestCase {
         let did_repeat = expectation(description: "motion called cycleRepeated notify closure")
         let did_complete = expectation(description: "motion called completed notify closure")
 
-        let motion = PhysicsMotion(target: tester, properties: [PropertyData("value")], velocity: 2.0, friction: 0.98, options: [.Reverse, .Repeat])
+        let motion = PhysicsMotion(target: tester, properties: [PropertyData("value")], velocity: 2.0, friction: 0.98, options: [.reverses, .repeats])
             .reversed({ (motion) in
                 if (motion.cyclesCompletedCount == 0) {
                     XCTAssertTrue(motion.totalProgress <= 0.25)