From 1025a2c46c87f0a116431a29710f0fae30973a55 Mon Sep 17 00:00:00 2001 From: Andrey Yutkin Date: Fri, 1 Feb 2019 19:16:45 +0300 Subject: [PATCH 1/3] SEL-5255: Add Swift 4.2 support --- .swift-version | 2 +- .travis.yml | 4 +- .../project.pbxproj | 28 ++--- Example/PaparazzoExample/AppDelegate.swift | 7 +- .../Example/Presenter/ExamplePresenter.swift | 2 +- .../AppDelegate.swift | 7 +- .../AppDelegate.swift | 6 +- Example/Podfile | 18 +-- Example/Podfile.lock | 105 ++++++++++-------- Paparazzo.podspec | 18 +-- .../CameraOutputGLKView.swift | 2 +- .../CaptureSessionPreviewService.swift | 4 +- .../Helpers/CollectionViewDataSource.swift | 2 +- .../Services/DeviceOrientationService.swift | 2 +- .../Camera/Presenter/CameraPresenter.swift | 2 +- .../Core/VIPER/Camera/View/CameraView.swift | 9 +- .../VIPER/Camera/View/FocusIndicator.swift | 4 +- .../ImageCropping/CroppedImageSource.swift | 2 +- .../InfoMessage/InfoMessageAnimator.swift | 2 +- .../View/Controls/ButtonWithActivity.swift | 4 +- .../View/Controls/CameraControlsView.swift | 2 +- .../View/MainView/PhotoPreviewCell.swift | 2 +- .../ThumbnailsView/CameraThumbnailCell.swift | 2 +- .../ThumbnailsView/ThumbnailsViewLayout.swift | 2 +- .../Presenter/PhotoLibraryPresenter.swift | 2 +- .../PhotoLibraryAlbumsTableViewCell.swift | 2 +- .../View/PhotoLibraryItemCell.swift | 2 +- .../PhotoLibrary/View/PhotoLibraryView.swift | 2 +- .../Presenter/PhotoLibraryV2Presenter.swift | 2 +- .../View/PhotoLibraryV2Layout.swift | 2 +- .../View/PhotoLibraryV2View.swift | 4 +- 31 files changed, 132 insertions(+), 122 deletions(-) diff --git a/.swift-version b/.swift-version index 5186d070..bf77d549 100644 --- a/.swift-version +++ b/.swift-version @@ -1 +1 @@ -4.0 +4.2 diff --git a/.travis.yml b/.travis.yml index e984c46e..2c4c7cfb 100644 --- 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 index 00bb90ca..866b66ae 100644 --- 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 index 93799d1a..7e867397 100644 --- 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 index 6131cdd7..86909559 100644 --- a/Example/PaparazzoExample/Example/Presenter/ExamplePresenter.swift +++ b/Example/PaparazzoExample/Example/Presenter/ExamplePresenter.swift @@ -244,7 +244,7 @@ final class ExamplePresenter { ) items.first?.image.requestImage(options: options) { (result: ImageRequestResult) 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 index f65d19e3..15fe7ff6 100644 --- 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 index 5c2baa91..e6ca0211 100644 --- 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 index 47c7fe0c..bbe0f133 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -1,5 +1,5 @@ source 'https://github.com/CocoaPods/Specs.git' -platform :ios, :deployment_target => '8.0' +platform :ios, :deployment_target => '9.0' inhibit_all_warnings! use_frameworks! @@ -7,25 +7,25 @@ use_frameworks! target 'PaparazzoExample' do pod 'Paparazzo', :path => '../' pod 'Marshroute', '0.4.2' - pod 'ImageSource', '2.2.1' + pod 'ImageSource', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' 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', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + pod 'ImageSource/PHAsset', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + pod 'ImageSource/Local', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + pod 'ImageSource/Remote', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + pod 'ImageSource/SDWebImage', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' end target 'PaparazzoExample_Storyboard' do pod 'Paparazzo/Core', :path => '../' - pod 'ImageSource', '2.2.1' + pod 'ImageSource', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' end target 'PaparazzoTests' do pod 'Paparazzo', :path => '../' - pod 'ImageSource', '2.2.1' + pod 'ImageSource', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 4fa97462..7941e904 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,68 +1,68 @@ PODS: - Alamofire (4.8.1) - - AlamofireImage (3.5.0): - - 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) + - AlamofireImage (3.4.0): + - Alamofire (~> 4.7) + - 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.0) - 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.0): - - ImageSource/Core (~> 2.2) - - ImageSource/Local (~> 2.2) - - ImageSource/PHAsset (~> 2.2) - - ImageSource/Remote (~> 2.2) + - 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.0) - Paparazzo/Core (= 3.0.0) - Paparazzo/Marshroute (= 3.0.0) - Paparazzo/AlamofireImage (3.0.0): - - ImageSource/AlamofireImage (~> 2.2) - - ImageSource/Core (~> 2.2) - - ImageSource/Local (~> 2.2) - - ImageSource/PHAsset (~> 2.2) - - ImageSource/Remote (~> 2.2) + - 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.0): - - ImageSource/Core (~> 2.2) - - ImageSource/Local (~> 2.2) - - ImageSource/PHAsset (~> 2.2) - - ImageSource/Remote (~> 2.2) + - 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.0): - - ImageSource/Core (~> 2.2) - - ImageSource/Local (~> 2.2) - - ImageSource/PHAsset (~> 2.2) - - ImageSource/Remote (~> 2.2) + - 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.0): - - ImageSource/Core (~> 2.2) - - ImageSource/Local (~> 2.2) - - ImageSource/PHAsset (~> 2.2) - - ImageSource/Remote (~> 2.2) - - ImageSource/SDWebImage (~> 2.2) + - 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): @@ -70,12 +70,12 @@ PODS: - 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 (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) + - ImageSource/Core (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) + - ImageSource/Local (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) + - ImageSource/PHAsset (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) + - ImageSource/Remote (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) + - ImageSource/SDWebImage (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) - Marshroute (= 0.4.2) - Paparazzo (from `../`) - Paparazzo/Core (from `../`) @@ -85,24 +85,31 @@ SPEC REPOS: https://github.com/cocoapods/specs.git: - Alamofire - AlamofireImage - - ImageSource - JNWSpringAnimation - Marshroute - SDWebImage EXTERNAL SOURCES: + ImageSource: + :branch: swift-4.2 + :git: https://github.com/avito-tech/ImageSource Paparazzo: :path: "../" +CHECKOUT OPTIONS: + ImageSource: + :commit: 72a922bb45464bd4f783137148fc685b74e0420b + :git: https://github.com/avito-tech/ImageSource + SPEC CHECKSUMS: Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11 - AlamofireImage: 1aea346f4dda2f6c67622fa5a89fcbb80d79cc16 - ImageSource: 51ae8710c111728e9243c50f57dc96b44795f096 + AlamofireImage: 5f79836de27236819b13b27d0c97be6c205976fe + ImageSource: c58fa9f14fd294366dee4095853c80cd548975ec JNWSpringAnimation: cd4c2f4464324f63f176c3624ffccf205211a100 Marshroute: 15cf8067a997bf298e9db9317dd7c32b8799a787 - Paparazzo: 341cfe0119a30630e857d960cfac6bc344d848b0 + Paparazzo: 2ba77e625c60e1a54ed7a6d4474eb33ebe482944 SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c -PODFILE CHECKSUM: 5ae377b4ed464a0fffa4c8ced781286c65669eba +PODFILE CHECKSUM: c5c4e873e4ca6ae8b0b8cdb41bcf5a8f464856f9 COCOAPODS: 1.5.3 diff --git a/Paparazzo.podspec b/Paparazzo.podspec index a0123a75..664cfbb4 100644 --- a/Paparazzo.podspec +++ b/Paparazzo.podspec @@ -7,29 +7,29 @@ Pod::Spec.new do |s| s.license = 'MIT' s.author = { 'Andrey Yutkin' => 'ayutkin@avito.ru' } s.source = { :git => 'https://github.com/avito-tech/Paparazzo.git', :tag => "#{s.version}" } - s.platform = :ios, '8.0' - s.ios.deployment_target = "8.0" - s.requires_arc = true + s.platform = :ios, '9.0' + s.ios.deployment_target = '9.0' + s.requires_arc = true s.frameworks = 'UIKit', 'Photos', 'ImageIO', 'MobileCoreServices', 'GLKit', 'OpenGLES', 'CoreMedia', 'CoreVideo', 'AVFoundation', 'QuartzCore' s.dependency 'JNWSpringAnimation' - s.dependency 'ImageSource/Core', '~> 2.2' - s.dependency 'ImageSource/PHAsset', '~> 2.2' - s.dependency 'ImageSource/Local', '~> 2.2' - s.dependency 'ImageSource/Remote', '~> 2.2' + s.dependency 'ImageSource/Core', '3.0.0' + s.dependency 'ImageSource/PHAsset', '3.0.0' + s.dependency 'ImageSource/Local', '3.0.0' + s.dependency 'ImageSource/Remote', '3.0.0' s.default_subspec = 'Core', 'Marshroute', 'AlamofireImage' s.subspec 'AlamofireImage' do |ai| ai.dependency 'Paparazzo/Core' - ai.dependency 'ImageSource/AlamofireImage', '~> 2.2' + ai.dependency 'ImageSource/AlamofireImage', '3.0.0' end s.subspec 'SDWebImage' do |sd| sd.dependency 'Paparazzo/Core' - sd.dependency 'ImageSource/SDWebImage', '~> 2.2' + sd.dependency 'ImageSource/SDWebImage', '3.0.0' end s.subspec 'Core' do |cs| diff --git a/Paparazzo/Core/Helpers/CameraOutputRenderView/CameraOutputGLKView.swift b/Paparazzo/Core/Helpers/CameraOutputRenderView/CameraOutputGLKView.swift index 926aa83b..d6209794 100644 --- a/Paparazzo/Core/Helpers/CameraOutputRenderView/CameraOutputGLKView.swift +++ b/Paparazzo/Core/Helpers/CameraOutputRenderView/CameraOutputGLKView.swift @@ -12,7 +12,7 @@ final class CameraOutputGLKView: GLKView, CameraOutputRenderView, CameraCaptureO init(captureSession: AVCaptureSession, outputOrientation: ExifOrientation, eaglContext: EAGLContext) { - ciContext = CIContext(eaglContext: eaglContext, options: [kCIContextWorkingColorSpace: NSNull()]) + ciContext = CIContext(eaglContext: eaglContext, options: [CIContextOption.workingColorSpace: NSNull()]) orientation = outputOrientation super.init(frame: .zero, context: eaglContext) diff --git a/Paparazzo/Core/Helpers/CaptureSessionPreviewService.swift b/Paparazzo/Core/Helpers/CaptureSessionPreviewService.swift index 159cf8dc..50eb0c56 100644 --- a/Paparazzo/Core/Helpers/CaptureSessionPreviewService.swift +++ b/Paparazzo/Core/Helpers/CaptureSessionPreviewService.swift @@ -79,14 +79,14 @@ final class CaptureSessionPreviewService: NSObject, AVCaptureVideoDataOutputSamp notificationCenter.addObserver( self, selector: #selector(handleAppWillResignActive(_:)), - name: .UIApplicationWillResignActive, + name: UIApplication.willResignActiveNotification, object: nil ) notificationCenter.addObserver( self, selector: #selector(handleAppDidBecomeActive(_:)), - name: .UIApplicationDidBecomeActive, + name: UIApplication.didBecomeActiveNotification, object: nil ) } diff --git a/Paparazzo/Core/Helpers/CollectionViewDataSource.swift b/Paparazzo/Core/Helpers/CollectionViewDataSource.swift index 790751ce..a8532ef5 100644 --- a/Paparazzo/Core/Helpers/CollectionViewDataSource.swift +++ b/Paparazzo/Core/Helpers/CollectionViewDataSource.swift @@ -121,7 +121,7 @@ final class CollectionViewDataSource: NSObject, UICollec viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView { - guard let headerReuseIdentifier = headerReuseIdentifier, kind == UICollectionElementKindSectionHeader else { + guard let headerReuseIdentifier = headerReuseIdentifier, kind == UICollectionView.elementKindSectionHeader else { preconditionFailure("Invalid supplementary view type for this collection view") } diff --git a/Paparazzo/Core/Services/DeviceOrientationService.swift b/Paparazzo/Core/Services/DeviceOrientationService.swift index 45d38230..18aba400 100644 --- a/Paparazzo/Core/Services/DeviceOrientationService.swift +++ b/Paparazzo/Core/Services/DeviceOrientationService.swift @@ -43,7 +43,7 @@ final class DeviceOrientationServiceImpl: DeviceOrientationService { NotificationCenter.default.addObserver( self, selector: #selector(onOrientationChange(_:)), - name: .UIDeviceOrientationDidChange, + name: UIDevice.orientationDidChangeNotification, object: device ) } diff --git a/Paparazzo/Core/VIPER/Camera/Presenter/CameraPresenter.swift b/Paparazzo/Core/VIPER/Camera/Presenter/CameraPresenter.swift index d47e0003..20109af9 100644 --- a/Paparazzo/Core/VIPER/Camera/Presenter/CameraPresenter.swift +++ b/Paparazzo/Core/VIPER/Camera/Presenter/CameraPresenter.swift @@ -97,7 +97,7 @@ final class CameraPresenter: CameraModuleInput { view?.setAccessDeniedButtonTitle(localized("Allow access to camera")) view?.onAccessDeniedButtonTap = { - if let url = URL(string: UIApplicationOpenSettingsURLString) { + if let url = URL(string: UIApplication.openSettingsURLString) { UIApplication.shared.openURL(url) } } diff --git a/Paparazzo/Core/VIPER/Camera/View/CameraView.swift b/Paparazzo/Core/VIPER/Camera/View/CameraView.swift index b2a61319..6dc71c50 100644 --- a/Paparazzo/Core/VIPER/Camera/View/CameraView.swift +++ b/Paparazzo/Core/VIPER/Camera/View/CameraView.swift @@ -154,9 +154,10 @@ final class CameraView: UIView, CameraViewInput, ThemeConfigurable { addSubview(newCameraOutputView) - bringSubview(toFront: titleLabel) - bringSubview(toFront: subtitleLabel) - bringSubview(toFront: hintLabel) + bringSubviewToFront(titleLabel) + bringSubviewToFront(subtitleLabel) + bringSubviewToFront(hintLabel) + self.cameraOutputView = newCameraOutputView self.outputParameters = parameters } @@ -187,7 +188,7 @@ final class CameraView: UIView, CameraViewInput, ThemeConfigurable { let attributedString = NSMutableAttributedString(string: text) attributedString.addAttribute( - NSAttributedStringKey.paragraphStyle, + NSAttributedString.Key.paragraphStyle, value: style, range: NSRange(location: 0, length: attributedString.length) ) diff --git a/Paparazzo/Core/VIPER/Camera/View/FocusIndicator.swift b/Paparazzo/Core/VIPER/Camera/View/FocusIndicator.swift index 02e10bb1..80772b14 100644 --- a/Paparazzo/Core/VIPER/Camera/View/FocusIndicator.swift +++ b/Paparazzo/Core/VIPER/Camera/View/FocusIndicator.swift @@ -70,7 +70,7 @@ final class FocusIndicatorScaleAnimation: CABasicAnimation { duration = 0.3 autoreverses = true isRemovedOnCompletion = false - timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn) + timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn) } required init?(coder aDecoder: NSCoder) { @@ -87,7 +87,7 @@ final class FocusIndicatorOpacityAnimation: CABasicAnimation { duration = 0.3 autoreverses = true isRemovedOnCompletion = false - timingFunction = CAMediaTimingFunction(name: kCAMediaTimingFunctionEaseIn) + timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.easeIn) } required init?(coder aDecoder: NSCoder) { diff --git a/Paparazzo/Core/VIPER/ImageCropping/CroppedImageSource.swift b/Paparazzo/Core/VIPER/ImageCropping/CroppedImageSource.swift index 1f1a0bc4..32443503 100644 --- a/Paparazzo/Core/VIPER/ImageCropping/CroppedImageSource.swift +++ b/Paparazzo/Core/VIPER/ImageCropping/CroppedImageSource.swift @@ -89,7 +89,7 @@ final class CroppedImageSource: ImageSource { // MARK: - Private - private let ciContext = CIContext.fixed_context(options: [kCIContextUseSoftwareRenderer: false]) + private let ciContext = CIContext(options: [CIContextOption.useSoftwareRenderer: false]) private let imageStorage: ImageStorage private var croppedImage: LocalImageSource? diff --git a/Paparazzo/Core/VIPER/InfoMessage/InfoMessageAnimator.swift b/Paparazzo/Core/VIPER/InfoMessage/InfoMessageAnimator.swift index 02a0ced4..e8d9f6c2 100644 --- a/Paparazzo/Core/VIPER/InfoMessage/InfoMessageAnimator.swift +++ b/Paparazzo/Core/VIPER/InfoMessage/InfoMessageAnimator.swift @@ -65,7 +65,7 @@ final class InfoMessageAnimator: InfoMessageViewInput { messageView.size = messageView.sizeThatFits(container.size) behavior.configure(messageView: messageView, in: container) container.addSubview(messageView) - container.bringSubview(toFront: messageView) + container.bringSubviewToFront(messageView) changeState(to: .appearing) } diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/Controls/ButtonWithActivity.swift b/Paparazzo/Core/VIPER/MediaPicker/View/Controls/ButtonWithActivity.swift index 7d929130..3efc18ba 100644 --- a/Paparazzo/Core/VIPER/MediaPicker/View/Controls/ButtonWithActivity.swift +++ b/Paparazzo/Core/VIPER/MediaPicker/View/Controls/ButtonWithActivity.swift @@ -3,7 +3,7 @@ import UIKit final class ButtonWithActivity: UIButton { // MARK: - Subviews - private let activity = UIActivityIndicatorView(activityIndicatorStyle: .gray) + private let activity = UIActivityIndicatorView(style: .gray) // MARK: - State private var cachedTitle: String? = nil @@ -39,7 +39,7 @@ final class ButtonWithActivity: UIButton { } // MARK: - Title - override func setTitle(_ title: String?, for state: UIControlState) { + override func setTitle(_ title: String?, for state: UIControl.State) { switch style { case .normal: super.setTitle(title, for: state) diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/Controls/CameraControlsView.swift b/Paparazzo/Core/VIPER/MediaPicker/View/Controls/CameraControlsView.swift index 14bc04de..cfaa889d 100644 --- a/Paparazzo/Core/VIPER/MediaPicker/View/Controls/CameraControlsView.swift +++ b/Paparazzo/Core/VIPER/MediaPicker/View/Controls/CameraControlsView.swift @@ -98,7 +98,7 @@ final class CameraControlsView: UIView, ThemeConfigurable { override func layoutSubviews() { super.layoutSubviews() - let contentHeight = UIEdgeInsetsInsetRect(bounds, insets).size.height + let contentHeight = bounds.inset(by: insets).size.height let shutterButtonDiameter = max(shutterButtonMinDiameter, min(shutterButtonMaxDiameter, contentHeight)) let shutterButtonSize = CGSize(width: shutterButtonDiameter, height: shutterButtonDiameter) let centerY = bounds.centerY - paparazzoSafeAreaInsets.bottom / 2 diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/MainView/PhotoPreviewCell.swift b/Paparazzo/Core/VIPER/MediaPicker/View/MainView/PhotoPreviewCell.swift index 57567b28..ff197a66 100644 --- a/Paparazzo/Core/VIPER/MediaPicker/View/MainView/PhotoPreviewCell.swift +++ b/Paparazzo/Core/VIPER/MediaPicker/View/MainView/PhotoPreviewCell.swift @@ -3,7 +3,7 @@ import UIKit final class PhotoPreviewCell: PhotoCollectionViewCell { - private let progressIndicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge) + private let progressIndicator = UIActivityIndicatorView(style: .whiteLarge) override init(frame: CGRect) { super.init(frame: frame) diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/CameraThumbnailCell.swift b/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/CameraThumbnailCell.swift index 2d821ef4..edfff41c 100644 --- a/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/CameraThumbnailCell.swift +++ b/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/CameraThumbnailCell.swift @@ -93,7 +93,7 @@ final class CameraThumbnailCell: UICollectionViewCell { let insets = UIEdgeInsets(top: 0.5, left: 0.5, bottom: 0.5, right: 0.5) - cameraOutputView?.frame = UIEdgeInsetsInsetRect(bounds, insets) + cameraOutputView?.frame = bounds.inset(by: insets) button.frame = bounds } diff --git a/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/ThumbnailsViewLayout.swift b/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/ThumbnailsViewLayout.swift index 7c77b235..ebcc7a34 100644 --- a/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/ThumbnailsViewLayout.swift +++ b/Paparazzo/Core/VIPER/MediaPicker/View/ThumbnailsView/ThumbnailsViewLayout.swift @@ -264,7 +264,7 @@ final class ThumbnailsViewLayout: UICollectionViewFlowLayout { let displayLink = CADisplayLink(target: self, selector: #selector(onContinuousScroll)) displayLink.frameInterval = 1 - displayLink.add(to: RunLoop.main, forMode: RunLoopMode.commonModes) + displayLink.add(to: RunLoop.main, forMode: RunLoop.Mode.common) self.displayLink = displayLink } diff --git a/Paparazzo/Core/VIPER/PhotoLibrary/Presenter/PhotoLibraryPresenter.swift b/Paparazzo/Core/VIPER/PhotoLibrary/Presenter/PhotoLibraryPresenter.swift index 29eb009f..4d960dd6 100644 --- a/Paparazzo/Core/VIPER/PhotoLibrary/Presenter/PhotoLibraryPresenter.swift +++ b/Paparazzo/Core/VIPER/PhotoLibrary/Presenter/PhotoLibraryPresenter.swift @@ -115,7 +115,7 @@ final class PhotoLibraryPresenter: PhotoLibraryModule { } view?.onAccessDeniedButtonTap = { - if let url = URL(string: UIApplicationOpenSettingsURLString) { + if let url = URL(string: UIApplication.openSettingsURLString) { UIApplication.shared.openURL(url) } } diff --git a/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryAlbumsTableViewCell.swift b/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryAlbumsTableViewCell.swift index 773e6c47..83695419 100644 --- a/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryAlbumsTableViewCell.swift +++ b/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryAlbumsTableViewCell.swift @@ -30,7 +30,7 @@ final class PhotoLibraryAlbumsTableViewCell: UITableViewCell { } // MARK: - Init - override init(style: UITableViewCellStyle, reuseIdentifier: String?) { + override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) { super.init(style: .default, reuseIdentifier: reuseIdentifier) selectionStyle = .none diff --git a/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryItemCell.swift b/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryItemCell.swift index c40bb0aa..9e9498eb 100644 --- a/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryItemCell.swift +++ b/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryItemCell.swift @@ -42,7 +42,7 @@ final class PhotoLibraryItemCell: PhotoCollectionViewCell, Customizable { let onePixel = CGFloat(1) / UIScreen.main.nativeScale let backgroundInsets = UIEdgeInsets(top: onePixel, left: onePixel, bottom: onePixel, right: onePixel) - backgroundView?.frame = UIEdgeInsetsInsetRect(imageView.frame, backgroundInsets) + backgroundView?.frame = imageView.frame.inset(by: backgroundInsets) cloudIconView.sizeToFit() cloudIconView.right = contentView.bounds.right diff --git a/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryView.swift b/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryView.swift index d75cf70b..82dee6a7 100644 --- a/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryView.swift +++ b/Paparazzo/Core/VIPER/PhotoLibrary/View/PhotoLibraryView.swift @@ -28,7 +28,7 @@ final class PhotoLibraryView: UIView, UICollectionViewDelegateFlowLayout, ThemeC private var collectionSnapshotView: UIView? private let titleView = PhotoLibraryTitleView() private let accessDeniedView = AccessDeniedView() - private let progressIndicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge) + private let progressIndicator = UIActivityIndicatorView(style: .whiteLarge) private let toolbar = PhotoLibraryToolbar() private let dimView = UIView() private let albumsTableView = PhotoLibraryAlbumsTableView() diff --git a/Paparazzo/Core/VIPER/PhotoLibraryV2/Presenter/PhotoLibraryV2Presenter.swift b/Paparazzo/Core/VIPER/PhotoLibraryV2/Presenter/PhotoLibraryV2Presenter.swift index e9556840..1b6775f3 100644 --- a/Paparazzo/Core/VIPER/PhotoLibraryV2/Presenter/PhotoLibraryV2Presenter.swift +++ b/Paparazzo/Core/VIPER/PhotoLibraryV2/Presenter/PhotoLibraryV2Presenter.swift @@ -244,7 +244,7 @@ final class PhotoLibraryV2Presenter: PhotoLibraryV2Module { } view?.onAccessDeniedButtonTap = { - if let url = URL(string: UIApplicationOpenSettingsURLString) { + if let url = URL(string: UIApplication.openSettingsURLString) { UIApplication.shared.openURL(url) } } diff --git a/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2Layout.swift b/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2Layout.swift index a778d08d..09b24748 100644 --- a/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2Layout.swift +++ b/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2Layout.swift @@ -99,7 +99,7 @@ final class PhotoLibraryV2Layout: UICollectionViewFlowLayout { private func setUpHeaderAttributes(section: Int) -> CGFloat { let headerIndexPath = IndexPath(item: 0, section: section) let headerAttributes = UICollectionViewLayoutAttributes( - forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, + forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, with: headerIndexPath ) let origin = CGPoint( diff --git a/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2View.swift b/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2View.swift index d647a06c..6dfaf64b 100644 --- a/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2View.swift +++ b/Paparazzo/Core/VIPER/PhotoLibraryV2/View/PhotoLibraryV2View.swift @@ -31,7 +31,7 @@ final class PhotoLibraryV2View: UIView, UICollectionViewDelegateFlowLayout, Them private var collectionSnapshotView: UIView? private let titleView = PhotoLibraryV2TitleView() private let accessDeniedView = AccessDeniedView() - private let progressIndicator = UIActivityIndicatorView(activityIndicatorStyle: .whiteLarge) + private let progressIndicator = UIActivityIndicatorView(style: .whiteLarge) private let dimView = UIView() private let albumsTableView = PhotoLibraryAlbumsTableView() private let placeholderView = UILabel() @@ -504,7 +504,7 @@ final class PhotoLibraryV2View: UIView, UICollectionViewDelegateFlowLayout, Them if let headerReuseIdentifier = dataSource.headerReuseIdentifier { collectionView.register( PhotoLibraryCameraView.self, - forSupplementaryViewOfKind: UICollectionElementKindSectionHeader, + forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: headerReuseIdentifier ) } From 0af543a403dc62f8fbdb6c1c03f5fc79cf2f3fa5 Mon Sep 17 00:00:00 2001 From: Andrey Yutkin Date: Fri, 1 Feb 2019 19:36:06 +0300 Subject: [PATCH 2/3] SEL-5255: Bump version to 4.0.0 --- Example/Podfile.lock | 18 +++++++++--------- Paparazzo.podspec | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 7941e904..65d7d7a0 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -26,16 +26,16 @@ PODS: - ImageSource/Core - JNWSpringAnimation (0.7.1) - Marshroute (0.4.2) - - Paparazzo (3.0.0): + - 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.0) - - Paparazzo/Core (= 3.0.0) - - Paparazzo/Marshroute (= 3.0.0) - - Paparazzo/AlamofireImage (3.0.0): + - 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) @@ -43,13 +43,13 @@ PODS: - ImageSource/Remote (= 3.0.0) - JNWSpringAnimation - Paparazzo/Core - - Paparazzo/Core (3.0.0): + - 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.0): + - Paparazzo/Marshroute (4.0.0): - ImageSource/Core (= 3.0.0) - ImageSource/Local (= 3.0.0) - ImageSource/PHAsset (= 3.0.0) @@ -57,7 +57,7 @@ PODS: - JNWSpringAnimation - Marshroute - Paparazzo/Core - - Paparazzo/SDWebImage (3.0.0): + - Paparazzo/SDWebImage (4.0.0): - ImageSource/Core (= 3.0.0) - ImageSource/Local (= 3.0.0) - ImageSource/PHAsset (= 3.0.0) @@ -107,7 +107,7 @@ SPEC CHECKSUMS: ImageSource: c58fa9f14fd294366dee4095853c80cd548975ec JNWSpringAnimation: cd4c2f4464324f63f176c3624ffccf205211a100 Marshroute: 15cf8067a997bf298e9db9317dd7c32b8799a787 - Paparazzo: 2ba77e625c60e1a54ed7a6d4474eb33ebe482944 + Paparazzo: c0d207f0b5ffa2392d1b8d99abeed30802707a30 SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c PODFILE CHECKSUM: c5c4e873e4ca6ae8b0b8cdb41bcf5a8f464856f9 diff --git a/Paparazzo.podspec b/Paparazzo.podspec index 664cfbb4..8ed88bb2 100644 --- a/Paparazzo.podspec +++ b/Paparazzo.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = 'Paparazzo' s.module_name = 'Paparazzo' - s.version = '3.0.0' + s.version = '4.0.0' s.summary = "iOS component for picking and editing photos from camera and user's photo library" s.homepage = 'https://github.com/avito-tech/Paparazzo' s.license = 'MIT' From e00e3f018e5acf9be4cd98c28ad4a2254e4fd95d Mon Sep 17 00:00:00 2001 From: Andrey Yutkin Date: Fri, 31 May 2019 09:35:29 +0300 Subject: [PATCH 3/3] Fix ImageSource version in Podfile for example project --- Example/Podfile | 16 ++++++++-------- Example/Podfile.lock | 37 +++++++++++++++---------------------- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/Example/Podfile b/Example/Podfile index bbe0f133..92f40d6a 100644 --- a/Example/Podfile +++ b/Example/Podfile @@ -7,25 +7,25 @@ use_frameworks! target 'PaparazzoExample' do pod 'Paparazzo', :path => '../' pod 'Marshroute', '0.4.2' - pod 'ImageSource', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + pod 'ImageSource', '3.0.0' end target 'PaparazzoExample_NoMarshroute' do pod 'Paparazzo/Core', :path => '../' pod 'Paparazzo/SDWebImage', :path => '../' - pod 'ImageSource/Core', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' - pod 'ImageSource/PHAsset', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' - pod 'ImageSource/Local', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' - pod 'ImageSource/Remote', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' - pod 'ImageSource/SDWebImage', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + 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', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + pod 'ImageSource', '3.0.0' end target 'PaparazzoTests' do pod 'Paparazzo', :path => '../' - pod 'ImageSource', :git => 'https://github.com/avito-tech/ImageSource', :branch => 'swift-4.2' + pod 'ImageSource', '3.0.0' end diff --git a/Example/Podfile.lock b/Example/Podfile.lock index 65d7d7a0..ab416287 100644 --- a/Example/Podfile.lock +++ b/Example/Podfile.lock @@ -1,7 +1,7 @@ PODS: - - Alamofire (4.8.1) - - AlamofireImage (3.4.0): - - Alamofire (~> 4.7) + - Alamofire (4.8.2) + - AlamofireImage (3.5.2): + - Alamofire (~> 4.8) - ImageSource (3.0.0): - ImageSource/AlamofireImage (= 3.0.0) - ImageSource/Core (= 3.0.0) @@ -9,7 +9,7 @@ PODS: - ImageSource/PHAsset (= 3.0.0) - ImageSource/Remote (= 3.0.0) - ImageSource/AlamofireImage (3.0.0): - - AlamofireImage (= 3.4.0) + - AlamofireImage (~> 3.4) - ImageSource/Remote - ImageSource/Core (3.0.0) - ImageSource/Local (3.0.0): @@ -70,12 +70,12 @@ PODS: - SDWebImage/Core (3.8.2) DEPENDENCIES: - - ImageSource (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) - - ImageSource/Core (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) - - ImageSource/Local (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) - - ImageSource/PHAsset (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) - - ImageSource/Remote (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) - - ImageSource/SDWebImage (from `https://github.com/avito-tech/ImageSource`, branch `swift-4.2`) + - 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 `../`) @@ -85,31 +85,24 @@ SPEC REPOS: https://github.com/cocoapods/specs.git: - Alamofire - AlamofireImage + - ImageSource - JNWSpringAnimation - Marshroute - SDWebImage EXTERNAL SOURCES: - ImageSource: - :branch: swift-4.2 - :git: https://github.com/avito-tech/ImageSource Paparazzo: :path: "../" -CHECKOUT OPTIONS: - ImageSource: - :commit: 72a922bb45464bd4f783137148fc685b74e0420b - :git: https://github.com/avito-tech/ImageSource - SPEC CHECKSUMS: - Alamofire: 16ce2c353fb72865124ddae8a57c5942388f4f11 - AlamofireImage: 5f79836de27236819b13b27d0c97be6c205976fe - ImageSource: c58fa9f14fd294366dee4095853c80cd548975ec + Alamofire: ae5c501addb7afdbb13687d7f2f722c78734c2d3 + AlamofireImage: 63cfe3baf1370be6c498149687cf6db3e3b00999 + ImageSource: 6610cd3b66439f59b2f0aa82af203cd9263ff36b JNWSpringAnimation: cd4c2f4464324f63f176c3624ffccf205211a100 Marshroute: 15cf8067a997bf298e9db9317dd7c32b8799a787 Paparazzo: c0d207f0b5ffa2392d1b8d99abeed30802707a30 SDWebImage: 098e97e6176540799c27e804c96653ee0833d13c -PODFILE CHECKSUM: c5c4e873e4ca6ae8b0b8cdb41bcf5a8f464856f9 +PODFILE CHECKSUM: 142d29a62dad064affbfcfd7a494204abfa7ab3c COCOAPODS: 1.5.3