From eb5a2fc984b748a4bdbb54bb8c463155fe5fbf3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Gyllstr=C3=B6m?= Date: Wed, 19 Sep 2018 13:30:35 +0200 Subject: [PATCH] Updated to Swift 4.2 --- BSImagePicker.podspec | 8 +- BSImagePicker.xcodeproj/project.pbxproj | 2 + .../xcshareddata/xcschemes/Example.xcscheme | 2 +- Cartfile | 2 +- Podfile.lock | 14 +- Pods/BSImageView/README.md | 2 +- Pods/BSImageView/Source/BSImageView.swift | 2 +- Pods/BSImageView/Source/ImageViewLayout.swift | 6 +- .../Local Podspecs/BSImagePicker.podspec.json | 6 +- Pods/Manifest.lock | 14 +- Pods/Pods.xcodeproj/project.pbxproj | 228 +++++++++--------- .../xcschemes/BSImagePicker.xcscheme | 2 +- .../BSGridCollectionViewLayout/Info.plist | 2 +- .../BSImageView/Info.plist | 2 +- .../BSImagePickerViewController.swift | 2 +- Source/Controller/PhotosViewController.swift | 19 +- Source/Controller/ZoomAnimator.swift | 2 +- .../Model/PhotoCollectionViewDataSource.swift | 2 +- Source/Model/Settings.swift | 8 +- Source/Protocol/BSImagePickerSettings.swift | 2 +- 20 files changed, 173 insertions(+), 154 deletions(-) diff --git a/BSImagePicker.podspec b/BSImagePicker.podspec index 216fb607..93f5514b 100755 --- a/BSImagePicker.podspec +++ b/BSImagePicker.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "BSImagePicker" - s.version = "2.8.0" + s.version = "2.8.2" s.summary = "BSImagePicker is a multiple image picker for iOS. UIImagePickerController replacement" s.description = <<-DESC A mix between the native iOS gallery and facebooks image picker. Allows you to preview and select multiple images. @@ -13,7 +13,7 @@ Pod::Spec.new do |s| s.platform = :ios, '8.0' s.requires_arc = true - s.swift_version = '4.1' + s.swift_version = '4.2' s.source_files = 'Source/**/*.swift' s.resource_bundles = { @@ -25,6 +25,6 @@ Pod::Spec.new do |s| } s.frameworks = 'UIKit', 'Photos' - s.dependency 'BSImageView', '~> 1.0.0' - s.dependency 'BSGridCollectionViewLayout', '~> 1.2.0' + s.dependency 'BSImageView', '1.0.2' + s.dependency 'BSGridCollectionViewLayout', '1.2.2' end diff --git a/BSImagePicker.xcodeproj/project.pbxproj b/BSImagePicker.xcodeproj/project.pbxproj index 46088091..69c1541f 100644 --- a/BSImagePicker.xcodeproj/project.pbxproj +++ b/BSImagePicker.xcodeproj/project.pbxproj @@ -19,6 +19,7 @@ 607FACDD1AFB9204008FA782 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDC1AFB9204008FA782 /* Images.xcassets */; }; 607FACE01AFB9204008FA782 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 607FACDE1AFB9204008FA782 /* LaunchScreen.xib */; }; 7A586D1B6B09B1C1E170FE32 /* Pods_Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1CAE39554B42C348AB880FB /* Pods_Tests.framework */; }; + 7A5F7EDE9CD69925606959D9 /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0C23A7F8CA60DB2B576AA0FF /* Pods_Example.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -87,6 +88,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 7A5F7EDE9CD69925606959D9 /* Pods_Example.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/BSImagePicker.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/BSImagePicker.xcodeproj/xcshareddata/xcschemes/Example.xcscheme index 8feee3f9..79f401fa 100644 --- a/BSImagePicker.xcodeproj/xcshareddata/xcschemes/Example.xcscheme +++ b/BSImagePicker.xcodeproj/xcshareddata/xcschemes/Example.xcscheme @@ -1,6 +1,6 @@ 1.0.1 +github "mikaoj/BSImageView" ~> 1.0 github "mikaoj/BSGridCollectionViewLayout" ~> 1.2 diff --git a/Podfile.lock b/Podfile.lock index d06aec8b..529d3298 100755 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,9 +1,9 @@ PODS: - - BSGridCollectionViewLayout (1.2.1) + - BSGridCollectionViewLayout (1.2.2) - BSImagePicker (2.8.0): - - BSGridCollectionViewLayout (~> 1.2.0) - - BSImageView (~> 1.0.0) - - BSImageView (1.0.0) + - BSGridCollectionViewLayout (= 1.2.2) + - BSImageView (= 1.0.2) + - BSImageView (1.0.2) DEPENDENCIES: - BSImagePicker (from `./`) @@ -18,9 +18,9 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - BSGridCollectionViewLayout: 1a7d6f30517d3c9d181774bc74be4dfcab7b8115 - BSImagePicker: b3e38f59ea8c79ce9c848d75239e8dd1f75f9982 - BSImageView: ed9c50d917111d8cac66c21c5a41c03f57908819 + BSGridCollectionViewLayout: 3e6f23b3a2b4f0ca9afae09ca01389d1057f7b32 + BSImagePicker: d7811a22930ef205e22737d026cbcc42d1906ebc + BSImageView: ab22ff8cae61f1ae17a3c9efeeb216af3cf84a09 PODFILE CHECKSUM: 63d969a3f2dfa7a6c37f31de7279d2a43dd77a2d diff --git a/Pods/BSImageView/README.md b/Pods/BSImageView/README.md index ffd015ed..235b221b 100644 --- a/Pods/BSImageView/README.md +++ b/Pods/BSImageView/README.md @@ -9,7 +9,7 @@ BSImageView is an image view which lets you animate contentMode changes. import BSImageView ... -let imageView: BSImageView! = ... +let imageView: BSImageView = ... ... UIView.animate(withDuration: 0.3) { diff --git a/Pods/BSImageView/Source/BSImageView.swift b/Pods/BSImageView/Source/BSImageView.swift index b8035b96..a68604a2 100644 --- a/Pods/BSImageView/Source/BSImageView.swift +++ b/Pods/BSImageView/Source/BSImageView.swift @@ -34,7 +34,7 @@ public class BSImageView: UIView { didSet { imageView.tintColor = tintColor } } - override public var contentMode: UIViewContentMode { + override public var contentMode: UIView.ContentMode { didSet { setNeedsLayout() layoutIfNeeded() diff --git a/Pods/BSImageView/Source/ImageViewLayout.swift b/Pods/BSImageView/Source/ImageViewLayout.swift index c83d8041..fde90e2d 100644 --- a/Pods/BSImageView/Source/ImageViewLayout.swift +++ b/Pods/BSImageView/Source/ImageViewLayout.swift @@ -23,14 +23,14 @@ import Foundation struct ImageViewLayout { - static func frameForImageWithSize(_ image: CGSize, previousFrame: CGRect, inContainerWithSize container: CGSize, usingContentMode contentMode: UIViewContentMode) -> CGRect { + static func frameForImageWithSize(_ image: CGSize, previousFrame: CGRect, inContainerWithSize container: CGSize, usingContentMode contentMode: UIView.ContentMode) -> CGRect { let size = sizeForImage(image, previousSize: previousFrame.size, container: container, contentMode: contentMode) let position = positionForImage(size, previousPosition: previousFrame.origin, container: container, contentMode: contentMode) return CGRect(origin: position, size: size) } - private static func sizeForImage(_ image: CGSize, previousSize: CGSize, container: CGSize, contentMode: UIViewContentMode) -> CGSize { + private static func sizeForImage(_ image: CGSize, previousSize: CGSize, container: CGSize, contentMode: UIView.ContentMode) -> CGSize { switch contentMode { case .scaleToFill: return container @@ -49,7 +49,7 @@ struct ImageViewLayout { } } - private static func positionForImage(_ image: CGSize, previousPosition: CGPoint, container: CGSize, contentMode: UIViewContentMode) -> CGPoint { + private static func positionForImage(_ image: CGSize, previousPosition: CGPoint, container: CGSize, contentMode: UIView.ContentMode) -> CGPoint { switch contentMode { case .scaleToFill: return .zero diff --git a/Pods/Local Podspecs/BSImagePicker.podspec.json b/Pods/Local Podspecs/BSImagePicker.podspec.json index fb180fa8..850f9b20 100755 --- a/Pods/Local Podspecs/BSImagePicker.podspec.json +++ b/Pods/Local Podspecs/BSImagePicker.podspec.json @@ -16,7 +16,7 @@ "ios": "8.0" }, "requires_arc": true, - "swift_version": "4.1", + "swift_version": "4.2", "source_files": "Source/**/*.swift", "resource_bundles": { "BSImagePicker": [ @@ -33,10 +33,10 @@ ], "dependencies": { "BSImageView": [ - "~> 1.0.0" + "1.0.2" ], "BSGridCollectionViewLayout": [ - "~> 1.2.0" + "1.2.2" ] } } diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index d06aec8b..529d3298 100755 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,9 +1,9 @@ PODS: - - BSGridCollectionViewLayout (1.2.1) + - BSGridCollectionViewLayout (1.2.2) - BSImagePicker (2.8.0): - - BSGridCollectionViewLayout (~> 1.2.0) - - BSImageView (~> 1.0.0) - - BSImageView (1.0.0) + - BSGridCollectionViewLayout (= 1.2.2) + - BSImageView (= 1.0.2) + - BSImageView (1.0.2) DEPENDENCIES: - BSImagePicker (from `./`) @@ -18,9 +18,9 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - BSGridCollectionViewLayout: 1a7d6f30517d3c9d181774bc74be4dfcab7b8115 - BSImagePicker: b3e38f59ea8c79ce9c848d75239e8dd1f75f9982 - BSImageView: ed9c50d917111d8cac66c21c5a41c03f57908819 + BSGridCollectionViewLayout: 3e6f23b3a2b4f0ca9afae09ca01389d1057f7b32 + BSImagePicker: d7811a22930ef205e22737d026cbcc42d1906ebc + BSImageView: ab22ff8cae61f1ae17a3c9efeeb216af3cf84a09 PODFILE CHECKSUM: 63d969a3f2dfa7a6c37f31de7279d2a43dd77a2d diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index d3e56289..683937a0 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -154,31 +154,31 @@ 4A5B20F1F32FB82B68C3B1BB0743E8C3 /* Settings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = ""; }; 4AEF0D2856EDD9863B044EF1E8F0E9CA /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 4C7757B64A0DD150BB310C7B48C6B96A /* PhotoCollectionViewDataSource.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PhotoCollectionViewDataSource.swift; sourceTree = ""; }; - 539917D4064CE0548CF614622B7B47E1 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Example.framework; path = "Pods-Example.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + 539917D4064CE0548CF614622B7B47E1 /* Pods_Example.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Example.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5B1E1C9222F9D48664CAC0218786C2A8 /* Pods-Tests-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Tests-acknowledgements.markdown"; sourceTree = ""; }; 5E42325FB5FD1CB5F2DBF892B8D9DF82 /* Pods-Tests-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Tests-resources.sh"; sourceTree = ""; }; 606844D11DB739559960F303476BE83B /* NSIndexSet+NSIndexPath.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = "NSIndexSet+NSIndexPath.swift"; sourceTree = ""; }; 6123E97409B36B4698C1CB973929C763 /* BSImagePicker-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "BSImagePicker-dummy.m"; sourceTree = ""; }; - 61E0CC29FF54C1B03B80DC8017E18E91 /* BSImagePicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = BSImagePicker.framework; path = BSImagePicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 61E0CC29FF54C1B03B80DC8017E18E91 /* BSImagePicker.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BSImagePicker.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 665A967C79027F8DC4A70B899367E072 /* ImageViewLayout.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ImageViewLayout.swift; path = Source/ImageViewLayout.swift; sourceTree = ""; }; 6699B9630600F2C9649D525EF1855F18 /* Pods-Example-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-Example-acknowledgements.markdown"; sourceTree = ""; }; 68E355F3EA57D900F0503F60A0FB21BC /* BSImagePickerViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BSImagePickerViewController.swift; sourceTree = ""; }; 69F7D4FC929C9849185DC95870A55E86 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Example.release.xcconfig"; sourceTree = ""; }; 6E63C39658C9189D98B446C81ADED943 /* Pods-Tests-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-Tests-acknowledgements.plist"; sourceTree = ""; }; - 78CF28D2DFCBD94D6A1B5CC14A1DC29A /* BSImageView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = BSImageView.framework; path = BSImageView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 78CF28D2DFCBD94D6A1B5CC14A1DC29A /* BSImageView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BSImageView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7EBA45DB89EA39EA70AA9BA7F3638D44 /* Albums.storyboard */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.storyboard; name = Albums.storyboard; path = Assets/Albums.storyboard; sourceTree = ""; }; 7FD34F7BE4D073E8C0F7B5C6C4CE062A /* BSGridCollectionViewLayout-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "BSGridCollectionViewLayout-prefix.pch"; sourceTree = ""; }; 80AC1D4E289628B9036F65B2297CA95F /* PhotoCell.xib */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = file.xib; name = PhotoCell.xib; path = Assets/PhotoCell.xib; sourceTree = ""; }; 874FAD371A264E4CA179B77584989F08 /* BSImagePicker.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = BSImagePicker.modulemap; sourceTree = ""; }; 8C99691FB15F3C5AA097B7FF2A075D39 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8CAFA8E74D12C7DEFDC1A8A708D39462 /* BSGridCollectionViewLayout.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = BSGridCollectionViewLayout.xcconfig; sourceTree = ""; }; - 904943ED30B2DBDF94143D2C36A70F9A /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; path = README.md; sourceTree = ""; }; + 904943ED30B2DBDF94143D2C36A70F9A /* README.md */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; 9224410074B6B90A79FC6365E88D3C75 /* Pods-Tests-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-Tests-dummy.m"; sourceTree = ""; }; - 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - 93CF439A0C77F741A904E962D966280D /* BSGridCollectionViewLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = BSGridCollectionViewLayout.framework; path = BSGridCollectionViewLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 93A4A3777CF96A4AAC1D13BA6DCCEA73 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 93CF439A0C77F741A904E962D966280D /* BSGridCollectionViewLayout.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BSGridCollectionViewLayout.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 9AF1B5F3B68D3396B21698263A37A9F7 /* BSGridCollectionViewLayout-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "BSGridCollectionViewLayout-umbrella.h"; sourceTree = ""; }; 9C155A9C7D158400C45A01FD4E4D495D /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 9EDF2BAEAA6D114412B8425FA7CA2D93 /* BSImagePicker.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; name = BSImagePicker.bundle; path = "BSImagePicker-BSImagePicker.bundle"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9EDF2BAEAA6D114412B8425FA7CA2D93 /* BSImagePicker.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BSImagePicker.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; 9F8D1E1F9D6C30F9C9274611FB612004 /* Pods-Tests-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-Tests-umbrella.h"; sourceTree = ""; }; A147B865449799ED6F8F18CC7935FB95 /* BSImagePickerSettings.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = BSImagePickerSettings.swift; sourceTree = ""; }; A3645B916115366F0D849A407CAFE7AD /* Pods-Example-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Example-frameworks.sh"; sourceTree = ""; }; @@ -199,15 +199,15 @@ CF40C04A03EFB763F1E0EEB6C30574E2 /* ComposedCollectionViewDataSource.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = ComposedCollectionViewDataSource.swift; sourceTree = ""; }; CF494BE5150401343ACC8D32B6DE4B99 /* Pods-Example.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Example.modulemap"; sourceTree = ""; }; D0426400E0ABE08E2345AF4890356D45 /* BSGridCollectionViewLayout.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = BSGridCollectionViewLayout.modulemap; sourceTree = ""; }; - D1EA4EC809D6EB8FF77AA68BD28F621D /* BSImagePicker.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; lastKnownFileType = text; path = BSImagePicker.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + D1EA4EC809D6EB8FF77AA68BD28F621D /* BSImagePicker.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; path = BSImagePicker.podspec; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; D554C0A3B778D90D1D1C6A56933B4E62 /* PhotosViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PhotosViewController.swift; sourceTree = ""; }; E12B35187B4666F77F63EB058F71D31E /* SelectionView.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = SelectionView.swift; sourceTree = ""; }; E22EDD52E26A312A3A6CDA6B07FDF428 /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-Example.debug.xcconfig"; sourceTree = ""; }; E243D3BD725F8C61EB13DED59391450E /* Pods-Example-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-Example-resources.sh"; sourceTree = ""; }; E62DE18E155CAE4FCCE76786C7008F5F /* Pods-Tests.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-Tests.modulemap"; sourceTree = ""; }; - E9B3C01FCE2DF5A94AC30621F80C0BD8 /* Pods_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = Pods_Tests.framework; path = "Pods-Tests.framework"; sourceTree = BUILT_PRODUCTS_DIR; }; + E9B3C01FCE2DF5A94AC30621F80C0BD8 /* Pods_Tests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Tests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; EB60055CA20FCEF279A89F69BB0C248C /* AlbumsViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = AlbumsViewController.swift; sourceTree = ""; }; - EC7D6D80878629E916066062E4B7D630 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; path = LICENSE; sourceTree = ""; }; + EC7D6D80878629E916066062E4B7D630 /* LICENSE */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = LICENSE; sourceTree = ""; }; EC98D59EABBF589501DE3988AD017CD3 /* BSImageView.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = BSImageView.framework; sourceTree = BUILT_PRODUCTS_DIR; }; FE33F9D54095A2FC0E106B6C68EBE419 /* PreviewViewController.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; path = PreviewViewController.swift; sourceTree = ""; }; /* End PBXFileReference section */ @@ -305,7 +305,6 @@ 665A967C79027F8DC4A70B899367E072 /* ImageViewLayout.swift */, DC2F56C139AB42F54A362152738D995A /* Support Files */, ); - name = BSImageView; path = BSImageView; sourceTree = ""; }; @@ -411,7 +410,6 @@ C8DB07133557224B7A03EA8F937C252D /* GridCollectionViewLayout.swift */, B97C6A9A5A13992B96072B69A01DA352 /* Support Files */, ); - name = BSGridCollectionViewLayout; path = BSGridCollectionViewLayout; sourceTree = ""; }; @@ -703,7 +701,12 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0930; - LastUpgradeCheck = 0930; + LastUpgradeCheck = 1000; + TargetAttributes = { + AB661E077F7EEBF4DAF601FB7EFA3721 = { + LastSwiftMigration = 1000; + }; + }; }; buildConfigurationList = 2D8E8EC45A3A1A1D94AE762CB5028504 /* Build configuration list for PBXProject "Pods" */; compatibilityVersion = "Xcode 3.2"; @@ -883,9 +886,9 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 164CC9B1CFAE3B55C2EB90FA38809816 /* Debug */ = { + 0C79C453A3F8339D018018869B75DF3D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8CAFA8E74D12C7DEFDC1A8A708D39462 /* BSGridCollectionViewLayout.xcconfig */; + baseConfigurationReference = 445D2C21D098F2DC70B4A54AF71803CD /* BSImageView.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -896,19 +899,19 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/BSGridCollectionViewLayout/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/BSImageView/BSImageView-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/BSImageView/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout.modulemap"; - PRODUCT_MODULE_NAME = BSGridCollectionViewLayout; - PRODUCT_NAME = BSGridCollectionViewLayout; + MODULEMAP_FILE = "Target Support Files/BSImageView/BSImageView.modulemap"; + PRODUCT_MODULE_NAME = BSImageView; + PRODUCT_NAME = BSImageView; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -978,46 +981,10 @@ }; name = Debug; }; - 6DCE5C09AE6BC8593A57EF3487E7AA1C /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = C6E147574EE5CFE13C9A691908B0178D /* Pods-Tests.debug.xcconfig */; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; - CURRENT_PROJECT_VERSION = 1; - DEFINES_MODULE = YES; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-Tests/Info.plist"; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-Tests/Pods-Tests.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; - SDKROOT = iphoneos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - TARGETED_DEVICE_FAMILY = "1,2"; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 83AD686D88EAB4A190B78D5F4556B0ED /* Release */ = { + 318C58E5B10E6E7DF17AB7507BB88A95 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2F5827015FB8CEAAE208174C5355A825 /* Pods-Tests.release.xcconfig */; + baseConfigurationReference = 23E80A527001D1B4AA9E961571AD4833 /* BSImagePicker.xcconfig */; buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1027,20 +994,19 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = "Target Support Files/Pods-Tests/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/BSImagePicker/BSImagePicker-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/BSImagePicker/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MACH_O_TYPE = staticlib; - MODULEMAP_FILE = "Target Support Files/Pods-Tests/Pods-Tests.modulemap"; - OTHER_LDFLAGS = ""; - OTHER_LIBTOOLFLAGS = ""; - PODS_ROOT = "$(SRCROOT)"; - PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; - PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + MODULEMAP_FILE = "Target Support Files/BSImagePicker/BSImagePicker.modulemap"; + PRODUCT_MODULE_NAME = BSImagePicker; + PRODUCT_NAME = BSImagePicker; SDKROOT = iphoneos; SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1048,7 +1014,7 @@ }; name = Release; }; - 85F79C1CFE5ACC5091D91E55897E38ED /* Debug */ = { + 45E59CDAA5C94FB0E84C2CCB30B1B0D8 /* Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 23E80A527001D1B4AA9E961571AD4833 /* BSImagePicker.xcconfig */; buildSettings = { @@ -1073,17 +1039,18 @@ SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 8E4DB2516D2175BEFA12F6A1F19DC5B4 /* Debug */ = { + 6DCE5C09AE6BC8593A57EF3487E7AA1C /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 445D2C21D098F2DC70B4A54AF71803CD /* BSImageView.xcconfig */; + baseConfigurationReference = C6E147574EE5CFE13C9A691908B0178D /* Pods-Tests.debug.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1093,29 +1060,32 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/BSImageView/BSImageView-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/BSImageView/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-Tests/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/BSImageView/BSImageView.modulemap"; - PRODUCT_MODULE_NAME = BSImageView; - PRODUCT_NAME = BSImageView; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-Tests/Pods-Tests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.1; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; name = Debug; }; - 937B444AC899E43EA460A23A3BD8D2C0 /* Release */ = { + 83AD686D88EAB4A190B78D5F4556B0ED /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 8CAFA8E74D12C7DEFDC1A8A708D39462 /* BSGridCollectionViewLayout.xcconfig */; + baseConfigurationReference = 2F5827015FB8CEAAE208174C5355A825 /* Pods-Tests.release.xcconfig */; buildSettings = { + ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; @@ -1125,19 +1095,20 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/BSGridCollectionViewLayout/Info.plist"; + INFOPLIST_FILE = "Target Support Files/Pods-Tests/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout.modulemap"; - PRODUCT_MODULE_NAME = BSGridCollectionViewLayout; - PRODUCT_NAME = BSGridCollectionViewLayout; + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = "Target Support Files/Pods-Tests/Pods-Tests.modulemap"; + OTHER_LDFLAGS = ""; + OTHER_LIBTOOLFLAGS = ""; + PODS_ROOT = "$(SRCROOT)"; + PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.${PRODUCT_NAME:rfc1034identifier}"; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SDKROOT = iphoneos; SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1177,9 +1148,9 @@ }; name = Release; }; - AA3BDC884D34FE9BDA08057D1031C431 /* Release */ = { + C8A6C996A4D3F1A57343CCD44B6F8D7B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 445D2C21D098F2DC70B4A54AF71803CD /* BSImageView.xcconfig */; + baseConfigurationReference = 8CAFA8E74D12C7DEFDC1A8A708D39462 /* BSGridCollectionViewLayout.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1190,29 +1161,28 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/BSImageView/BSImageView-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/BSImageView/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/BSGridCollectionViewLayout/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/BSImageView/BSImageView.modulemap"; - PRODUCT_MODULE_NAME = BSImageView; - PRODUCT_NAME = BSImageView; + MODULEMAP_FILE = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout.modulemap"; + PRODUCT_MODULE_NAME = BSGridCollectionViewLayout; + PRODUCT_NAME = BSGridCollectionViewLayout; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; - SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.1; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; }; - name = Release; + name = Debug; }; - C487E109F3AB3B5ACA970B61CF71AB2D /* Release */ = { + D167311854A9073AC06D6BB474EAF2DE /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 23E80A527001D1B4AA9E961571AD4833 /* BSImagePicker.xcconfig */; + baseConfigurationReference = 445D2C21D098F2DC70B4A54AF71803CD /* BSImageView.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; @@ -1223,19 +1193,19 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_PREFIX_HEADER = "Target Support Files/BSImagePicker/BSImagePicker-prefix.pch"; - INFOPLIST_FILE = "Target Support Files/BSImagePicker/Info.plist"; + GCC_PREFIX_HEADER = "Target Support Files/BSImageView/BSImageView-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/BSImageView/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 8.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MODULEMAP_FILE = "Target Support Files/BSImagePicker/BSImagePicker.modulemap"; - PRODUCT_MODULE_NAME = BSImagePicker; - PRODUCT_NAME = BSImagePicker; + MODULEMAP_FILE = "Target Support Files/BSImageView/BSImageView.modulemap"; + PRODUCT_MODULE_NAME = BSImageView; + PRODUCT_NAME = BSImageView; SDKROOT = iphoneos; SKIP_INSTALL = YES; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; - SWIFT_VERSION = 4.1; + SWIFT_VERSION = 4.2; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1332,6 +1302,7 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; STRIP_INSTALLED_PRODUCT = NO; + SWIFT_COMPILATION_MODE = wholemodule; SYMROOT = "${SRCROOT}/../build"; }; name = Release; @@ -1371,14 +1342,47 @@ }; name = Release; }; + FFC88B0FA7A1DDF19A8D4FEA3EF6F656 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8CAFA8E74D12C7DEFDC1A8A708D39462 /* BSGridCollectionViewLayout.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + "CODE_SIGN_IDENTITY[sdk=appletvos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; + "CODE_SIGN_IDENTITY[sdk=watchos*]" = ""; + CURRENT_PROJECT_VERSION = 1; + DEFINES_MODULE = YES; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + GCC_PREFIX_HEADER = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout-prefix.pch"; + INFOPLIST_FILE = "Target Support Files/BSGridCollectionViewLayout/Info.plist"; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 8.0; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; + MODULEMAP_FILE = "Target Support Files/BSGridCollectionViewLayout/BSGridCollectionViewLayout.modulemap"; + PRODUCT_MODULE_NAME = BSGridCollectionViewLayout; + PRODUCT_NAME = BSGridCollectionViewLayout; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "$(inherited) "; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; + SWIFT_VERSION = 4.2; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ 14389705DF1DDADD75464255690FF1BA /* Build configuration list for PBXNativeTarget "BSGridCollectionViewLayout" */ = { isa = XCConfigurationList; buildConfigurations = ( - 164CC9B1CFAE3B55C2EB90FA38809816 /* Debug */, - 937B444AC899E43EA460A23A3BD8D2C0 /* Release */, + C8A6C996A4D3F1A57343CCD44B6F8D7B /* Debug */, + FFC88B0FA7A1DDF19A8D4FEA3EF6F656 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1404,8 +1408,8 @@ 60767A53408A2898141C2835CC42A889 /* Build configuration list for PBXNativeTarget "BSImagePicker" */ = { isa = XCConfigurationList; buildConfigurations = ( - 85F79C1CFE5ACC5091D91E55897E38ED /* Debug */, - C487E109F3AB3B5ACA970B61CF71AB2D /* Release */, + 45E59CDAA5C94FB0E84C2CCB30B1B0D8 /* Debug */, + 318C58E5B10E6E7DF17AB7507BB88A95 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; @@ -1422,8 +1426,8 @@ B5BB78123C0B8E06A6973A43F38AC59B /* Build configuration list for PBXNativeTarget "BSImageView" */ = { isa = XCConfigurationList; buildConfigurations = ( - 8E4DB2516D2175BEFA12F6A1F19DC5B4 /* Debug */, - AA3BDC884D34FE9BDA08057D1031C431 /* Release */, + 0C79C453A3F8339D018018869B75DF3D /* Debug */, + D167311854A9073AC06D6BB474EAF2DE /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BSImagePicker.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BSImagePicker.xcscheme index 89b1c54b..17715dd6 100644 --- a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BSImagePicker.xcscheme +++ b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/BSImagePicker.xcscheme @@ -1,6 +1,6 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.2.1 + 1.2.2 CFBundleSignature ???? CFBundleVersion diff --git a/Pods/Target Support Files/BSImageView/Info.plist b/Pods/Target Support Files/BSImageView/Info.plist index 2243fe6e..b35ab356 100644 --- a/Pods/Target Support Files/BSImageView/Info.plist +++ b/Pods/Target Support Files/BSImageView/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 1.0.0 + 1.0.2 CFBundleSignature ???? CFBundleVersion diff --git a/Source/Controller/BSImagePickerViewController.swift b/Source/Controller/BSImagePickerViewController.swift index e1c14c4d..69c992fd 100755 --- a/Source/Controller/BSImagePickerViewController.swift +++ b/Source/Controller/BSImagePickerViewController.swift @@ -200,7 +200,7 @@ extension BSImagePickerViewController: BSImagePickerSettings { /** See BSImagePicketSettings for documentation */ - @objc public var selectionTextAttributes: [NSAttributedStringKey: AnyObject] { + @objc public var selectionTextAttributes: [NSAttributedString.Key: AnyObject] { get { return settings.selectionTextAttributes } diff --git a/Source/Controller/PhotosViewController.swift b/Source/Controller/PhotosViewController.swift index 780eaebf..e7170aae 100755 --- a/Source/Controller/PhotosViewController.swift +++ b/Source/Controller/PhotosViewController.swift @@ -379,7 +379,7 @@ extension PhotosViewController: UIPopoverPresentationControllerDelegate { } // MARK: UINavigationControllerDelegate extension PhotosViewController: UINavigationControllerDelegate { - func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationControllerOperation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? { + func navigationController(_ navigationController: UINavigationController, animationControllerFor operation: UINavigationController.Operation, from fromVC: UIViewController, to toVC: UIViewController) -> UIViewControllerAnimatedTransitioning? { if operation == .push { return expandAnimator } else { @@ -423,8 +423,11 @@ extension PhotosViewController { // MARK: UIImagePickerControllerDelegate extension PhotosViewController: UIImagePickerControllerDelegate { - func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [String : Any]) { - guard let image = info[UIImagePickerControllerOriginalImage] as? UIImage else { + func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) { +// Local variable inserted by Swift 4.2 migrator. +let info = convertFromUIImagePickerControllerInfoKeyDictionary(info) + + guard let image = info[convertFromUIImagePickerControllerInfoKey(UIImagePickerController.InfoKey.originalImage)] as? UIImage else { picker.dismiss(animated: true, completion: nil) return } @@ -515,3 +518,13 @@ extension PhotosViewController: PHPhotoLibraryChangeObserver { // TODO: Changes in albums } } + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromUIImagePickerControllerInfoKeyDictionary(_ input: [UIImagePickerController.InfoKey: Any]) -> [String: Any] { + return Dictionary(uniqueKeysWithValues: input.map {key, value in (key.rawValue, value)}) +} + +// Helper function inserted by Swift 4.2 migrator. +fileprivate func convertFromUIImagePickerControllerInfoKey(_ input: UIImagePickerController.InfoKey) -> String { + return input.rawValue +} diff --git a/Source/Controller/ZoomAnimator.swift b/Source/Controller/ZoomAnimator.swift index 3b50b451..004df8be 100755 --- a/Source/Controller/ZoomAnimator.swift +++ b/Source/Controller/ZoomAnimator.swift @@ -62,7 +62,7 @@ final class ZoomAnimator : NSObject, UIViewControllerAnimatedTransitioning { // Animate UIView.animate(withDuration: transitionDuration(using: transitionContext), delay: 0.0, - options: UIViewAnimationOptions(), + options: UIView.AnimationOptions(), animations: { () -> Void in // Fade in fromViewController.view.alpha = 0.0 diff --git a/Source/Model/PhotoCollectionViewDataSource.swift b/Source/Model/PhotoCollectionViewDataSource.swift index 81d0fed5..b981b258 100755 --- a/Source/Model/PhotoCollectionViewDataSource.swift +++ b/Source/Model/PhotoCollectionViewDataSource.swift @@ -95,7 +95,7 @@ final class PhotoCollectionViewDataSource : NSObject, UICollectionViewDataSource } cell.isAccessibilityElement = true - cell.accessibilityTraits = UIAccessibilityTraitButton + cell.accessibilityTraits = UIAccessibilityTraits.button UIView.setAnimationsEnabled(true) diff --git a/Source/Model/Settings.swift b/Source/Model/Settings.swift index 0dc0c930..9ede3c3a 100755 --- a/Source/Model/Settings.swift +++ b/Source/Model/Settings.swift @@ -31,14 +31,14 @@ final class Settings : BSImagePickerSettings { var selectionFillColor: UIColor = UIView().tintColor var selectionStrokeColor: UIColor = UIColor.white var selectionShadowColor: UIColor = UIColor.black - var selectionTextAttributes: [NSAttributedStringKey: AnyObject] = { + var selectionTextAttributes: [NSAttributedString.Key: AnyObject] = { let paragraphStyle = NSMutableParagraphStyle() paragraphStyle.lineBreakMode = .byTruncatingTail paragraphStyle.alignment = .center return [ - NSAttributedStringKey.font: UIFont.boldSystemFont(ofSize: 10.0), - NSAttributedStringKey.paragraphStyle: paragraphStyle, - NSAttributedStringKey.foregroundColor: UIColor.white + NSAttributedString.Key.font: UIFont.boldSystemFont(ofSize: 10.0), + NSAttributedString.Key.paragraphStyle: paragraphStyle, + NSAttributedString.Key.foregroundColor: UIColor.white ] }() var backgroundColor: UIColor = UIColor.white diff --git a/Source/Protocol/BSImagePickerSettings.swift b/Source/Protocol/BSImagePickerSettings.swift index 7ba3e942..c25b0ad0 100755 --- a/Source/Protocol/BSImagePickerSettings.swift +++ b/Source/Protocol/BSImagePickerSettings.swift @@ -54,7 +54,7 @@ public protocol BSImagePickerSettings { /** Attributes for text inside circle. Color, font, etc */ - var selectionTextAttributes: [NSAttributedStringKey: AnyObject] { get set } + var selectionTextAttributes: [NSAttributedString.Key: AnyObject] { get set } /** BackgroundColor