From 7bb6adca44be4138b16fa9fda116920ade3cbf04 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Sun, 7 Apr 2019 17:36:30 +0200 Subject: [PATCH 1/3] Migrate to Swift 5 --- Logger.xcodeproj/project.pbxproj | 11 ++++++----- Logger/Logger.swift | 2 +- Logger/Loggers/AgregateLogger.swift | 2 +- UnitTests/FileWriterTests.swift | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Logger.xcodeproj/project.pbxproj b/Logger.xcodeproj/project.pbxproj index bc89d56..2236301 100644 --- a/Logger.xcodeproj/project.pbxproj +++ b/Logger.xcodeproj/project.pbxproj @@ -210,10 +210,11 @@ TargetAttributes = { 2E58D35921316C3500BEF81A = { CreatedOnToolsVersion = 10.0; + LastSwiftMigration = 1020; }; 2EBF4B392122AA34008E4117 = { CreatedOnToolsVersion = 10.0; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; }; }; }; @@ -299,7 +300,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.UnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -316,7 +317,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.wnagrodzki.UnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; @@ -452,7 +453,7 @@ SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "Logger/Logger-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; @@ -471,7 +472,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; SWIFT_OBJC_BRIDGING_HEADER = "Logger/Logger-Bridging-Header.h"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; diff --git a/Logger/Logger.swift b/Logger/Logger.swift index 7953f48..4107095 100644 --- a/Logger/Logger.swift +++ b/Logger/Logger.swift @@ -107,7 +107,7 @@ extension Logger { public func log(_ message: @autoclosure () -> String, level: LogLevel, file: String = #file, line: Int = #line, function: String = #function) { let now = Date() let location = description(for: file, line: line, function: function) - log(time: now, level: level, location: location, message: message) + log(time: now, level: level, location: location, message: message()) } /// Returns location in format `": "`. diff --git a/Logger/Loggers/AgregateLogger.swift b/Logger/Loggers/AgregateLogger.swift index d9bffe4..eaba542 100644 --- a/Logger/Loggers/AgregateLogger.swift +++ b/Logger/Loggers/AgregateLogger.swift @@ -38,7 +38,7 @@ public final class AgregateLogger: Logger { public func log(time: Date, level: LogLevel, location: String, message: @autoclosure () -> String) { for logger in self.loggers { - logger.log(time: time, level: level, location: location, message: message) + logger.log(time: time, level: level, location: location, message: message()) } } } diff --git a/UnitTests/FileWriterTests.swift b/UnitTests/FileWriterTests.swift index cb3ebc7..222991c 100644 --- a/UnitTests/FileWriterTests.swift +++ b/UnitTests/FileWriterTests.swift @@ -39,7 +39,7 @@ class FileWriterTests: XCTestCase { func testKeepingFileSizeLimit() throws { let factory = FileMockFactory() let writer = try FileWriter(fileURL: logURL, fileSizeLimit: 1, fileFactory: factory) - let data = Data(bytes: [0]) + let data = Data([0]) try writer.write(data) XCTAssertEqual(factory.mock.writtenData, data) @@ -48,7 +48,7 @@ class FileWriterTests: XCTestCase { func testExceedingFileSizeLimit() throws { let factory = FileMockFactory() let writer = try FileWriter(fileURL: logURL, fileSizeLimit: 1, fileFactory: factory) - let data = Data(bytes: [0, 0]) + let data = Data([0, 0]) XCTAssertThrowsError(try writer.write(data), "file size limit exceeded") { (error) in XCTAssertTrue(error is SizeLimitedFileQuotaReached) From a68d1a575b87776c653ee92d38dc98d9cc8b0175 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Sun, 7 Apr 2019 17:36:57 +0200 Subject: [PATCH 2/3] Enable base internationalization --- Logger.xcodeproj/project.pbxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/Logger.xcodeproj/project.pbxproj b/Logger.xcodeproj/project.pbxproj index 2236301..d13be27 100644 --- a/Logger.xcodeproj/project.pbxproj +++ b/Logger.xcodeproj/project.pbxproj @@ -224,6 +224,7 @@ hasScannedForEncodings = 0; knownRegions = ( en, + Base, ); mainGroup = 2EBF4B312122AA34008E4117; productRefGroup = 2EBF4B3B2122AA34008E4117 /* Products */; From 1f59cee738ecfd0488364b990cfbff8694c5e200 Mon Sep 17 00:00:00 2001 From: Wojciech Nagrodzki <278594+wnagrodzki@users.noreply.github.com> Date: Sun, 7 Apr 2019 17:45:17 +0200 Subject: [PATCH 3/3] Update travis-ci configuration file --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 02fda5c..073ed9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: swift -osx_image: xcode10 +osx_image: xcode10.2 xcode_project: Logger.xcodeproj -script: xcodebuild test -project Logger.xcodeproj -scheme Logger -destination 'platform=iOS Simulator,name=iPhone XS,OS=12.0' +script: xcodebuild test -project Logger.xcodeproj -scheme Logger -destination 'platform=iOS Simulator,name=iPhone XS,OS=12.2' after_success: bash <(curl -s https://codecov.io/bash) \ No newline at end of file