Merge pull request #276 in MA/avito-ios-media-picker from swift-4.2 t…

…o develop * commit 'e00e3f018e5acf9be4cd98c28ad4a2254e4fd95d': Fix ImageSource version in Podfile for example project SEL-5255: Bump version to 4.0.0 SEL-5255: Add Swift 4.2 support
avito-tech · May 31, 2019 · 0920cd7 · 0920cd7
2 parents 02da15d + e00e3f0
commit 0920cd7
Show file tree

Hide file tree

Showing 31 changed files with 134 additions and 131 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-4.0
+4.2
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 language: objective-c
-osx_image: xcode9.4
-xcode_sdk: iphonesimulator11.4
+osx_image: xcode10.1
+xcode_sdk: iphonesimulator12.1
 
 before_install:
   - gem install cocoapods # Since Travis is not always on latest version

diff --git a/Example/PaparazzoExample.xcodeproj/project.pbxproj b/Example/PaparazzoExample.xcodeproj/project.pbxproj
@@ -904,13 +904,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -950,11 +950,11 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
-				SWIFT_VERSION = 4.0;
+				SWIFT_VERSION = 4.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -971,12 +971,11 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 5PHGGKL9UQ;
 				INFOPLIST_FILE = PaparazzoExample/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.PaparazzoExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -991,12 +990,11 @@
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 5PHGGKL9UQ;
 				INFOPLIST_FILE = PaparazzoExample/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.PaparazzoExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1008,11 +1006,10 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PaparazzoExample_NoMarshroute/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.avito.PaparazzoExample-NoMarshroute";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1024,11 +1021,10 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PaparazzoExample_NoMarshroute/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.avito.PaparazzoExample-NoMarshroute";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -1055,7 +1051,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.PaparazzoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -1083,7 +1078,6 @@
 				PRODUCT_BUNDLE_IDENTIFIER = ru.avito.PaparazzoTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -1095,11 +1089,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PaparazzoExample_Storyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.avito.PaparazzoExample-Storyboard";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -1110,11 +1103,10 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = PaparazzoExample_Storyboard/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = "ru.avito.PaparazzoExample-Storyboard";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};

diff --git a/Example/PaparazzoExample/AppDelegate.swift b/Example/PaparazzoExample/AppDelegate.swift
@@ -7,8 +7,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {
-
+    func application(
+        _ application: UIApplication,
+        didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil)
+        -> Bool
+    {
         debugPrint(NSTemporaryDirectory())
 
         cleanTemporaryDirectory()

diff --git a/Example/PaparazzoExample/Example/Presenter/ExamplePresenter.swift b/Example/PaparazzoExample/Example/Presenter/ExamplePresenter.swift
@@ -247,7 +247,7 @@ final class ExamplePresenter {
             )
 
             items.first?.image.requestImage(options: options) { (result: ImageRequestResult<UIImage>) in
-                let data = result.image.flatMap { UIImagePNGRepresentation($0) }
+                let data = result.image.flatMap { $0.pngData() }
                 let url = URL(fileURLWithPath: NSTemporaryDirectory() + "/crop_test2.jpg")
                 try! data?.write(to: url, options: [.atomic])
             }

diff --git a/Example/PaparazzoExample_NoMarshroute/AppDelegate.swift b/Example/PaparazzoExample_NoMarshroute/AppDelegate.swift
@@ -7,8 +7,11 @@ 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
+    {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = rootViewController()
         window?.makeKeyAndVisible()

diff --git a/Example/PaparazzoExample_Storyboard/AppDelegate.swift b/Example/PaparazzoExample_Storyboard/AppDelegate.swift
@@ -13,7 +13,11 @@ final 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
     }

diff --git a/Example/Podfile b/Example/Podfile
@@ -1,31 +1,31 @@
 source 'https://github.com/CocoaPods/Specs.git'
-platform :ios, :deployment_target => '8.0'
+platform :ios, :deployment_target => '9.0'
 
 inhibit_all_warnings!
 use_frameworks!
 
 target 'PaparazzoExample' do
   pod 'Paparazzo', :path => '../'
   pod 'Marshroute', '0.4.2'
-  pod 'ImageSource', '2.2.1'
+  pod 'ImageSource', '3.0.0'
 end
 
 target 'PaparazzoExample_NoMarshroute' do
   pod 'Paparazzo/Core', :path => '../'
   pod 'Paparazzo/SDWebImage', :path => '../'
-  pod 'ImageSource/Core', '2.2.1'
-  pod 'ImageSource/PHAsset', '2.2.1'
-  pod 'ImageSource/Local', '2.2.1'
-  pod 'ImageSource/Remote', '2.2.1'
-  pod 'ImageSource/SDWebImage', '2.2.1'
+  pod 'ImageSource/Core', '3.0.0'
+  pod 'ImageSource/PHAsset', '3.0.0'
+  pod 'ImageSource/Local', '3.0.0'
+  pod 'ImageSource/Remote', '3.0.0'
+  pod 'ImageSource/SDWebImage', '3.0.0'
 end
 
 target 'PaparazzoExample_Storyboard' do
   pod 'Paparazzo/Core', :path => '../'
-  pod 'ImageSource', '2.2.1'
+  pod 'ImageSource', '3.0.0'
 end
 
 target 'PaparazzoTests' do
     pod 'Paparazzo', :path => '../'
-    pod 'ImageSource', '2.2.1'
+    pod 'ImageSource', '3.0.0'
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,81 +1,81 @@
 PODS:
-  - Alamofire (4.8.1)
-  - AlamofireImage (3.5.0):
+  - Alamofire (4.8.2)
+  - AlamofireImage (3.5.2):
     - Alamofire (~> 4.8)
-  - ImageSource (2.2.1):
-    - ImageSource/AlamofireImage (= 2.2.1)
-    - ImageSource/Core (= 2.2.1)
-    - ImageSource/Local (= 2.2.1)
-    - ImageSource/PHAsset (= 2.2.1)
-    - ImageSource/Remote (= 2.2.1)
-  - ImageSource/AlamofireImage (2.2.1):
-    - AlamofireImage (~> 3)
+  - ImageSource (3.0.0):
+    - ImageSource/AlamofireImage (= 3.0.0)
+    - ImageSource/Core (= 3.0.0)
+    - ImageSource/Local (= 3.0.0)
+    - ImageSource/PHAsset (= 3.0.0)
+    - ImageSource/Remote (= 3.0.0)
+  - ImageSource/AlamofireImage (3.0.0):
+    - AlamofireImage (~> 3.4)
     - ImageSource/Remote
-  - ImageSource/Core (2.2.1)
-  - ImageSource/Local (2.2.1):
+  - ImageSource/Core (3.0.0)
+  - ImageSource/Local (3.0.0):
     - ImageSource/Core
-  - ImageSource/PHAsset (2.2.1):
+  - ImageSource/PHAsset (3.0.0):
     - ImageSource/Core
-  - ImageSource/Remote (2.2.1):
+  - ImageSource/Remote (3.0.0):
     - ImageSource/Core
     - ImageSource/UIKit
-  - ImageSource/SDWebImage (2.2.1):
+  - ImageSource/SDWebImage (3.0.0):
     - ImageSource/Remote
     - SDWebImage (~> 3.8)
-  - ImageSource/UIKit (2.2.1):
+  - ImageSource/UIKit (3.0.0):
     - ImageSource/Core
   - JNWSpringAnimation (0.7.1)
   - Marshroute (0.4.2)
-  - Paparazzo (3.0.1):
-    - ImageSource/Core (~> 2.2)
-    - ImageSource/Local (~> 2.2)
-    - ImageSource/PHAsset (~> 2.2)
-    - ImageSource/Remote (~> 2.2)
+  - Paparazzo (4.0.0):
+    - ImageSource/Core (= 3.0.0)
+    - ImageSource/Local (= 3.0.0)
+    - ImageSource/PHAsset (= 3.0.0)
+    - ImageSource/Remote (= 3.0.0)
     - JNWSpringAnimation
-    - Paparazzo/AlamofireImage (= 3.0.1)
-    - Paparazzo/Core (= 3.0.1)
-    - Paparazzo/Marshroute (= 3.0.1)
-  - Paparazzo/AlamofireImage (3.0.1):
-    - ImageSource/AlamofireImage (~> 2.2)
-    - ImageSource/Core (~> 2.2)
-    - ImageSource/Local (~> 2.2)
-    - ImageSource/PHAsset (~> 2.2)
-    - ImageSource/Remote (~> 2.2)
+    - Paparazzo/AlamofireImage (= 4.0.0)
+    - Paparazzo/Core (= 4.0.0)
+    - Paparazzo/Marshroute (= 4.0.0)
+  - Paparazzo/AlamofireImage (4.0.0):
+    - ImageSource/AlamofireImage (= 3.0.0)
+    - ImageSource/Core (= 3.0.0)
+    - ImageSource/Local (= 3.0.0)
+    - ImageSource/PHAsset (= 3.0.0)
+    - ImageSource/Remote (= 3.0.0)
     - JNWSpringAnimation
     - Paparazzo/Core
-  - Paparazzo/Core (3.0.1):
-    - ImageSource/Core (~> 2.2)
-    - ImageSource/Local (~> 2.2)
-    - ImageSource/PHAsset (~> 2.2)
-    - ImageSource/Remote (~> 2.2)
+  - Paparazzo/Core (4.0.0):
+    - ImageSource/Core (= 3.0.0)
+    - ImageSource/Local (= 3.0.0)
+    - ImageSource/PHAsset (= 3.0.0)
+    - ImageSource/Remote (= 3.0.0)
     - JNWSpringAnimation
-  - Paparazzo/Marshroute (3.0.1):
-    - ImageSource/Core (~> 2.2)
-    - ImageSource/Local (~> 2.2)
-    - ImageSource/PHAsset (~> 2.2)
-    - ImageSource/Remote (~> 2.2)
+  - Paparazzo/Marshroute (4.0.0):
+    - ImageSource/Core (= 3.0.0)
+    - ImageSource/Local (= 3.0.0)
+    - ImageSource/PHAsset (= 3.0.0)
+    - ImageSource/Remote (= 3.0.0)
     - JNWSpringAnimation
     - Marshroute
     - Paparazzo/Core
-  - Paparazzo/SDWebImage (3.0.1):
-    - ImageSource/Core (~> 2.2)
-    - ImageSource/Local (~> 2.2)
-    - ImageSource/PHAsset (~> 2.2)
-    - ImageSource/Remote (~> 2.2)
-    - ImageSource/SDWebImage (~> 2.2)
+  - Paparazzo/SDWebImage (4.0.0):
+    - ImageSource/Core (= 3.0.0)
+    - ImageSource/Local (= 3.0.0)
+    - ImageSource/PHAsset (= 3.0.0)
+    - ImageSource/Remote (= 3.0.0)
+    - ImageSource/SDWebImage (= 3.0.0)
     - JNWSpringAnimation
     - Paparazzo/Core
   - SDWebImage (3.8.2):
     - SDWebImage/Core (= 3.8.2)
   - SDWebImage/Core (3.8.2)
 
 DEPENDENCIES:
-  - ImageSource (= 2.2.1)
-  - ImageSource/Core (= 2.2.1)
-  - ImageSource/Local (= 2.2.1)
-  - ImageSource/PHAsset (= 2.2.1)
-  - ImageSource/Remote (= 2.2.1)
-  - ImageSource/SDWebImage (= 2.2.1)
+  - ImageSource (= 3.0.0)
+  - ImageSource/Core (= 3.0.0)
+  - ImageSource/Local (= 3.0.0)
+  - ImageSource/PHAsset (= 3.0.0)
+  - ImageSource/Remote (= 3.0.0)
+  - ImageSource/SDWebImage (= 3.0.0)
   - Marshroute (= 0.4.2)
   - Paparazzo (from `../`)
   - Paparazzo/Core (from `../`)
@@ -95,14 +95,14 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11
-  AlamofireImage: 1aea346f4dda2f6c67622fa5a89fcbb80d79cc16
-  ImageSource: 51ae8710c111728e9243c50f57dc96b44795f096
+  Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3
+  AlamofireImage: 63cfe3baf1370be6c498149687cf6db3e3b00999
+  ImageSource: 6610cd3b66439f59b2f0aa82af203cd9263ff36b
   JNWSpringAnimation: cd4c2f4464324f63f176c3624ffccf205211a100
   Marshroute: 15cf8067a997bf298e9db9317dd7c32b8799a787
-  Paparazzo: 33fceca71b87bb05c06197d40c11573122eba3bb
+  Paparazzo: c0d207f0b5ffa2392d1b8d99abeed30802707a30
   SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c
 
-PODFILE CHECKSUM: 5ae377b4ed464a0fffa4c8ced781286c65669eba
+PODFILE CHECKSUM: 142d29a62dad064affbfcfd7a494204abfa7ab3c
 
 COCOAPODS: 1.5.3