From bc74c88c24c4e11ad1782e7ff8c10b8cf9fbe9aa Mon Sep 17 00:00:00 2001 From: Louis D'hauwe Date: Tue, 10 Apr 2018 20:57:58 +0200 Subject: [PATCH] Update to Xcode 9.3 & Swift 4.1 --- .swift-version | 2 +- .travis.yml | 4 ++-- HueKit.xcodeproj/project.pbxproj | 6 +++++- HueKit/Model/HSV.swift | 2 +- HueKit/Model/RGB.swift | 2 +- README.md | 4 ++-- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.swift-version b/.swift-version index 389f774..8a36cd1 100755 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 \ No newline at end of file +4.1 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 4a3bc24..d7d46dc 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode9.1 +osx_image: xcode9.3 branches: only: - master @@ -13,7 +13,7 @@ env: matrix: - DESTINATION="OS=10.0,name=iPhone 7" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="YES" CODE_COV="NO" - - DESTINATION="OS=11.1,name=iPad Pro (9.7-inch)" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="YES" CODE_COV="NO" + - DESTINATION="OS=11.3,name=iPad Pro (9.7-inch)" SCHEME="$IOS_FRAMEWORK_SCHEME" RUN_TESTS="NO" BUILD_EXAMPLE="YES" CODE_COV="NO" script: - set -o pipefail diff --git a/HueKit.xcodeproj/project.pbxproj b/HueKit.xcodeproj/project.pbxproj index cd62ee4..391aceb 100644 --- a/HueKit.xcodeproj/project.pbxproj +++ b/HueKit.xcodeproj/project.pbxproj @@ -151,7 +151,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 0900; + LastUpgradeCheck = 0930; ORGANIZATIONNAME = "Silver Fox"; TargetAttributes = { BE5C1E161F3266B600B0080C = { @@ -227,6 +227,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -234,6 +235,7 @@ 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; @@ -287,6 +289,7 @@ 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_DOCUMENTATION_COMMENTS = YES; CLANG_WARN_EMPTY_BODY = YES; @@ -294,6 +297,7 @@ 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; diff --git a/HueKit/Model/HSV.swift b/HueKit/Model/HSV.swift index f88c4e6..e95f4b8 100644 --- a/HueKit/Model/HSV.swift +++ b/HueKit/Model/HSV.swift @@ -9,7 +9,7 @@ import Foundation import CoreGraphics -public struct HSV { +public struct HSV: Hashable { /// In degrees (range 0...360) public var h: CGFloat diff --git a/HueKit/Model/RGB.swift b/HueKit/Model/RGB.swift index bde7d46..fef3bc5 100644 --- a/HueKit/Model/RGB.swift +++ b/HueKit/Model/RGB.swift @@ -9,7 +9,7 @@ import Foundation import CoreGraphics -public struct RGB { +public struct RGB: Hashable { /// In range 0...1 public var r: CGFloat diff --git a/README.md b/README.md index 1d43a35..35283ef 100755 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

Build Status
-Swift +Swift Pod Version Carthage Compatible Platform: iOS @@ -67,7 +67,7 @@ Run ```carthage update``` to build the framework and drag the built ```HueKit.fr ## Requirements * iOS 10.0+ -* Xcode 9.0+ +* Xcode 9.3+ ## Todo