Merge pull request #36 from jorgenhenrichsen/swift4.2

- Update to Swift 4.2
- Use Xcode 10.1 in CI
- Fix some compiler warnings in the project
- Removes custom `AudioSessionCategory`-enum as `AudioSession.Category` is introduced with Swift 4.2

.swift-version

@@ -1 +1 @@
-4.0
+4.2

.travis.yml

@@ -2,15 +2,15 @@
 # * http://www.objc.io/issue-6/travis-ci.html
 # * https://github.com/supermarin/xcpretty#usage
 
-osx_image: xcode9.4
+osx_image: xcode10.1
 language: swift
 cache: cocoapods
 podfile: Example/Podfile
 before_install:
 - gem install cocoapods # Since Travis is not always on latest version
 - pod install --project-directory=Example --repo-update
 script:
-- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/SwiftAudio.xcworkspace -scheme SwiftAudio-Example -sdk iphonesimulator11.4 -destination "OS=11.4,name=iPhone X" | xcpretty
+- set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/SwiftAudio.xcworkspace -scheme SwiftAudio-Example -sdk iphonesimulator12.1 -destination "OS=11.4,name=iPhone X" | xcpretty
 - pod lib lint
 
 after_success:

Example/SwiftAudio.xcodeproj/project.pbxproj

@@ -286,13 +286,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = CocoaPods;
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = HPNZWPB9JK;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1010;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -302,7 +302,7 @@
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
 						DevelopmentTeam = HPNZWPB9JK;
-						LastSwiftMigration = 0900;
+						LastSwiftMigration = 1010;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
 				};
@@ -507,12 +507,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -560,12 +562,14 @@
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -606,8 +610,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -624,8 +627,7 @@
 				MODULE_NAME = ExampleApp;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
@@ -647,8 +649,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftAudio_Example.app/SwiftAudio_Example";
 			};
 			name = Debug;
@@ -666,8 +667,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SwiftAudio_Example.app/SwiftAudio_Example";
 			};
 			name = Release;

Example/SwiftAudio.xcodeproj/xcshareddata/xcschemes/SwiftAudio-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0900"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/SwiftAudio/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
 
         application.beginReceivingRemoteControlEvents()

Example/SwiftAudio/QueueViewController.swift

@@ -46,7 +46,7 @@ extension QueueViewController: UITableViewDataSource, UITableViewDelegate {
         case 0:
             return 1
         case 1:
-            return controller.player.nextItems.count ?? 0
+            return controller.player.nextItems.count
         default:
             return 0
         }

Example/SwiftAudio/ViewController.swift

@@ -34,7 +34,7 @@ class ViewController: UIViewController {
         if (!controller.audioSessionController.audioSessionIsActive) {
             try? controller.audioSessionController.activateSession()
         }
-        try? controller.player.togglePlaying()
+        controller.player.togglePlaying()
     }
 
     @IBAction func previous(_ sender: Any) {
@@ -50,7 +50,7 @@ class ViewController: UIViewController {
     }
 
     @IBAction func scrubbing(_ sender: UISlider) {
-        try? controller.player.seek(to: Double(slider.value))
+        controller.player.seek(to: Double(slider.value))
     }
 
     @IBAction func scrubbingValueChanged(_ sender: UISlider) {

Example/Tests/AVPlayerObserverTests.swift

@@ -7,8 +7,8 @@ import AVFoundation
 
 class AVPlayerObserverTests: QuickSpec, AVPlayerObserverDelegate {
 
-    var status: AVPlayerStatus?
-    var timeControlStatus: AVPlayerTimeControlStatus?
+    var status: AVPlayer.Status?
+    var timeControlStatus: AVPlayer.TimeControlStatus?
 
     override func spec() {
 
@@ -58,11 +58,11 @@ class AVPlayerObserverTests: QuickSpec, AVPlayerObserverDelegate {
         }
     }
 
-    func player(statusDidChange status: AVPlayerStatus) {
+    func player(statusDidChange status: AVPlayer.Status) {
         self.status = status
     }
 
-    func player(didChangeTimeControlStatus status: AVPlayerTimeControlStatus) {
+    func player(didChangeTimeControlStatus status: AVPlayer.TimeControlStatus) {
         self.timeControlStatus = status
     }
 

Example/Tests/AVPlayerWrapperTests.swift

@@ -137,7 +137,7 @@ class AVPlayerWrapperTests: QuickSpec {
 
                 context("when loading source", {
                     beforeEach {
-                        wrapper.load(from: URL(fileURLWithPath: Source.path), playWhenReady: false)
+                        wrapper.load(from: URL(fileURLWithPath: LongSource.path), playWhenReady: false)
                     }
                     it("should eventually not be 0", closure: {
                         expect(wrapper.duration).toEventuallyNot(equal(0))

Example/Tests/AudioPlayerTests.swift

@@ -51,7 +51,7 @@ class AudioPlayerTests: QuickSpec {
                         holder.stateUpdate = { state in
                             print(state.rawValue)
                             if state == .ready {
-                                try? audioPlayer.play()
+                                audioPlayer.play()
                             }
                         }
                         try? audioPlayer.load(item: Source.getAudioItem(), playWhenReady: false)
@@ -69,7 +69,7 @@ class AudioPlayerTests: QuickSpec {
                         audioPlayer.delegate = holder
                         holder.stateUpdate = { (state) in
                             if state == .playing {
-                                try? audioPlayer.pause()
+                                audioPlayer.pause()
                             }
                         }
                         try? audioPlayer.load(item: Source.getAudioItem(), playWhenReady: true)

Example/Tests/AudioSessionControllerTests.swift

@@ -55,7 +55,7 @@ class AudioSessionControllerTests: QuickSpec {
                 context("when a interruption arrives", {
                     var delegate: AudioSessionControllerDelegateImplementation!
                     beforeEach {
-                        let notification = Notification(name: .AVAudioSessionInterruption, object: nil, userInfo: [
+                        let notification = Notification(name: AVAudioSession.interruptionNotification, object: nil, userInfo: [
                             AVAudioSessionInterruptionTypeKey: UInt(0)
                             ])
                         delegate = AudioSessionControllerDelegateImplementation()
@@ -92,9 +92,9 @@ class AudioSessionControllerTests: QuickSpec {
 
 class AudioSessionControllerDelegateImplementation: AudioSessionControllerDelegate {
 
-    var interruptionType: AVAudioSessionInterruptionType? = nil
+    var interruptionType: AVAudioSession.InterruptionType? = nil
 
-    func handleInterruption(type: AVAudioSessionInterruptionType) {
+    func handleInterruption(type: AVAudioSession.InterruptionType) {
         self.interruptionType = type
     }
 }

Example/Tests/Mocks/AudioSession.swift

@@ -14,39 +14,51 @@ import AVFoundation
 
 class NonFailingAudioSession: AudioSession {
 
-    var isOtherAudioPlaying: Bool = false
+    var category: AVAudioSession.Category = AVAudioSession.Category.playback
+
+    var mode: AVAudioSession.Mode = AVAudioSession.Mode.default
+
+    var categoryOptions: AVAudioSession.CategoryOptions = []
 
-    var availableCategories: [String] = []
+    var availableCategories: [AVAudioSession.Category] = []
+
+    var isOtherAudioPlaying: Bool = false
 
-    func setCategory(_ category: String) throws {}
+    func setCategory(_ category: AVAudioSession.Category, mode: AVAudioSession.Mode, options: AVAudioSession.CategoryOptions) throws {}
 
-    func setCategory(_ category: String, mode: String, options: AVAudioSessionCategoryOptions) throws {}
+    func setCategory(_ category: AVAudioSession.Category, mode: AVAudioSession.Mode, policy: AVAudioSession.RouteSharingPolicy, options: AVAudioSession.CategoryOptions) throws {}
 
     func setActive(_ active: Bool) throws {}
 
-    func setActive(_ active: Bool, with options: AVAudioSessionSetActiveOptions) throws {}
+    func setActive(_ active: Bool, options: AVAudioSession.SetActiveOptions) throws {}
 
 }
 
 class FailingAudioSession: AudioSession {
 
-    var isOtherAudioPlaying: Bool = false
+    var category: AVAudioSession.Category = AVAudioSession.Category.playback
+
+    var mode: AVAudioSession.Mode = AVAudioSession.Mode.default
+
+    var categoryOptions: AVAudioSession.CategoryOptions = AVAudioSession.CategoryOptions.allowBluetooth
 
-    var availableCategories: [String] = []
+    var availableCategories: [AVAudioSession.Category] = []
+
+    var isOtherAudioPlaying: Bool = false
 
-    func setCategory(_ category: String) throws {
+    func setCategory(_ category: AVAudioSession.Category, mode: AVAudioSession.Mode, options: AVAudioSession.CategoryOptions) throws {
         throw AVError(AVError.unknown)
     }
 
-    func setCategory(_ category: String, mode: String, options: AVAudioSessionCategoryOptions) throws {
+    func setCategory(_ category: AVAudioSession.Category, mode: AVAudioSession.Mode, policy: AVAudioSession.RouteSharingPolicy, options: AVAudioSession.CategoryOptions) throws {
         throw AVError(AVError.unknown)
     }
 
     func setActive(_ active: Bool) throws {
         throw AVError(AVError.unknown)
     }
 
-    func setActive(_ active: Bool, with options: AVAudioSessionSetActiveOptions) throws {
+    func setActive(_ active: Bool, options: AVAudioSession.SetActiveOptions) throws {
         throw AVError(AVError.unknown)
     }
 

Example/Tests/QueueManagerTests.swift

@@ -83,7 +83,7 @@ class QueueManagerTests: QuickSpec {
 
                 context("then replacing the item", closure: {
                     beforeEach {
-                        try? manager.replaceCurrentItem(with: 1)
+                        manager.replaceCurrentItem(with: 1)
                     }
                     it("should have replaced the current item", closure: {
                         expect(manager.current).to(equal(1))
@@ -217,7 +217,7 @@ class QueueManagerTests: QuickSpec {
                         var removed: Int?
                         var initialCurrentIndex: Int!
                         beforeEach {
-                            try? manager.jump(to: 3)
+                            let _ = try? manager.jump(to: 3)
                             initialCurrentIndex = manager.currentIndex
                             removed = try? manager.removeItem(at: initialCurrentIndex - 1)
                         }