Skip to content

Commit

Permalink
Version 4.0.0
Browse files Browse the repository at this point in the history
support for Xcode9, swift 4.
  • Loading branch information
Martin Barreto committed Oct 9, 2017
1 parent 66a6ba9 commit 694468c
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: objective-c
osx_image: xcode8
osx_image: xcode9
env:
- DESTINATION="OS=10.0,name=iPhone 6s" SCHEME="XLActionController" SDK=iphonesimulator10.0
- DESTINATION="OS=11.0,name=iPhone 7" SCHEME="XLActionController" SDK=iphonesimulator
before_install:
- gem install xcpretty --no-rdoc --no-ri --no-document --quiet
script:
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

All notable changes to this project will be documented in this file.

### master branch
### [4.0.0](https://github.com/xmartlabs/XLActionController/releases/tag/4.0.0)

* Support for Swift 4.
* Added customizable background color to the Skype action controller, [PR #52](https://github.com/xmartlabs/XLActionController/pull/52)
* Using status bar style from settings in iOS 10, [PR #53](https://github.com/xmartlabs/XLActionController/pull/53)

Expand Down
5 changes: 5 additions & 0 deletions Example.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@
28B3B8551BFA7EEC007337A2 = {
CreatedOnToolsVersion = 7.1;
LastSwiftMigration = 0800;
ProvisioningStyle = Manual;
};
28B3B8691BFA7EEC007337A2 = {
CreatedOnToolsVersion = 7.1;
Expand Down Expand Up @@ -524,12 +525,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_SWIFT_FLAGS = "-DXLACTIONCONTROLLER_EXAMPLE";
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0;
};
name = Debug;
Expand All @@ -538,12 +541,14 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
INFOPLIST_FILE = Example/Info.plist;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
OTHER_SWIFT_FLAGS = "-DXLACTIONCONTROLLER_EXAMPLE";
PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 4.0;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Example/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<string>4.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2016 XMARTLABS (http://xmartlabs.com)
Copyright (c) 2017 XMARTLABS (http://xmartlabs.com)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<p align="left">
<a href="https://travis-ci.org/xmartlabs/XLActionController"><img src="https://travis-ci.org/xmartlabs/XLActionController.svg?branch=master" alt="Build status" /></a>
<img src="https://img.shields.io/badge/platform-iOS-blue.svg?style=flat" alt="Platform iOS" />
<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/swift3-compatible-4BC51D.svg?style=flat" alt="Swift 3 compatible" /></a>
<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/swift4-compatible-4BC51D.svg?style=flat" alt="Swift 4 compatible" /></a>
<a href="https://github.com/Carthage/Carthage"><img src="https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat" alt="Carthage compatible" /></a>
<a href="https://cocoapods.org/pods/XLActionController"><img src="https://img.shields.io/badge/pod-3.0.1-blue.svg" alt="CocoaPods compatible" /></a>
<a href="https://cocoapods.org/pods/XLActionController"><img src="https://img.shields.io/cocoapods/v/XLActionController.svg" alt="CocoaPods compatible" /></a>
<a href="https://raw.githubusercontent.com/xmartlabs/XLActionController/master/LICENSE"><img src="http://img.shields.io/badge/license-MIT-blue.svg?style=flat" alt="License: MIT" /></a>
<a href="https://codebeat.co/projects/github-com-xmartlabs-xlactioncontroller"><img alt="codebeat badge" src="https://codebeat.co/badges/24f48197-136d-44cc-b072-6703644d13b6" /></a>
</p>
Expand Down Expand Up @@ -387,9 +387,9 @@ After the dismissal animation completes, `dismissView` calls `onDidDismissView`

## Requirements

* iOS 8.0+
* Xcode 8.0+
* Swift 3
* iOS 9.0+
* Xcode 9.0+
* Swift 4

## Getting involved

Expand All @@ -411,7 +411,7 @@ Specify XLActionController into your project's Podfile:

```ruby
source 'https://github.com/CocoaPods/Specs.git'
platform :ios, '8.0'
platform :ios, '9.0'
use_frameworks!

target '<Your App Target>' do
Expand Down Expand Up @@ -442,7 +442,7 @@ dependency manager for Cocoa.
Specify XLActionController into your project's Carthage:

```
github "xmartlabs/XLActionController" ~> 3.0
github "xmartlabs/XLActionController" ~> 4.0
```

### Manually as Embedded Framework
Expand Down
2 changes: 1 addition & 1 deletion Source/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.0.0</string>
<string>4.0.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
6 changes: 3 additions & 3 deletions XLActionController.podspec
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Pod::Spec.new do |spec|
spec.name = 'XLActionController'
spec.version = '3.0.1'
spec.version = '4.0.0'
spec.license = 'MIT'
spec.summary = 'Fully customizable and extensible action sheet controller written in Swift 3'
spec.summary = 'Fully customizable and extensible action sheet controller written in Swift'
spec.homepage = 'https://github.com/xmartlabs/XLActionController'
spec.social_media_url = 'http://twitter.com/xmartlabs'
spec.authors = { 'Miguel Revetria' => '[email protected]', 'Martin Barreto' => '[email protected]' }
spec.source = { :git => 'https://github.com/xmartlabs/XLActionController.git', :tag => spec.version }
spec.ios.deployment_target = '8.0'
spec.ios.deployment_target = '9.0'
spec.ios.frameworks = 'UIKit', 'Foundation', 'CoreGraphics'
spec.requires_arc = true

Expand Down

0 comments on commit 694468c

Please sign in to comment.