Merge pull request #18 from inloop/swift5

Swift 5 update

Author: jakubpetrik

.travis.yml

@@ -2,9 +2,9 @@
 # * https://www.objc.io/issues/6-build-tools/travis-ci/
 # * https://github.com/supermarin/xcpretty#usage
 
-osx_image: xcode10.1
+osx_image: xcode10.2
 language: swift
 cache: cocoapods
 script:
 - pod lib lint
-- set -o pipefail && xcodebuild -project UIViewController-DisplayChild.xcodeproj -scheme UIViewController-DisplayChild -sdk iphonesimulator12.1 ONLY_ACTIVE_ARCH=NO | xcpretty
+- set -o pipefail && xcodebuild -project UIViewController-DisplayChild.xcodeproj -scheme UIViewController-DisplayChild -sdk iphonesimulator12.2 ONLY_ACTIVE_ARCH=NO | xcpretty

UIViewController-DisplayChild.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'UIViewController-DisplayChild'
-  s.version          = '2.1.0'
+  s.version          = '2.2.0'
   s.summary          = 'UIViewController containment made easy'
   s.description      = <<-DESC
   The problem: sometimes you need to embed a controller, but it might be embedded already. E.g. you have an empty view, and you do refresh only to get empty view again. If you do not check for its existence, you might end up creating a new instance unneccessarily. This can also have bad side effects when there is some heavier work in viewDidLoad for example.
@@ -13,7 +13,7 @@ The solution: transition to type, instead of an instance. If the instance does n
   s.author           = { 'INLOOPX' => '[email protected]' }
   s.source           = { :git => 'https://github.com/inloop/UIViewController-DisplayChild.git', :tag => s.version.to_s }
   s.ios.deployment_target = '10.0'
-  s.swift_version    = '4.2'
+  s.swift_version    = '5'
   s.source_files = 'UIViewController-DisplayChild/**/*'
   s.exclude_files = 'UIViewController-DisplayChild/Info.plist'
 end

UIViewController-DisplayChild.xcodeproj/project.pbxproj

@@ -104,7 +104,7 @@
 				TargetAttributes = {
 					3B0791D82088D3DE00A39104 = {
 						CreatedOnToolsVersion = 9.3;
-						LastSwiftMigration = 0930;
+						LastSwiftMigration = 1020;
 					};
 				};
 			};
@@ -291,7 +291,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -319,7 +319,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.inloopx.Vito;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

UIViewController-DisplayChild/UIViewController+DisplayChild.swift

@@ -8,7 +8,7 @@ public protocol Instantiable {
 }
 
 public extension UIViewController {
-    public typealias VoidClosure = () -> Void
+    typealias VoidClosure = () -> Void
 
     static let embedTransitionAnimationDuration = 0.25