diff --git a/.travis.yml b/.travis.yml index 9520a81..fcb66c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8.1 +osx_image: xcode9.1 branches: only: - master @@ -9,9 +9,9 @@ env: global: - PROJECT_NAME="KeyboardHelper.xcodeproj" - IOS_FRAMEWORK_SCHEME="KeyboardHelper" - - IOS_SDK=iphonesimulator10.1 + - IOS_SDK=iphonesimulator11.1 matrix: - - DESTINATION="OS=10.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" + - DESTINATION="OS=11.1,name=iPhone 6S Plus" SCHEME="$IOS_FRAMEWORK_SCHEME" SDK="$IOS_SDK" RUN_TESTS="YES" script: - set -o pipefail diff --git a/KeyboardHelper.xcodeproj/project.pbxproj b/KeyboardHelper.xcodeproj/project.pbxproj index 63f0f48..e7395fb 100644 --- a/KeyboardHelper.xcodeproj/project.pbxproj +++ b/KeyboardHelper.xcodeproj/project.pbxproj @@ -189,11 +189,11 @@ TargetAttributes = { 275BCA761C57C9F800FF3647 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 275BCA801C57C9F800FF3647 = { CreatedOnToolsVersion = 7.2; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; }; }; @@ -368,7 +368,8 @@ SKIP_INSTALL = YES; SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -387,7 +388,8 @@ SKIP_INSTALL = YES; SWIFT_OBJC_INTERFACE_HEADER_NAME = "$(SWIFT_MODULE_NAME)-Swift.h"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Release; }; @@ -398,7 +400,8 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.nodes.KeyboardHelperTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -410,7 +413,8 @@ PRODUCT_BUNDLE_IDENTIFIER = com.nodes.KeyboardHelperTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 3.0; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/KeyboardHelper/Classes/KeyboardHelper.swift b/KeyboardHelper/Classes/KeyboardHelper.swift index 34c4d88..396e79f 100644 --- a/KeyboardHelper/Classes/KeyboardHelper.swift +++ b/KeyboardHelper/Classes/KeyboardHelper.swift @@ -55,12 +55,12 @@ public class KeyboardHelper { delegate = nil } - dynamic private func keyboardWillAppear(_ note: Notification) { + @objc dynamic private func keyboardWillAppear(_ note: Notification) { let info = KeyboardAppearanceInfo(notification: note) self.delegate?.keyboardWillAppear(info) } - dynamic private func keyboardWillDisappear(_ note: Notification) { + @objc dynamic private func keyboardWillDisappear(_ note: Notification) { let info = KeyboardAppearanceInfo(notification: note) self.delegate?.keyboardWillDisappear(info) }