Merge pull request #5 from shtnkgm/feature/swift5

Supporting Swift 5.0

Author: shtnkgm

.swiftlint.yml

@@ -2,6 +2,7 @@ disabled_rules:
 - identifier_name
 - multiple_closures_with_trailing_closure
 - empty_enum_arguments
+- explicit_top_level_acl
 - conditional_returns_on_newline
 - closure_end_indentation
 - discouraged_optional_collection
@@ -82,7 +83,7 @@ opt_in_rules:
 included:
   - ImageTransition
   - Demo
-  
+
 # Lint対象から除外するパス
 excluded:
 
@@ -124,4 +125,3 @@ custom_rules:
     regex: "^(private |fileprivate |internal |public |open )class"
     message: "Final Class"
     severity: error
-

.travis.yml

@@ -1,6 +1,6 @@
 language: objective-c
 os: osx
-osx_image: xcode10
+osx_image: xcode10.2
 
 env:
   global:
@@ -14,7 +14,7 @@ matrix:
     - env: JOB=xcode SCHEME=ImageTransition SDK=iphonesimulator
 
 branches:
-  only: 
+  only:
     - master
 
 cache:
@@ -24,6 +24,6 @@ cache:
 script:
   - set -o pipefail
   - xcodebuild $ACTION -project $PROJECT -scheme $SCHEME -sdk $SDK -destination 'name=iPhone 8,OS=11.4' -configuration $CONFIG ENABLE_TESTABILITY=YES | xcpretty
-    
+
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)

ImageTransition.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
   spec.name         = "ImageTransition"
-  spec.version      = "0.3.0"
+  spec.version      = "0.4.0"
   spec.summary      = "ImageTransition is a library for smooth animation of images during transitions."
   spec.homepage     = "https://github.com/shtnkgm/ImageTransition"
   spec.license      = { :type => "MIT", :file => "LICENSE" }
   spec.author         = "shtnkgm"
   spec.platform       = :ios, "9.0"
-  spec.swift_version  = "4.2"
+  spec.swift_version  = "5.0"
   spec.source         = { :git => "https://github.com/shtnkgm/ImageTransition.git", :tag => "#{spec.version}" }
   spec.source_files   = "ImageTransition/**/*.swift"
 end

ImageTransition.xcodeproj/project.pbxproj

@@ -467,6 +467,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = "";
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -524,6 +525,7 @@
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_VERSION = "";
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -553,7 +555,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;
@@ -580,7 +582,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.shtnkgm.ImageTransition;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SKIP_INSTALL = YES;
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -600,7 +602,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shotanakagami.ImageTransitionTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -620,7 +622,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.shotanakagami.ImageTransitionTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -639,7 +641,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.shtnkgm.Sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -658,7 +660,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.github.shtnkgm.Sample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;

ImageTransition/ImageTransitionDelegate.swift

@@ -47,6 +47,8 @@ extension ImageTransitionDelegate: UINavigationControllerDelegate {
             return ImageTransitioning(duration: popDuration, animationOptions: popAnimationOptions)
         case .push:
             return ImageTransitioning(duration: pushDuration, animationOptions: pushAnimationOptions)
+        @unknown default:
+            fatalError()
         }
     }
 }

ImageTransition/UIImage+.swift

@@ -9,11 +9,11 @@
 import UIKit
 
 internal extension UIImage {
-    internal var area: CGFloat {
+    var area: CGFloat {
         return size.width * size.height
     }
 
-    internal func largerCompared(with comparedImage: UIImage) -> UIImage {
+    func largerCompared(with comparedImage: UIImage) -> UIImage {
         return area > comparedImage.area ? self : comparedImage
     }
 }

ImageTransition/UIImageView+.swift

@@ -10,7 +10,7 @@ import AVFoundation
 import UIKit
 
 internal extension UIImageView {
-    internal var displayingImageSize: CGSize {
+    var displayingImageSize: CGSize {
         guard let image = image else { return .zero }
         switch contentMode {
         case .scaleAspectFit:

ImageTransition/UIView+.swift

@@ -9,16 +9,16 @@
 import UIKit
 
 internal extension UIView {
-    internal func convertFrame(to view: UIView) -> CGRect {
+    func convertFrame(to view: UIView) -> CGRect {
         return convert(bounds, to: view)
     }
 
-    internal func convertCenter(to view: UIView) -> CGPoint {
+    func convertCenter(to view: UIView) -> CGPoint {
         let frame = convertFrame(to: view)
         return CGPoint(x: frame.minX + frame.width / 2.0, y: frame.minY + frame.height / 2.0)
     }
 
-    internal func addSubviews(_ views: UIView...) {
+    func addSubviews(_ views: UIView...) {
         views.forEach {
             addSubview($0)
         }

README.md

@@ -3,7 +3,7 @@
 [![Build Status](https://travis-ci.com/shtnkgm/ImageTransition.svg?branch=master)](https://travis-ci.com/shtnkgm/ImageTransition)
 [![Cocoapods](https://img.shields.io/cocoapods/v/ImageTransition.svg)](https://github.com/shtnkgm/ImageTransition)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-[![Swift Version](https://img.shields.io/badge/Swift-4-F16D39.svg)](https://developer.apple.com/swift)
+[![Swift Version](https://img.shields.io/badge/Swift-5.0-F16D39.svg)](https://developer.apple.com/swift)
 [![GitHub](https://img.shields.io/github/license/shtnkgm/ImageTransition.svg)](https://github.com/shtnkgm/ImageTransition/blob/master/LICENSE)
 [![codebeat badge](https://codebeat.co/badges/fb61c826-2d9c-4931-9be1-3080abc936cd)](https://codebeat.co/projects/g.yxqyang.asia-shtnkgm-imagetransition-master)