Update to Swift 5

ABVideoRangeSlider.podspec → ABVideoRangeSlider-SWIFT-5.podspec

@@ -1,15 +1,15 @@
 #
-# Be sure to run `pod lib lint ABVideoRangeSlider.podspec' to ensure this is a
+# Be sure to run `pod lib lint ABVideoRangeSlider-SWIFT-5.podspec' to ensure this is a
 # valid spec before submitting.
 #
 # Any lines starting with a # are optional, but their use is encouraged
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 
 Pod::Spec.new do |s|
-  s.name             = 'ABVideoRangeSlider'
-  s.version          = '0.1.5'
-  s.summary          = 'A simple range slider for trimming videos written in Swift 3. Includes a Progress Indicator.'
+  s.name             = 'ABVideoRangeSlider-SWIFT-5'
+  s.version          = '1.0.1'
+  s.summary          = 'A simple range slider for trimming videos written in Swift 5. Includes a Progress Indicator.'
 
 # This description is used to generate tags and improve search results.
 #   * Think: What does it do? Why did you write it? What is the focus?
@@ -19,12 +19,12 @@ Pod::Spec.new do |s|
 
   s.description      = 'Display thumbnails and a slider for trimming videos in iOS. Includes a Progress Indicator'
 
-  s.homepage         = 'https://github.com/AppsBoulevard/ABVideoRangeSlider'
+  s.homepage         = 'https://github.com/dev-shanghai/ABVideoRangeSlider.git'
   # s.screenshots     = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
   s.license          = { :type => 'MIT', :file => 'LICENSE' }
-  s.author           = { 'Oscar J. Irun' => 'oscarjiv91@gmail.com' }
-  s.source           = { :git => 'https://github.com/AppsBoulevard/ABVideoRangeSlider.git', :tag => s.version.to_s }
-  s.social_media_url = 'https://twitter.com/AppsBoulevard'
+  s.author           = { 'Asim Khan' => 'iamasimkhanjadoon@gmail.com' }
+  s.source           = { :git => 'https://github.com/dev-shanghai/ABVideoRangeSlider.git', :tag => s.version.to_s }
+  s.social_media_url = 'https://twitter.com/i_am_asimkhan'
 
   s.ios.deployment_target = '8.0'
 

ABVideoRangeSlider/Classes/ABBorder.swift

@@ -20,7 +20,7 @@ class ABBorder: UIView {
 
         imageView.frame = self.bounds
         imageView.image = image
-        imageView.contentMode = UIViewContentMode.scaleToFill
+        imageView.contentMode = UIView.ContentMode.scaleToFill
         self.addSubview(imageView)
     }
 

ABVideoRangeSlider/Classes/ABEndIndicator.swift

@@ -21,7 +21,7 @@ class ABEndIndicator: UIView {
 
         imageView.frame = self.bounds
         imageView.image = image
-        imageView.contentMode = UIViewContentMode.scaleToFill
+        imageView.contentMode = UIView.ContentMode.scaleToFill
         self.addSubview(imageView)
     }
 

ABVideoRangeSlider/Classes/ABProgressIndicator.swift

@@ -19,7 +19,7 @@ class ABProgressIndicator: UIView {
         let image = UIImage(named: "ProgressIndicator", in: bundle, compatibleWith: nil)
         imageView.frame = self.bounds
         imageView.image = image
-        imageView.contentMode = UIViewContentMode.scaleToFill
+        imageView.contentMode = UIView.ContentMode.scaleToFill
         self.addSubview(imageView)
     }
 

ABVideoRangeSlider/Classes/ABStartIndicator.swift

@@ -21,7 +21,7 @@ class ABStartIndicator: UIView {
 
         imageView.frame = self.bounds
         imageView.image = image
-        imageView.contentMode = UIViewContentMode.scaleToFill
+        imageView.contentMode = UIView.ContentMode.scaleToFill
         self.addSubview(imageView)
     }
 

ABVideoRangeSlider/Classes/ABThumbnailsManager.swift

@@ -28,7 +28,7 @@ class ABThumbnailsManager: NSObject {
 
                 let imageView = UIImageView(image: image)
                 imageView.alpha = 0
-                imageView.contentMode = UIViewContentMode.scaleAspectFill
+                imageView.contentMode = UIView.ContentMode.scaleAspectFill
                 imageView.clipsToBounds = true
                 imageView.frame = CGRect(x: xPos,
                                          y: 0.0,
@@ -41,7 +41,7 @@ class ABThumbnailsManager: NSObject {
                 UIView.animate(withDuration: 0.2, animations: {() -> Void in
                     imageView.alpha = 1.0
                 })
-                view.sendSubview(toBack: imageView)
+                view.sendSubviewToBack(imageView)
                 xPos = xPos + view.frame.size.height
             }
         }
@@ -75,7 +75,7 @@ class ABThumbnailsManager: NSObject {
 
         for i in 0..<imagesCount{
             let thumbnail = ABVideoHelper.thumbnailFromVideo(videoUrl: videoURL,
-                                                             time: CMTimeMake(Int64(offset), 1))
+                                                             time: CMTimeMake(value: Int64(offset), timescale: 1))
             offset = Float64(i) * (duration / Float64(imagesCount))
             thumbnails.append(thumbnail)
         }

ABVideoRangeSlider/Classes/ABTimeView.swift

@@ -24,7 +24,7 @@ open class ABTimeView: UIView {
                                 height: backgroundView.frame.height)
 
             self.addSubview(backgroundView)
-            self.sendSubview(toBack: backgroundView)
+            self.sendSubviewToBack(backgroundView)
         }
     }
 

ABVideoRangeSlider/Classes/ABVideoRangeSlider.swift

@@ -144,7 +144,7 @@ public class ABVideoRangeSlider: UIView, UIGestureRecognizerDelegate {
         draggableView.addGestureRecognizer(viewDrag)
         self.draggableView.backgroundColor = .clear
         self.addSubview(draggableView)
-        self.sendSubview(toBack: draggableView)
+        self.sendSubviewToBack(draggableView)
 
         // Setup time labels
 

Example/ABVideoRangeSlider.xcodeproj/project.pbxproj

@@ -160,7 +160,6 @@
 				607FACCD1AFB9204008FA782 /* Frameworks */,
 				607FACCE1AFB9204008FA782 /* Resources */,
 				83433F5EAE73B62723E5B059 /* [CP] Embed Pods Frameworks */,
-				C9C85FF519895AE1A57CD5D6 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -179,8 +178,6 @@
 				607FACE11AFB9204008FA782 /* Sources */,
 				607FACE21AFB9204008FA782 /* Frameworks */,
 				607FACE31AFB9204008FA782 /* Resources */,
-				8325C882F17F747CC9E6C69A /* [CP] Embed Pods Frameworks */,
-				79B3BFA6A805CD26794E86C9 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -204,12 +201,12 @@
 				TargetAttributes = {
 					607FACCF1AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = UH5C7ZL9LD;
+						DevelopmentTeam = N3MR28TKLZ;
 						LastSwiftMigration = 0810;
 					};
 					607FACE41AFB9204008FA782 = {
 						CreatedOnToolsVersion = 6.3.1;
-						DevelopmentTeam = UH5C7ZL9LD;
+						DevelopmentTeam = N3MR28TKLZ;
 						LastSwiftMigration = 0810;
 						TestTargetID = 607FACCF1AFB9204008FA782;
 					};
@@ -220,6 +217,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -262,13 +260,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-ABVideoRangeSlider_Tests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		78480F720DCA886153BBBCED /* [CP] Check Pods Manifest.lock */ = {
@@ -277,43 +278,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-ABVideoRangeSlider_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
-			showEnvVarsInLog = 0;
-		};
-		79B3BFA6A805CD26794E86C9 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ABVideoRangeSlider_Tests/Pods-ABVideoRangeSlider_Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		8325C882F17F747CC9E6C69A /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ABVideoRangeSlider_Tests/Pods-ABVideoRangeSlider_Tests-frameworks.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		83433F5EAE73B62723E5B059 /* [CP] Embed Pods Frameworks */ = {
@@ -322,28 +296,16 @@
 			files = (
 			);
 			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-ABVideoRangeSlider_Example/Pods-ABVideoRangeSlider_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/ABVideoRangeSlider-SWIFT-5/ABVideoRangeSlider_SWIFT_5.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ABVideoRangeSlider_SWIFT_5.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ABVideoRangeSlider_Example/Pods-ABVideoRangeSlider_Example-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C9C85FF519895AE1A57CD5D6 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ABVideoRangeSlider_Example/Pods-ABVideoRangeSlider_Example-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ABVideoRangeSlider_Example/Pods-ABVideoRangeSlider_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -438,6 +400,7 @@
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -474,6 +437,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_VERSION = 5.0;
 				VALIDATE_PRODUCT = YES;
 			};
 			name = Release;
@@ -483,13 +447,13 @@
 			baseConfigurationReference = 6AA7B8FC97BA2D0E80D18B94 /* Pods-ABVideoRangeSlider_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = UH5C7ZL9LD;
+				DEVELOPMENT_TEAM = N3MR28TKLZ;
 				INFOPLIST_FILE = ABVideoRangeSlider/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.ABVideoRangeSlider-Example-SWIFT-5";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -498,21 +462,21 @@
 			baseConfigurationReference = 3AC92B9C0F50BBD4AB0B6B59 /* Pods-ABVideoRangeSlider_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = UH5C7ZL9LD;
+				DEVELOPMENT_TEAM = N3MR28TKLZ;
 				INFOPLIST_FILE = ABVideoRangeSlider/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MODULE_NAME = ExampleApp;
-				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.ABVideoRangeSlider-Example-SWIFT-5";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
 		607FACF31AFB9204008FA782 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = D42806DB468F56C07D2DB846 /* Pods-ABVideoRangeSlider_Tests.debug.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = UH5C7ZL9LD;
+				DEVELOPMENT_TEAM = N3MR28TKLZ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -525,15 +489,15 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
 		607FACF41AFB9204008FA782 /* Release */ = {
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = B211C6C894191DBDEC99740D /* Pods-ABVideoRangeSlider_Tests.release.xcconfig */;
 			buildSettings = {
-				DEVELOPMENT_TEAM = UH5C7ZL9LD;
+				DEVELOPMENT_TEAM = N3MR28TKLZ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -542,7 +506,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};

Example/ABVideoRangeSlider/AppDelegate.swift

@@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     var window: UIWindow?
 
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
     }

Example/ABVideoRangeSlider/ViewController.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import ABVideoRangeSlider
+import ABVideoRangeSlider_SWIFT_5
 import AVKit
 import AVFoundation
 

Example/Podfile

@@ -1,7 +1,7 @@
 use_frameworks!
 
 target 'ABVideoRangeSlider_Example' do
-  pod 'ABVideoRangeSlider', :path => '../'
+  pod 'ABVideoRangeSlider-SWIFT-5', :path => '../'
 
   target 'ABVideoRangeSlider_Tests' do
     inherit! :search_paths

Example/Tests/Tests.swift

@@ -1,6 +1,6 @@
 import UIKit
 import XCTest
-import ABVideoRangeSlider
+import ABVideoRangeSlider_SWIFT_5
 
 class Tests: XCTestCase {