Merged PR piemonte#180

chriszielinski · Jun 21, 2018 · 3a7a177 · 3a7a177
2 parents 8df8877 + ce0341a
commit 3a7a177
Show file tree

Hide file tree

Showing 4 changed files with 220 additions and 92 deletions.
diff --git a/Project/Player.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Project/Player.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Project/Player.xcodeproj/xcshareddata/xcschemes/Debug - iOS.xcscheme b/Project/Player.xcodeproj/xcshareddata/xcschemes/Debug - iOS.xcscheme
@@ -20,20 +20,6 @@
                ReferencedContainer = "container:Player.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "065A0FB11A25C8E2005BA7BC"
-               BuildableName = "PlayerTests.xctest"
-               BlueprintName = "PlayerTests"
-               ReferencedContainer = "container:Player.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
@@ -42,16 +28,6 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "065A0FB11A25C8E2005BA7BC"
-               BuildableName = "PlayerTests.xctest"
-               BlueprintName = "PlayerTests"
-               ReferencedContainer = "container:Player.xcodeproj">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
       <MacroExpansion>
          <BuildableReference

diff --git a/Project/Player/ViewController.swift b/Project/Player/ViewController.swift
@@ -43,8 +43,6 @@ class ViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        player.add(to: self)
-
         // Optional
         player.playerDelegate = self
         // Optional
@@ -57,6 +55,8 @@ class ViewController: UIViewController {
 
         player.playbackLoops = true
 
+        player.add(to: self)
+
         let tapGestureRecognizer = UITapGestureRecognizer(target: self,
                                                           action: #selector(handleTapGestureRecognizer(_:)))
         tapGestureRecognizer.numberOfTapsRequired = 1