diff --git a/.jazzy.yml b/.jazzy.yml index 035f3e2..ae3032c 100644 --- a/.jazzy.yml +++ b/.jazzy.yml @@ -5,6 +5,6 @@ github_url: https://github.com/polydice/ICInputAccessory github_file_prefix: https://github.com/polydice/ICInputAccessory/blob/develop xcodebuild_arguments: [-scheme, ICInputAccessory-iOS] module: ICInputAccessory -module_version: 1.2.0 +module_version: 1.2.1 output: docs/output theme: fullwidth diff --git a/.travis.yml b/.travis.yml index 8f42f0f..b1bfad3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,15 +1,5 @@ language: objective-c -osx_image: xcode8 -matrix: - include: - - env: BUILD=9.3 - script: bundle exec rake ci:build[9.3] - - env: BUILD=latest - script: bundle exec rake ci:build[latest] - - env: BUILD=carthage - script: make carthage - after_script: - - make documentation +osx_image: xcode8.2 cache: bundler: true directories: @@ -21,6 +11,10 @@ install: - make install before_script: - xcodebuild -workspace ICInputAccessory.xcworkspace -list +script: + - bundle exec rake ci:build + - make -B carthage + - make -B docs notifications: email: false slack: diff --git a/CHANGELOG.md b/CHANGELOG.md index e75987b..68e898a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ -## v1.2.0 +## v1.2.1 + +* Update to Xcode 8.2 -#### Changes +## v1.2.0 * Swift 2.3 ## v1.1.0 -#### Changes - * Support storyboard * Support subspecs * Upgrade to Swift 2.2 @@ -17,7 +17,5 @@ Initial release written in Swift 2.1. -#### Changes - * `ICKeyboardDismissTextField` with an accessory view to dismiss keyboard. * `ICTokenField`, a text field that groups input texts as tokens. diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj index e81455b..aeaf679 100644 --- a/Example/Example.xcodeproj/project.pbxproj +++ b/Example/Example.xcodeproj/project.pbxproj @@ -187,17 +187,17 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0720; - LastUpgradeCheck = 0720; + LastUpgradeCheck = 0820; ORGANIZATIONNAME = "Polydice, Inc."; TargetAttributes = { B548C5C11C8E91B0009D5AEE = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0820; TestTargetID = B5E9F8FA1C8D3B6E00443DC7; }; B5E9F8FA1C8D3B6E00443DC7 = { CreatedOnToolsVersion = 7.2.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 0820; }; }; }; @@ -269,7 +269,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n"; + shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n"; showEnvVarsInLog = 0; }; B5C50ADD1C917F4A0059032B /* Swift Lint */ = { @@ -385,6 +385,7 @@ B5E9F90B1C8D3B6E00443DC7 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -395,8 +396,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -423,12 +426,14 @@ ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 2.3; }; name = Debug; }; B5E9F90C1C8D3B6E00443DC7 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; @@ -439,8 +444,10 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -459,6 +466,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 2.3; VALIDATE_PRODUCT = YES; }; name = Release; @@ -467,6 +476,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = CA708B7D49E7D80A75ED81E3 /* Pods-Example.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; @@ -482,6 +492,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = FE1A89C8A77ED0438A206A24 /* Pods-Example.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; INFOPLIST_FILE = Example/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 8.0; diff --git a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme index 49c239b..73da3b2 100644 --- a/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ b/Example/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -1,6 +1,6 @@ - + + + + - + + @@ -14,9 +18,9 @@ - + - + diff --git a/Example/Example/Info.plist b/Example/Example/Info.plist index 304c314..3fc855b 100644 --- a/Example/Example/Info.plist +++ b/Example/Example/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.2.0 + 1.2.1 CFBundleSignature ???? CFBundleVersion diff --git a/Example/Example/Main.storyboard b/Example/Example/Main.storyboard index 3b44400..91f4378 100644 --- a/Example/Example/Main.storyboard +++ b/Example/Example/Main.storyboard @@ -1,9 +1,13 @@ - + + + + - + + @@ -11,11 +15,11 @@ - + - +