Merge pull request #118 from xmartlabs/version/5.0.0

swift 5.0.0 compatibility
xmartlabs · Apr 2, 2019 · 89f75e6 · 89f75e6
2 parents 8dfa9e0 + 4963423
commit 89f75e6
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 39 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.2
+5.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
 language: objective-c
-osx_image: xcode10.1
+osx_image: xcode10.2
+branches:
+ only:
+ - master
 env:
- - DESTINATION="OS=12.1,name=iPhone 8" SCHEME="XLActionController" SDK=iphonesimulator
-before_install:
- - gem install xcpretty --no-rdoc --no-ri --no-document --quiet
+ - DESTINATION="OS=12.2,name=iPhone XS" SCHEME="XLActionController" SDK=iphonesimulator
 script:
  - set -o pipefail
  - xcodebuild -version

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+### [5.0.0](https://github.com/xmartlabs/XLActionController/releases/tag/5.0.0)
+
+* Swift 5.0 source compability.
+
 ### [4.1.0](https://github.com/xmartlabs/XLActionController/releases/tag/4.1.0)
 
 * Swift 4.2 source compability.
 
 ### [4.0.1](https://github.com/xmartlabs/XLActionController/releases/tag/4.0.1)
 
 * Bug fixes and stability improvements.
-* Added support for iphone X. 
+* Added support for iphone X.
 
 ### [4.0.0](https://github.com/xmartlabs/XLActionController/releases/tag/4.0.0)
 

diff --git a/Example.xcodeproj/project.pbxproj b/Example.xcodeproj/project.pbxproj
@@ -258,24 +258,24 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0710;
- LastUpgradeCheck = 1000;
+ LastUpgradeCheck = 1020;
  ORGANIZATIONNAME = Xmartlabs;
  TargetAttributes = {
  28B3B8551BFA7EEC007337A2 = {
  CreatedOnToolsVersion = 7.1;
- LastSwiftMigration = 1000;
+ LastSwiftMigration = 1020;
  ProvisioningStyle = Automatic;
  };
  28B3B8691BFA7EEC007337A2 = {
  CreatedOnToolsVersion = 7.1;
- LastSwiftMigration = 1000;
+ LastSwiftMigration = 1020;
  TestTargetID = 28B3B8551BFA7EEC007337A2;
  };
  };
  };
  buildConfigurationList = 28B3B8511BFA7EEC007337A2 /* Build configuration list for PBXProject "Example" */;
  compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
+ developmentRegion = en;
  hasScannedForEncodings = 0;
  knownRegions = (
  en,
@@ -427,6 +427,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -469,7 +470,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  MTL_ENABLE_DEBUG_INFO = YES;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = iphoneos;
@@ -481,6 +482,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -517,7 +519,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.1;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
  SWIFT_COMPILATION_MODE = wholemodule;
@@ -539,7 +541,7 @@
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  };
  name = Debug;
  };
@@ -556,7 +558,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.Example;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  };
  name = Release;
  };
@@ -570,7 +572,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.ExampleUITests;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  TEST_TARGET_NAME = Example;
  USES_XCTRUNNER = YES;
  };
@@ -585,7 +587,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.ExampleUITests;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  TEST_TARGET_NAME = Example;
  USES_XCTRUNNER = YES;
  };

diff --git a/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1000"
+ LastUpgradeVersion = "1020"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"

diff --git a/Example/Info.plist b/Example/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>4.1.1</string>
+ <string>5.0.0</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 XMARTLABS (http://xmartlabs.com)
+Copyright (c) 2019 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

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 <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/swift4-compatible-4BC51D.svg?style=flat" alt="Swift 4 compatible" /></a>
+<a href="https://developer.apple.com/swift"><img src="https://img.shields.io/badge/swift5-compatible-4BC51D.svg?style=flat" alt="Swift 5 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/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>
@@ -390,8 +390,8 @@ After the dismissal animation completes, `dismissView` calls `onDidDismissView`
 ## Requirements
 
 * iOS 9.3+
-* Xcode 10.1+
-* Swift 4.2+
+* Xcode 10.2+
+* Swift 5.0+
 
 ## Getting involved
 
@@ -412,7 +412,6 @@ Specify XLActionController into your project's Podfile:
 
 ```ruby
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, '9.0'
 use_frameworks!
 
 target '<Your App Target>' do
@@ -443,7 +442,7 @@ dependency manager for Cocoa.
 Specify XLActionController into your project's Carthage:
 
 ```
-github "xmartlabs/XLActionController" ~> 4.1
+github "xmartlabs/XLActionController" ~> 5.0
 ```
 
 ### Manually as Embedded Framework

diff --git a/Source/DynamicCollectionViewFlowLayout.swift b/Source/DynamicCollectionViewFlowLayout.swift
@@ -171,6 +171,8 @@ open class DynamicCollectionViewFlowLayout: UICollectionViewFlowLayout {
  translationX = isRTL(for: collectionView) ? rightMargin : leftMargin
  case .trailing:
  translationX = isRTL(for: collectionView) ? leftMargin : rightMargin
+ @unknown default:
+ translationX = isRTL(for: collectionView) ? rightMargin : leftMargin
  }
 
  frame.origin.x = translationX

diff --git a/Source/Info.plist b/Source/Info.plist
@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>4.1.1</string>
+ <string>5.0.0</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

diff --git a/XLActionController.podspec b/XLActionController.podspec
@@ -1,16 +1,16 @@
 Pod::Spec.new do |spec|
  spec.name = 'XLActionController'
- spec.version = '4.1.1'
+ spec.version = '5.0.0'
  spec.license = 'MIT'
  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' => 'miguel@xmartlabs.com', 'Martin Barreto' => 'martin@xmartlabs.com' }
  spec.source = { :git => 'https://github.com/xmartlabs/XLActionController.git', :tag => spec.version }
- spec.ios.deployment_target = '9.0'
+ spec.ios.deployment_target = '9.3'
  spec.ios.frameworks = 'UIKit', 'Foundation', 'CoreGraphics'
  spec.requires_arc = true
- spec.swift_version = '4.2'
+ spec.swift_version = '5.0'
 
  # Core subspec
  spec.subspec 'Core' do |core|

diff --git a/XLActionController.xcodeproj/project.pbxproj b/XLActionController.xcodeproj/project.pbxproj
@@ -169,25 +169,26 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0710;
- LastUpgradeCheck = 1000;
+ LastUpgradeCheck = 1020;
  ORGANIZATIONNAME = Xmartlabs;
  TargetAttributes = {
  28E191661BFA618E00066B1C = {
  CreatedOnToolsVersion = 7.1;
- LastSwiftMigration = 1000;
+ LastSwiftMigration = 1020;
  };
  28E191701BFA618F00066B1C = {
  CreatedOnToolsVersion = 7.1;
- LastSwiftMigration = 1010;
+ LastSwiftMigration = 1020;
  };
  };
  };
  buildConfigurationList = 28E191611BFA618E00066B1C /* Build configuration list for PBXProject "XLActionController" */;
  compatibilityVersion = "Xcode 3.2";
- developmentRegion = English;
+ developmentRegion = en;
  hasScannedForEncodings = 0;
  knownRegions = (
  en,
+ Base,
  );
  mainGroup = 28E1915D1BFA618E00066B1C;
  productRefGroup = 28E191681BFA618E00066B1C /* Products */;
@@ -254,6 +255,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -297,7 +299,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  MTL_ENABLE_DEBUG_INFO = YES;
  ONLY_ACTIVE_ARCH = YES;
  SDKROOT = iphoneos;
@@ -313,6 +315,7 @@
  isa = XCBuildConfiguration;
  buildSettings = {
  ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
  CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
  CLANG_CXX_LIBRARY = "libc++";
  CLANG_ENABLE_MODULES = YES;
@@ -350,7 +353,7 @@
  GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
  GCC_WARN_UNUSED_FUNCTION = YES;
  GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
  SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -374,12 +377,13 @@
  DYLIB_INSTALL_NAME_BASE = "@rpath";
  INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLActionController;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  };
  name = Debug;
  };
@@ -395,11 +399,12 @@
  DYLIB_INSTALL_NAME_BASE = "@rpath";
  INFOPLIST_FILE = "$(SRCROOT)/Source/Info.plist";
  INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLActionController;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  };
  name = Release;
  };
@@ -408,11 +413,12 @@
  buildSettings = {
  DEVELOPMENT_TEAM = "";
  INFOPLIST_FILE = Tests/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLActionControllerTests;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  };
  name = Debug;
  };
@@ -421,10 +427,11 @@
  buildSettings = {
  DEVELOPMENT_TEAM = "";
  INFOPLIST_FILE = Tests/Info.plist;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.3;
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.xmartlabs.XLActionControllerTests;
  PRODUCT_NAME = "$(TARGET_NAME)";
- SWIFT_VERSION = 4.2;
+ SWIFT_VERSION = 5.0;
  };
  name = Release;
  };

diff --git a/XLActionController.xcodeproj/xcshareddata/xcschemes/XLActionController.xcscheme b/XLActionController.xcodeproj/xcshareddata/xcschemes/XLActionController.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
- LastUpgradeVersion = "1000"
+ LastUpgradeVersion = "1020"
  version = "1.3">
  <BuildAction
  parallelizeBuildables = "YES"