Skip to content

Commit

Permalink
update requirements to iOS 10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@tanhakabir
tanhakabir committed Feb 24, 2019
1 parent ea77964 commit e563ba2
Show file tree
Hide file tree
Showing 9 changed files with 43 additions and 91 deletions.
8 changes: 4 additions & 4 deletions Example/Pods/Pods.xcodeproj/project.pbxproj
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Example/SwiftAudioPlayer.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -458,7 +458,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
Expand Down
15 changes: 5 additions & 10 deletions Source/Engine/AudioDiskEngine.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,11 @@ class AudioDiskEngine: AudioEngine {
}


if #available(iOS 10.0, *) {
Timer.scheduledTimer(withTimeInterval: 0.2, repeats: true) { [weak self] (timer: Timer) in
guard let _ = self else { return }
self?.timer = timer
self?.updateIsPlaying()
self?.updateNeedle()
}
} else {
// TODO
// Fallback on earlier versions
Timer.scheduledTimer(withTimeInterval: 0.2, repeats: true) { [weak self] (timer: Timer) in
guard let _ = self else { return }
self?.timer = timer
self?.updateIsPlaying()
self?.updateNeedle()
}

scheduleAudioFile()
Expand Down
20 changes: 8 additions & 12 deletions Source/Engine/AudioStreamEngine.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,18 +141,14 @@ class AudioStreamEngine: AudioEngine {


let timeInterval = 1 / (converter.engineAudioFormat.sampleRate / Double(PCM_BUFFER_SIZE))
if #available(iOS 10.0, *) {
Timer.scheduledTimer(withTimeInterval: timeInterval / 32, repeats: true) { [weak self] (timer: Timer) in
self?.timer = timer
self?.pollForNextBuffer()
self?.updateNetworkBufferRange()
self?.updateNeedle()
self?.updateIsPlaying()
self?.updateDuration()
}
} else {
// TODO
// Fallback on earlier versions

Timer.scheduledTimer(withTimeInterval: timeInterval / 32, repeats: true) { [weak self] (timer: Timer) in
self?.timer = timer
self?.pollForNextBuffer()
self?.updateNetworkBufferRange()
self?.updateNeedle()
self?.updateIsPlaying()
self?.updateDuration()
}
}

Expand Down
20 changes: 8 additions & 12 deletions Source/LockScreenViewProtocol.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,20 +117,16 @@ extension LockScreenViewProtocol {
return .success
}

if #available(iOS 9.1, *) {
commandCenter.changePlaybackPositionCommand.addTarget { [weak presenter] event in
guard let presenter = presenter else {
return .commandFailed
}
if let positionEvent = event as? MPChangePlaybackPositionCommandEvent {
presenter.handleSeek(toNeedle: Needle(positionEvent.positionTime))
return .success
}

commandCenter.changePlaybackPositionCommand.addTarget { [weak presenter] event in
guard let presenter = presenter else {
return .commandFailed
}
} else {
// Fallback on earlier versions
if let positionEvent = event as? MPChangePlaybackPositionCommandEvent {
presenter.handleSeek(toNeedle: Needle(positionEvent.positionTime))
return .success
}

return .commandFailed
}
}

Expand Down
7 changes: 1 addition & 6 deletions Source/SAPlayer.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,7 @@ public class SAPlayer {
public var mediaInfo: SALockScreenInfo? = nil {
didSet {
if let info = mediaInfo {
if #available(iOS 10.0, *) {
presenter.handleLockscreenInfo(info: info)
} else {
// TODO
// Fallback on earlier versions
}
presenter.handleLockscreenInfo(info: info)
}
}
}
Expand Down
7 changes: 1 addition & 6 deletions Source/SAPlayerPresenter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,7 @@ class SAPlayerPresenter {
self.duration = duration

if let info = self.mediaInfo {
if #available(iOS 10.0, *) {
self.delegate?.setLockScreenInfo(withMediaInfo: info, duration: duration)
} else {
// TODO
// Fallback on earlier versions
}
self.delegate?.setLockScreenInfo(withMediaInfo: info, duration: duration)
}
})

Expand Down
49 changes: 12 additions & 37 deletions Source/Util/Log.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,8 @@ class Log {
public static func test(_ logMessage: Any, classPath: String = #file, functionName: String = #function, lineNumber: Int = #line) {
let fileName = URLUtil.getNameFromStringPath(classPath)
if logLevel.rawValue <= LogLevel.TEST.rawValue {
if #available(iOS 10.0, *) {
let log = OSLog(subsystem: SUBSYSTEM, category: "TEST ❇️❇️❇️❇️")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
} else {
print("\(Date().timeStamp()) TEST ❇️❇️❇️❇️ in \(fileName):\(functionName):\(lineNumber):: \(logMessage)")
}

let log = OSLog(subsystem: SUBSYSTEM, category: "TEST ❇️❇️❇️❇️")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
}
}

Expand All @@ -70,12 +65,8 @@ class Log {
public static func error(_ logMessage: Any, classPath: String = #file, functionName: String = #function, lineNumber: Int = #line) {
let fileName = URLUtil.getNameFromStringPath(classPath)
if logLevel.rawValue <= LogLevel.ERROR.rawValue {
if #available(iOS 10.0, *) {
let log = OSLog(subsystem: SUBSYSTEM, category: "ERROR 🛑🛑🛑🛑")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
} else {
print("\(Date().timeStamp()) ERROR 🛑🛑🛑🛑 in \(fileName):\(functionName):\(lineNumber):: \(logMessage)")
}
let log = OSLog(subsystem: SUBSYSTEM, category: "ERROR 🛑🛑🛑🛑")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
}
}

Expand All @@ -95,12 +86,8 @@ class Log {
public static func monitor(_ logMessage: Any, classPath: String = #file, functionName: String = #function, lineNumber: Int = #line) {
let fileName = URLUtil.getNameFromStringPath(classPath)
if logLevel.rawValue <= LogLevel.ERROR.rawValue {
if #available(iOS 10.0, *) {
let log = OSLog(subsystem: SUBSYSTEM, category: "MONITOR 🔥🔥🔥🔥")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
} else {
print("\(Date().timeStamp()) MONITOR 🔥🔥🔥🔥 in \(fileName):\(functionName):\(lineNumber):: \(logMessage)")
}
let log = OSLog(subsystem: SUBSYSTEM, category: "MONITOR 🔥🔥🔥🔥")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
}
}

Expand All @@ -120,12 +107,8 @@ class Log {
public static func warn(_ logMessage: Any, classPath: String = #file, functionName: String = #function, lineNumber: Int = #line) {
let fileName = URLUtil.getNameFromStringPath(classPath)
if logLevel.rawValue <= LogLevel.WARN.rawValue {
if #available(iOS 10.0, *) {
let log = OSLog(subsystem: SUBSYSTEM, category: "WARN ⚠️⚠️⚠️⚠️")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
} else {
print("\(Date().timeStamp()) WARN ⚠️⚠️⚠️⚠️ in \(fileName):\(functionName):\(lineNumber):: \(logMessage)")
}
let log = OSLog(subsystem: SUBSYSTEM, category: "WARN ⚠️⚠️⚠️⚠️")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
}
}

Expand All @@ -145,12 +128,8 @@ class Log {
public static func info(_ logMessage: Any, classPath: String = #file, functionName: String = #function, lineNumber: Int = #line) {
let fileName = URLUtil.getNameFromStringPath(classPath)
if logLevel.rawValue <= LogLevel.INFO.rawValue {
if #available(iOS 10.0, *) {
let log = OSLog(subsystem: SUBSYSTEM, category: "INFO 🖤🖤🖤🖤")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
} else {
print("\(Date().timeStamp()) INFO 🖤🖤🖤🖤 in \(fileName):\(functionName):\(lineNumber):: \(logMessage)")
}
let log = OSLog(subsystem: SUBSYSTEM, category: "INFO 🖤🖤🖤🖤")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
}
}

Expand All @@ -170,12 +149,8 @@ class Log {
public static func debug(_ logMessage: Any?..., classPath: String = #file, functionName: String = #function, lineNumber: Int = #line) {
let fileName = URLUtil.getNameFromStringPath(classPath)
if logLevel.rawValue <= LogLevel.DEBUG.rawValue {
if #available(iOS 10.0, *) {
let log = OSLog(subsystem: SUBSYSTEM, category: "DEBUG 🐝🐝🐝🐝")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
} else {
print("\(Date().timeStamp()) DEBUG 🐝🐝🐝🐝 in \(fileName):\(functionName):\(lineNumber):: \(logMessage)")
}
let log = OSLog(subsystem: SUBSYSTEM, category: "DEBUG 🐝🐝🐝🐝")
os_log("%@:%@:%d:: %@", log: log, fileName, functionName, lineNumber, "\(logMessage)")
}
}

Expand Down
4 changes: 2 additions & 2 deletions SwiftAudioPlayer.podspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ SwiftAudioPlayer is a Swift based audio player that can handle streaming from a
s.source = { :git => 'https://github.com/tanhakabir/SwiftAudioPlayer.git', :tag => s.version.to_s }
# s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'

s.ios.deployment_target = '8.0'
s.ios.deployment_target = '10.0'

s.source_files = 'SwiftAudioPlayer/Classes/**/*'
s.source_files = 'Source/**/*'
s.swift_version = '4.0'

# s.resource_bundles = {
Expand Down

0 comments on commit e563ba2

Please sign in to comment.