Merge branch 'florentmorin-master'

.travis.yml

@@ -2,7 +2,7 @@
 # * http://www.objc.io/issue-6/travis-ci.html
 # * https://github.com/supermarin/xcpretty#usage
 
-osx_image: xcode7.3
+osx_image: xcode8
 language: objective-c
 #cache: cocoapods
 podfile: Example/Podfile

BSImagePicker.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "BSImagePicker"
-  s.version          = "2.3.2"
+  s.version          = "2.4.0"
   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.
@@ -25,5 +25,5 @@ Pod::Spec.new do |s|
 
   s.frameworks = 'UIKit', 'Photos'
   s.dependency 'UIImageViewModeScaleAspect', '~> 1.3'
-  s.dependency 'BSGridCollectionViewLayout', '~> 1.1.1'
+  s.dependency 'BSGridCollectionViewLayout', '1.2.0-swift23'
 end

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 2.4.0
+* Swift 2.3 support
+
 # 2.3.0
 * Initialize PhotosViewController AFTER we have permission to access photos.
 * Buttons are now public vars.

Example/BSImagePicker.xcodeproj/xcshareddata/xcschemes/BSImagePicker-Example.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0730"
+   LastUpgradeVersion = "0800"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/Podfile

@@ -2,10 +2,14 @@ source 'https://github.com/CocoaPods/Specs.git'
 use_frameworks!
 platform :ios, '8.0' 
 
-target 'BSImagePicker_Example', :exclusive => true do
+target 'BSImagePicker_Example' do
   pod "BSImagePicker", :path => "../"
 end
 
-target 'BSImagePicker_Tests', :exclusive => true do
+target 'BSImagePicker_Tests' do
+  pod "BSImagePicker", :path => "../"
+end
+
+target 'BSImagePicker_UI_Tests' do
   pod "BSImagePicker", :path => "../"
 end

Example/Podfile.lock

@@ -1,9 +1,9 @@
 PODS:
-  - BSGridCollectionViewLayout (1.1.1)
-  - BSImagePicker (2.3.0):
-    - BSGridCollectionViewLayout (~> 1.1)
+  - BSGridCollectionViewLayout (1.2.0-swift23)
+  - BSImagePicker (2.4.0):
+    - BSGridCollectionViewLayout (= 1.2.0-swift23)
     - UIImageViewModeScaleAspect (~> 1.3)
-  - UIImageViewModeScaleAspect (1.3)
+  - UIImageViewModeScaleAspect (1.5)
 
 DEPENDENCIES:
   - BSImagePicker (from `../`)
@@ -13,8 +13,10 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  BSGridCollectionViewLayout: d7304dcb35c6b3b4420c527e9f9b77ff322250f3
-  BSImagePicker: 591b28ce4994c44cbc4ac896717c1db9f9fadd18
-  UIImageViewModeScaleAspect: ec78901acfc20d3782154111a21d34390f8f71ad
+  BSGridCollectionViewLayout: eb65d9747dcc2e5270842084a8e14e47243a09f5
+  BSImagePicker: d8454b475ad0a6f8b4eda2ddcfec401e1f7d0cf4
+  UIImageViewModeScaleAspect: 11a790a0b9d248a13dc63e3a78991f1463b6d84e
 
-COCOAPODS: 0.39.0
+PODFILE CHECKSUM: 94f153c3aee5b58a46ca1abfd28c2764bb85f520
+
+COCOAPODS: 1.1.0.rc.2