Skip to content

codebase upgraded -> Swift 5 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Saffin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

codebase upgraded -> Swift 5 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions SlimLogger/SlimLogger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,34 +59,34 @@ open class Slim {
}

open class func trace<T>( _ message: @autoclosure () -> T, filename: String = #file, line: Int = #line) {
slim.logInternal(message, level: LogLevel.trace, filename: filename, line: line)
slim.logInternal(message(), level: LogLevel.trace, filename: filename, line: line)
}

open class func debug<T>( _ message: @autoclosure () -> T, filename: String = #file, line: Int = #line) {
slim.logInternal(message, level: LogLevel.debug, filename: filename, line: line)
slim.logInternal(message(), level: LogLevel.debug, filename: filename, line: line)
}

open class func info<T>( _ message: @autoclosure () -> T, filename: String = #file, line: Int = #line) {
slim.logInternal(message, level: LogLevel.info, filename: filename, line: line)
slim.logInternal(message(), level: LogLevel.info, filename: filename, line: line)
}

open class func warn<T>( _ message: @autoclosure () -> T, filename: String = #file, line: Int = #line) {
slim.logInternal(message, level: LogLevel.warn, filename: filename, line: line)
slim.logInternal(message(), level: LogLevel.warn, filename: filename, line: line)
}

open class func error<T>( _ message: @autoclosure () -> T, filename: String = #file, line: Int = #line) {
slim.logInternal(message, level: LogLevel.error, filename: filename, line: line)
slim.logInternal(message(), level: LogLevel.error, filename: filename, line: line)
}

open class func fatal<T>( _ message: @autoclosure () -> T, filename: String = #file, line: Int = #line) {
slim.logInternal(message, level: LogLevel.fatal, filename: filename, line: line)
slim.logInternal(message(), level: LogLevel.fatal, filename: filename, line: line)
}

fileprivate func logInternal<T>( _ message: @autoclosure () -> T, level: LogLevel, filename: String, line: Int) {
let cleanedfile = cleanedFilename(filename)
if isSourceFileEnabled(cleanedfile) {
for dest in logDestinations {
dest.log(message, level: level, filename: cleanedfile, line: line)
dest.log(message(), level: level, filename: cleanedfile, line: line)
}
}
}
Expand Down
15 changes: 10 additions & 5 deletions SlimLogger/SlimLogglyDestination.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class SlimLogglyDestination: LogDestination {
var userid: String?
fileprivate let dateFormatter = DateFormatter()
fileprivate var buffer: [String] = []
fileprivate var backgroundTaskIdentifier: UIBackgroundTaskIdentifier = UIBackgroundTaskInvalid
fileprivate var backgroundTaskIdentifier: UIBackgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
fileprivate lazy var standardFields: [String: String] = {
var dict: [String: String] = [:]
dict["lang"] = Locale.preferredLanguages[0]
Expand Down Expand Up @@ -138,7 +138,7 @@ class SlimLogglyDestination: LogDestination {
} else {
self.traceMessage(msg: "Neither error nor responsedata, something's wrong")
}
if self.backgroundTaskIdentifier != UIBackgroundTaskInvalid {
if self.backgroundTaskIdentifier != UIBackgroundTaskIdentifier.invalid {
self.endBackgroundTask()
}
})
Expand All @@ -147,9 +147,9 @@ class SlimLogglyDestination: LogDestination {
}

private func endBackgroundTask() {
if self.backgroundTaskIdentifier != UIBackgroundTaskInvalid {
UIApplication.shared.endBackgroundTask(self.backgroundTaskIdentifier)
self.backgroundTaskIdentifier = UIBackgroundTaskInvalid
if self.backgroundTaskIdentifier != UIBackgroundTaskIdentifier.invalid {
UIApplication.shared.endBackgroundTask(convertToUIBackgroundTaskIdentifier(self.backgroundTaskIdentifier.rawValue))
self.backgroundTaskIdentifier = UIBackgroundTaskIdentifier.invalid
print("Ending background task")
}
}
Expand All @@ -160,3 +160,8 @@ class SlimLogglyDestination: LogDestination {
}
}
}

// Helper function inserted by Swift 4.2 migrator.
fileprivate func convertToUIBackgroundTaskIdentifier(_ input: Int) -> UIBackgroundTaskIdentifier {
return UIBackgroundTaskIdentifier(rawValue: input)
}
13 changes: 7 additions & 6 deletions SlimLoggerExampleProject/SlimLoggerExampleProject.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@
TargetAttributes = {
E51237901B2239DB002EABDC = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1020;
};
E51237A51B2239DB002EABDC = {
CreatedOnToolsVersion = 6.3.1;
LastSwiftMigration = 0810;
LastSwiftMigration = 1020;
TestTargetID = E51237901B2239DB002EABDC;
};
};
Expand All @@ -208,6 +208,7 @@
developmentRegion = English;
hasScannedForEncodings = 0;
knownRegions = (
English,
en,
Base,
);
Expand Down Expand Up @@ -406,7 +407,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "se.baresi.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -419,7 +420,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "se.baresi.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
};
name = Release;
};
Expand All @@ -439,7 +440,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "se.baresi.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SlimLoggerExampleProject.app/SlimLoggerExampleProject";
};
name = Debug;
Expand All @@ -456,7 +457,7 @@
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "se.baresi.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 3.0;
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SlimLoggerExampleProject.app/SlimLoggerExampleProject";
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion SlimLoggerExampleProject/SlimLoggerExampleProject/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
let logglyDestination = SlimLogglyDestination()
logglyDestination.userid = "johndoe"
Expand Down