From 4f83f2bc9fb66468f1fcb29e64869355b5c07fb2 Mon Sep 17 00:00:00 2001 From: Bas Broek Date: Thu, 20 Sep 2018 01:15:57 +0200 Subject: [PATCH] Add suport for Xcode 10 (#4) * Update to Swift 4.2 * Update to Xcode 10 and iOS 12 * Update podspec * Add changelog update * Update to Swift 4.2 * Get rid of some warnings * Update .travis.yml --- .travis.yml | 4 ++-- CHANGELOG.md | 6 +++++ .../project.pbxproj | 22 +++++++++--------- .../ImageAlertAction-Example.xcscheme | 2 +- Example/ImageAlertAction/AppDelegate.swift | 2 +- .../Base.lproj/Main.storyboard | 8 +++---- Example/ImageAlertAction/ViewController.swift | 2 +- Example/Pods/Pods.xcodeproj/project.pbxproj | 23 +++++++++++-------- ImageAlertAction.podspec | 4 ++-- .../Classes/UIAlertAction+Image.swift | 16 +++++++++---- 10 files changed, 54 insertions(+), 35 deletions(-) diff --git a/.travis.yml b/.travis.yml index f74c585..c782113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: swift -osx_image: xcode9.4 +osx_image: xcode10 script: - - xcodebuild clean test -workspace Example/ImageAlertAction.xcworkspace -scheme ImageAlertAction-Example -destination "platform=iOS Simulator,name=iPhone X,OS=11.4" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet + - xcodebuild clean test -workspace Example/ImageAlertAction.xcworkspace -scheme ImageAlertAction-Example -destination "platform=iOS Simulator,name=iPhone X,OS=12.0" CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO ONLY_ACTIVE_ARCH=NO -quiet diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f5b3ab..34b7035 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.0.0 + +- Updated to Swift 4.2 +- Added support for Xcode 10 +- Added support for iOS 12 + ## 1.0.0 | 07-10-2018 - Initial release. diff --git a/Example/ImageAlertAction.xcodeproj/project.pbxproj b/Example/ImageAlertAction.xcodeproj/project.pbxproj index 7f643e8..a269f95 100644 --- a/Example/ImageAlertAction.xcodeproj/project.pbxproj +++ b/Example/ImageAlertAction.xcodeproj/project.pbxproj @@ -211,16 +211,16 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 0830; + LastUpgradeCheck = 1000; ORGANIZATIONNAME = CocoaPods; TargetAttributes = { 607FACCF1AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1000; }; 607FACE41AFB9204008FA782 = { CreatedOnToolsVersion = 6.3.1; - LastSwiftMigration = 0900; + LastSwiftMigration = 1000; TestTargetID = 607FACCF1AFB9204008FA782; }; }; @@ -427,12 +427,14 @@ 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_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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -480,12 +482,14 @@ 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_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_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -524,8 +528,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -539,8 +542,7 @@ MODULE_NAME = ExampleApp; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; @@ -560,8 +562,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ImageAlertAction_Example.app/ImageAlertAction_Example"; }; name = Debug; @@ -578,8 +579,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_SWIFT3_OBJC_INFERENCE = Default; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ImageAlertAction_Example.app/ImageAlertAction_Example"; }; name = Release; diff --git a/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme b/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme index 0c23dbe..cd54e50 100644 --- a/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme +++ b/Example/ImageAlertAction.xcodeproj/xcshareddata/xcschemes/ImageAlertAction-Example.xcscheme @@ -1,6 +1,6 @@ Bool { + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { return true } } diff --git a/Example/ImageAlertAction/Base.lproj/Main.storyboard b/Example/ImageAlertAction/Base.lproj/Main.storyboard index 46416ea..f256580 100644 --- a/Example/ImageAlertAction/Base.lproj/Main.storyboard +++ b/Example/ImageAlertAction/Base.lproj/Main.storyboard @@ -1,11 +1,11 @@ - + - + @@ -26,7 +26,7 @@