From 1d233f693ad88ab2ff61f16d75512b3211147de8 Mon Sep 17 00:00:00 2001 From: Martin Barreto Date: Wed, 19 Dec 2018 18:51:13 -0300 Subject: [PATCH 1/5] version 4.1.1 --- Example/Info.plist | 2 +- README.md | 3 +-- Source/ActionController.swift | 8 ++++---- Source/Info.plist | 2 +- XLActionController.podspec | 3 ++- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Example/Info.plist b/Example/Info.plist index 50e8101..4967b6b 100644 --- a/Example/Info.plist +++ b/Example/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.2.0 + 4.1.1 CFBundleSignature ???? CFBundleVersion diff --git a/README.md b/README.md index 538c311..bfdcd31 100644 --- a/README.md +++ b/README.md @@ -397,8 +397,7 @@ After the dismissal animation completes, `dismissView` calls `onDidDismissView` * If you **want to contribute** please feel free to **submit pull requests**. * If you **have a feature request** please **open an issue**. -* If you **found a bug** or **need help** please **check older issues or threads on -[StackOverflow](http://stackoverflow.com/questions/tagged/xlactioncontroller) before submitting an issue**. +* If you **found a bug** or **need help** please **check older issues before submitting an issue**. If you use **XLActionController** in your app we would love to hear about it! Drop us a line on [twitter](https://twitter.com/xmartlabs). diff --git a/Source/ActionController.swift b/Source/ActionController.swift index bd5b4cf..faac9c4 100644 --- a/Source/ActionController.swift +++ b/Source/ActionController.swift @@ -252,9 +252,9 @@ open class ActionControllerCFBundlePackageType FMWK CFBundleShortVersionString - 4.2.0 + 4.1.1 CFBundleSignature ???? CFBundleVersion diff --git a/XLActionController.podspec b/XLActionController.podspec index 1c8b019..0b428ce 100644 --- a/XLActionController.podspec +++ b/XLActionController.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |spec| spec.name = 'XLActionController' - spec.version = '4.1.0' + spec.version = '4.1.1' spec.license = 'MIT' spec.summary = 'Fully customizable and extensible action sheet controller written in Swift' spec.homepage = 'https://github.com/xmartlabs/XLActionController' @@ -10,6 +10,7 @@ Pod::Spec.new do |spec| spec.ios.deployment_target = '9.0' spec.ios.frameworks = 'UIKit', 'Foundation', 'CoreGraphics' spec.requires_arc = true + spec.swift_version = '4.2' # Core subspec spec.subspec 'Core' do |core| From b0535665850e7f136a975fe8e0a836877b328bff Mon Sep 17 00:00:00 2001 From: Martin Barreto Date: Thu, 20 Dec 2018 12:49:24 -0300 Subject: [PATCH 2/5] remove unnecessary method. --- Source/ActionController.swift | 10 +--------- XLActionController.xcodeproj/project.pbxproj | 6 +++--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/Source/ActionController.swift b/Source/ActionController.swift index faac9c4..3870771 100644 --- a/Source/ActionController.swift +++ b/Source/ActionController.swift @@ -214,11 +214,7 @@ open class ActionController ())?) { + open func dismiss(_ completion: (() -> ())? = nil) { disableActions = true presentingViewController?.dismiss(animated: true) { [weak self] in self?.disableActions = false @@ -778,10 +774,6 @@ open class DynamicsActionController ())?) { animator.addBehavior(gravityBehavior) diff --git a/XLActionController.xcodeproj/project.pbxproj b/XLActionController.xcodeproj/project.pbxproj index cbcab97..753be52 100644 --- a/XLActionController.xcodeproj/project.pbxproj +++ b/XLActionController.xcodeproj/project.pbxproj @@ -178,7 +178,7 @@ }; 28E191701BFA618F00066B1C = { CreatedOnToolsVersion = 7.1; - LastSwiftMigration = 0800; + LastSwiftMigration = 1010; }; }; }; @@ -412,7 +412,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLActionControllerTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Debug; }; @@ -424,7 +424,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLActionControllerTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; }; name = Release; }; From f25e3a2d02bdb95142b9f2d607192143bd672431 Mon Sep 17 00:00:00 2001 From: Martin Barreto Date: Thu, 20 Dec 2018 14:02:41 -0300 Subject: [PATCH 3/5] update travis. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index abb8fdb..4bbe4cc 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: objective-c -osx_image: xcode10 +osx_image: xcode10.1 env: - - DESTINATION="OS=12.0,name=iPhone 8" SCHEME="XLActionController" SDK=iphonesimulator + - DESTINATION="OS=12.1,name=iPhone 8" SCHEME="XLActionController" SDK=iphonesimulator before_install: - gem install xcpretty --no-rdoc --no-ri --no-document --quiet script: From 42dfc56e1421f97095411c1aef6220a05acba7ef Mon Sep 17 00:00:00 2001 From: Martin Barreto Date: Thu, 20 Dec 2018 14:04:33 -0300 Subject: [PATCH 4/5] fixes #85 & #86 --- Source/ActionController.swift | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Source/ActionController.swift b/Source/ActionController.swift index 3870771..a11e143 100644 --- a/Source/ActionController.swift +++ b/Source/ActionController.swift @@ -278,8 +278,6 @@ open class ActionController Date: Thu, 20 Dec 2018 14:07:45 -0300 Subject: [PATCH 5/5] enable automatically manage signing --- Example.xcodeproj/project.pbxproj | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj index 27b1863..2adf708 100644 --- a/Example.xcodeproj/project.pbxproj +++ b/Example.xcodeproj/project.pbxproj @@ -264,7 +264,7 @@ 28B3B8551BFA7EEC007337A2 = { CreatedOnToolsVersion = 7.1; LastSwiftMigration = 1000; - ProvisioningStyle = Manual; + ProvisioningStyle = Automatic; }; 28B3B8691BFA7EEC007337A2 = { CreatedOnToolsVersion = 7.1; @@ -529,7 +529,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -546,7 +547,8 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_STYLE = Manual; + CODE_SIGN_IDENTITY = "iPhone Developer"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";