diff --git a/.travis.yml b/.travis.yml index 78d2e4b..9a54ee5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,13 @@ env: - LANG=en_US.UTF-8 - WORKSPACE=Willow.xcworkspace - IOS_FRAMEWORK_SCHEME="Willow iOS" - - MACOS_FRAMEWORK_SCHEME="Willow OSX" + - MACOS_FRAMEWORK_SCHEME="Willow macOS" - TVOS_FRAMEWORK_SCHEME="Willow tvOS" - WATCHOS_FRAMEWORK_SCHEME="Willow watchOS" - - IOS_SDK=iphonesimulator10.2 + - IOS_SDK=iphonesimulator10.3 - OSX_SDK=macosx10.12 - - TVOS_SDK=appletvsimulator10.1 - - WATCHOS_SDK=watchsimulator3.1 + - TVOS_SDK=appletvsimulator10.2 + - WATCHOS_SDK=watchsimulator3.2 - EXAMPLE_SCHEME="iOS Example" matrix: - DESTINATION="OS=10.2,name=iPhone 6S" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" BUILD_EXAMPLE="YES" POD_LINT="YES" diff --git a/CHANGELOG.md b/CHANGELOG.md index f2e452b..113b416 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. #### 3.x Releases -- `3.0.x` Releases - [3.0.0](#300) +- `3.0.x` Releases - [3.0.0](#300) | [3.0.1](#301) #### 2.x Releases @@ -23,9 +23,16 @@ All notable changes to this project will be documented in this file. #### Updated -- Fix compile error for Swift 3.2/4.0. -- Rename Network example framework to WebServices to avoid a name collision with an iOS 11 private framework with the same name. -- Set SWIFT_VERSION to 3.2 in all targets. All targets still build with Swift 3.1/Xcode 8.3.x. +- Network example framework to WebServices to avoid a name collision with an iOS 11 private framework with the same name. + - Added by [Dave Camp](https://github.com/atomiccat) in Pull Request [#27](https://github.com/Nike-Inc/Willow/pull/27). +- SWIFT_VERSION to 3.2 in all targets. All targets still build with Swift 3.1/Xcode 8.3.x. + - Added by [Dave Camp](https://github.com/atomiccat) in Pull Request [#27](https://github.com/Nike-Inc/Willow/pull/27). +- Copyright dates to 2017. + - Added by [Dave Camp](https://github.com/atomiccat) in Pull Request [#27](https://github.com/Nike-Inc/Willow/pull/27). + +#### Fixed + +- Compile error for Swift 3.2/4.0. ## [3.0.0](https://github.com/Nike-Inc/Willow/releases/tag/3.0.0) diff --git a/Example/Frameworks/Database/Connection.swift b/Example/Frameworks/Database/Connection.swift index c503cca..3dd0355 100644 --- a/Example/Frameworks/Database/Connection.swift +++ b/Example/Frameworks/Database/Connection.swift @@ -1,7 +1,7 @@ // // Connection.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Frameworks/Database/Database.h b/Example/Frameworks/Database/Database.h index 9b6ce70..a19c5b5 100644 --- a/Example/Frameworks/Database/Database.h +++ b/Example/Frameworks/Database/Database.h @@ -1,7 +1,7 @@ // // Database.h // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Frameworks/Database/Logger.swift b/Example/Frameworks/Database/Logger.swift index 06022e8..d47e273 100644 --- a/Example/Frameworks/Database/Logger.swift +++ b/Example/Frameworks/Database/Logger.swift @@ -1,7 +1,7 @@ // // Logger.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Frameworks/WebServices/Logger.swift b/Example/Frameworks/WebServices/Logger.swift index 9bec1be..573f12b 100644 --- a/Example/Frameworks/WebServices/Logger.swift +++ b/Example/Frameworks/WebServices/Logger.swift @@ -1,7 +1,7 @@ // // Logger.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Frameworks/WebServices/Request.swift b/Example/Frameworks/WebServices/Request.swift index 107af4d..b7229b4 100644 --- a/Example/Frameworks/WebServices/Request.swift +++ b/Example/Frameworks/WebServices/Request.swift @@ -1,7 +1,7 @@ // // Request.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Example/Frameworks/WebServices/WebServices.h b/Example/Frameworks/WebServices/WebServices.h index 5b128f0..60198bb 100644 --- a/Example/Frameworks/WebServices/WebServices.h +++ b/Example/Frameworks/WebServices/WebServices.h @@ -1,7 +1,7 @@ // // WebServices.h // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Example/iOS Example/AppDelegate.swift b/Example/iOS Example/AppDelegate.swift index 7f57e30..21a26fa 100644 --- a/Example/iOS Example/AppDelegate.swift +++ b/Example/iOS Example/AppDelegate.swift @@ -1,7 +1,7 @@ // // AppDelegate.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Example/iOS Example/ViewController.swift b/Example/iOS Example/ViewController.swift index 9350554..175a218 100644 --- a/Example/iOS Example/ViewController.swift +++ b/Example/iOS Example/ViewController.swift @@ -1,7 +1,7 @@ // // ViewController.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -23,8 +23,8 @@ // import Database -import WebServices import UIKit +import WebServices import Willow class ViewController: UIViewController { diff --git a/Example/iOS Example/WillowConfiguration.swift b/Example/iOS Example/WillowConfiguration.swift index 4ef547e..c44838b 100644 --- a/Example/iOS Example/WillowConfiguration.swift +++ b/Example/iOS Example/WillowConfiguration.swift @@ -1,7 +1,7 @@ // // WillowConfiguration.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -24,8 +24,8 @@ import Database import Foundation -import WebServices import UIKit +import WebServices import Willow var log: Logger! @@ -65,7 +65,7 @@ struct WillowConfiguration { static func configure( appLogLevels: LogLevel = [.debug, .info, .event], databaseLogLevels: LogLevel = [.sql, .debug, .info, .event], - webservicesLogLevels: LogLevel = [.debug, .info, .event], + webServicesLogLevels: LogLevel = [.debug, .info, .event], asynchronous: Bool = false) { let writers: [LogLevel: [LogMessageWriter]] = [.all: [ConsoleWriter()]] diff --git a/Source/Info-tvOS.plist b/Source/Info-tvOS.plist index b5caf01..93c67ef 100644 --- a/Source/Info-tvOS.plist +++ b/Source/Info-tvOS.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.0.0 + 3.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/Source/Info.plist b/Source/Info.plist index e0f4bf7..dc2b99a 100644 --- a/Source/Info.plist +++ b/Source/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.0.0 + 3.0.1 CFBundleSignature ???? CFBundleVersion diff --git a/Source/LogLevel.swift b/Source/LogLevel.swift index 70ec488..1f694d5 100644 --- a/Source/LogLevel.swift +++ b/Source/LogLevel.swift @@ -1,7 +1,7 @@ // // LogLevel.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/LogMessageModifier.swift b/Source/LogMessageModifier.swift index df81d03..983ed2b 100644 --- a/Source/LogMessageModifier.swift +++ b/Source/LogMessageModifier.swift @@ -1,7 +1,7 @@ // // LogMessageModifier.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/LogMessageWriter.swift b/Source/LogMessageWriter.swift index 8b40032..c045366 100644 --- a/Source/LogMessageWriter.swift +++ b/Source/LogMessageWriter.swift @@ -1,7 +1,7 @@ // // LogMessageWriter.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/Logger.swift b/Source/Logger.swift index 54c9fbd..6c4bdbb 100644 --- a/Source/Logger.swift +++ b/Source/Logger.swift @@ -1,7 +1,7 @@ // // Logger.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/LoggerConfiguration.swift b/Source/LoggerConfiguration.swift index bfa55af..2b69b88 100644 --- a/Source/LoggerConfiguration.swift +++ b/Source/LoggerConfiguration.swift @@ -1,7 +1,7 @@ // // LoggerConfiguration.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Source/Willow.h b/Source/Willow.h index 089f626..7cabba4 100644 --- a/Source/Willow.h +++ b/Source/Willow.h @@ -1,7 +1,7 @@ // // Willow.h // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Tests/LogLevelTests.swift b/Tests/LogLevelTests.swift index ddc9fb7..d86137f 100644 --- a/Tests/LogLevelTests.swift +++ b/Tests/LogLevelTests.swift @@ -1,7 +1,7 @@ // // LogLevelTests.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Tests/LoggerConfigurationTests.swift b/Tests/LoggerConfigurationTests.swift index 44f2995..e8eb9be 100644 --- a/Tests/LoggerConfigurationTests.swift +++ b/Tests/LoggerConfigurationTests.swift @@ -1,7 +1,7 @@ // // LoggerConfigurationTests.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Tests/LoggerTests.swift b/Tests/LoggerTests.swift index 2a1d6b7..9838deb 100644 --- a/Tests/LoggerTests.swift +++ b/Tests/LoggerTests.swift @@ -1,7 +1,7 @@ // // LoggerTests.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Tests/ModifierTests.swift b/Tests/ModifierTests.swift index 481e9a6..2b1e5ea 100644 --- a/Tests/ModifierTests.swift +++ b/Tests/ModifierTests.swift @@ -1,7 +1,7 @@ // // ModifierTests.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal diff --git a/Tests/WriterTests.swift b/Tests/WriterTests.swift index 04a83a4..87ca2b7 100644 --- a/Tests/WriterTests.swift +++ b/Tests/WriterTests.swift @@ -1,7 +1,7 @@ // // WriterTests.swift // -// Copyright (c) 2015-2016 Nike, Inc. (https://www.nike.com) +// Copyright (c) 2015-2017 Nike, Inc. (https://www.nike.com) // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal