From de56d8d747437bce23f87049df080ae5616eff47 Mon Sep 17 00:00:00 2001 From: "John C. Daub" Date: Sat, 23 Sep 2017 15:37:30 -0500 Subject: [PATCH 1/3] Updating for Xcode 9 and Swift 4. --- .swift-version | 2 +- .travis.yml | 2 +- CHANGELOG.md | 6 +++++ .../project.pbxproj | 25 ++++++++++++++----- ...rgeCenterTabBarController Example.xcscheme | 4 ++- .../HELargeCenterTabBarController.xcscheme | 4 ++- README.md | 7 +++--- 7 files changed, 37 insertions(+), 13 deletions(-) diff --git a/.swift-version b/.swift-version index 9f55b2c..389f774 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -3.0 +4.0 \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 00e54b0..eb6fbd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: objective-c -osx_image: xcode8 +osx_image: xcode9 notifications: email: - hsoi@hsoienterprises.com diff --git a/CHANGELOG.md b/CHANGELOG.md index 58e39e2..a559316 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # HELargeCenterTabBarController CHANGELOG + +## v2.1.0 - 2017-09-23 + +* Fixing center button position support to better support iPhone X (h/t to @hipwelljo) +* Xcode 9 and Swift 4 support + ## v2.0.0 - 2016-09-23 * Updated for Swift 3 and Xcode 8. Thank you to @dodgecm diff --git a/HELargeCenterTabBarController.xcodeproj/project.pbxproj b/HELargeCenterTabBarController.xcodeproj/project.pbxproj index dc4a080..24101c0 100644 --- a/HELargeCenterTabBarController.xcodeproj/project.pbxproj +++ b/HELargeCenterTabBarController.xcodeproj/project.pbxproj @@ -185,15 +185,16 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0700; - LastUpgradeCheck = 0800; + LastUpgradeCheck = 0900; ORGANIZATIONNAME = "Hsoi Enterprises LLC"; TargetAttributes = { 7901CBA61BAF16F0005AE0F5 = { CreatedOnToolsVersion = 7.0; - LastSwiftMigration = 0800; + LastSwiftMigration = 0900; }; 7952AF821BAEC32E00789C09 = { CreatedOnToolsVersion = 7.0; + LastSwiftMigration = 0900; }; }; }; @@ -302,7 +303,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.hsoienterprises.HELargeCenterTabBarController; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -323,7 +324,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.hsoienterprises.HELargeCenterTabBarController; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; @@ -341,14 +342,20 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_STATIC_ANALYZER_MODE = deep; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; 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_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -393,14 +400,20 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; CLANG_STATIC_ANALYZER_MODE = deep; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; 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_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; @@ -438,7 +451,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.hsoienterprises.HELargeCenterTabBarControllerExample; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Debug; }; @@ -452,7 +465,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.hsoienterprises.HELargeCenterTabBarControllerExample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 3.0; + SWIFT_VERSION = 4.0; }; name = Release; }; diff --git a/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController Example.xcscheme b/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController Example.xcscheme index bad4f80..5cd50b1 100644 --- a/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController Example.xcscheme +++ b/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController Example.xcscheme @@ -1,6 +1,6 @@ @@ -45,6 +46,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController.xcscheme b/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController.xcscheme index 76bd5a0..dbe4965 100644 --- a/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController.xcscheme +++ b/HELargeCenterTabBarController.xcodeproj/xcshareddata/xcschemes/HELargeCenterTabBarController.xcscheme @@ -1,6 +1,6 @@ @@ -36,6 +37,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/README.md b/README.md index 842b468..b58f3d4 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,11 @@ Simple. Lightweight. To-the-point. # Supported OS and SDK -- Xcode 8+ -- Swift 3+ +- Xcode 9+ +- Swift 4+ - iOS 8 (minimum, required) +As of v2.1, only Swift 4 is supported. If you need Swift 3 support, use v2.0. As of v2.0, only Swift 3 is supported. If you need Swift 2.2 support, use v1.0.1. @@ -50,7 +51,7 @@ CocoaPods 0.36 adds supports for Swift and embedded frameworks. You can install $ gem install cocoapods ``` -To integrate HEAlert into your Xcode project using CocoaPods, specify it in your `Podfile`: +To integrate HELargeCenterTabBarController into your Xcode project using CocoaPods, specify it in your `Podfile`: ```ruby source 'https://github.com/CocoaPods/Specs.git' From 10864f5df2a024729a161e541af62d64d1a205f5 Mon Sep 17 00:00:00 2001 From: "John C. Daub" Date: Sat, 23 Sep 2017 15:40:39 -0500 Subject: [PATCH 2/3] Updating podspec to v2.1.0 --- HELargeCenterTabBarController.podspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HELargeCenterTabBarController.podspec b/HELargeCenterTabBarController.podspec index a996002..94060a4 100644 --- a/HELargeCenterTabBarController.podspec +++ b/HELargeCenterTabBarController.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'HELargeCenterTabBarController' - spec.version = '2.0.0' + spec.version = '2.1.0' spec.homepage = 'https://github.com/HsoiEnterprises/HELargeCenterTabBarController' spec.source = { :git => 'https://github.com/HsoiEnterprises/HELargeCenterTabBarController.git', :tag => "v#{spec.version}" } spec.summary = 'A Swift UITabBarController with a larger center tab.' From 09e1fe9fa2ff89d42e98e6378b59f5a1f72937dd Mon Sep 17 00:00:00 2001 From: "John C. Daub" Date: Sat, 23 Sep 2017 15:43:40 -0500 Subject: [PATCH 3/3] update xcodebuild command --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb6fbd2..63af5b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,4 +4,4 @@ notifications: email: - hsoi@hsoienterprises.com script: - - xcodebuild -project HELargeCenterTabBarController.xcodeproj -scheme HELargeCenterTabBarController -sdk iphonesimulator10.0 build + - xcodebuild -project HELargeCenterTabBarController.xcodeproj -scheme HELargeCenterTabBarController -sdk iphonesimulator11.0 build