Merge remote-tracking branch 'zvonicek/master'

jamesynotnot · Apr 15, 2016 · 284420c · 284420c
2 parents 2859a94 + 21ced54
commit 284420c
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/Example/ImageSlideshow.xcodeproj/xcshareddata/xcschemes/ImageSlideshow-Example.xcscheme b/Example/ImageSlideshow.xcodeproj/xcshareddata/xcschemes/ImageSlideshow-Example.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0630"
+   LastUpgradeVersion = "0730"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -37,10 +37,10 @@
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -62,15 +62,18 @@
             ReferencedContainer = "container:ImageSlideshow.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
    </TestAction>
    <LaunchAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
@@ -86,10 +89,10 @@
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,11 +1,11 @@
 PODS:
-  - Alamofire (3.1.4)
-  - AlamofireImage (2.2.0):
-    - Alamofire (~> 3.1)
-  - ImageSlideshow/Alamofire (0.2.3):
+  - Alamofire (3.3.0)
+  - AlamofireImage (2.4.0):
+    - Alamofire (~> 3.3)
+  - ImageSlideshow/Alamofire (0.3.1):
     - AlamofireImage (~> 2.0)
     - ImageSlideshow/Core
-  - ImageSlideshow/Core (0.2.3)
+  - ImageSlideshow/Core (0.3.1)
 
 DEPENDENCIES:
   - ImageSlideshow/Alamofire (from `../`)
@@ -15,8 +15,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  Alamofire: fbc829692f351fa1d8a31dd75fd7f7f56fea31fb
-  AlamofireImage: bedb8a4bdfb98eda81ba12952fba6e9e90420922
-  ImageSlideshow: fec6b06f868cff8a7cdcb2a44572fad3902ff035
+  Alamofire: 9054db4a1b1ca9e363223183e01cea380159a27c
+  AlamofireImage: 87408b652e0f5ae5fe364035f15aea8b9b24c77e
+  ImageSlideshow: d421a31970f81a365748242d1f5808659a6a712e
 
 COCOAPODS: 0.39.0
diff --git a/ImageSlideshow.podspec b/ImageSlideshow.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = "ImageSlideshow"
-  s.version          = "0.3.1"
+  s.version          = "0.4.0"
   s.summary          = "Image slideshow written in Swift with circular scrolling, timer and full screen viewer"
 
 # This description is used to generate tags and improve search results.
@@ -39,7 +39,7 @@ Image slideshow is a Swift library providing customizable image slideshow with c
 
   s.subspec 'AFURL' do |afnetworking|
     afnetworking.dependency 'ImageSlideshow/Core'
-    afnetworking.dependency 'AFNetworking', '~> 2.3'
+    afnetworking.dependency 'AFNetworking', '~> 3.0'
     afnetworking.source_files = 'Pod/Classes/InputSources/AFURLSource.swift'
   end
 

diff --git a/Pod/Classes/Core/FullScreenSlideshowViewController.swift b/Pod/Classes/Core/FullScreenSlideshowViewController.swift
@@ -52,7 +52,7 @@ public class FullScreenSlideshowViewController: UIViewController {
         // close button configuration
         closeButton.frame = CGRectMake(10, 20, 40, 40)
         closeButton.setImage(UIImage(named: "Frameworks/ImageSlideshow.framework/ImageSlideshow.bundle/ic_cross_white@2x"), forState: UIControlState.Normal)
-        closeButton.addTarget(self, action: "close", forControlEvents: UIControlEvents.TouchUpInside)
+        closeButton.addTarget(self, action: #selector(FullScreenSlideshowViewController.close), forControlEvents: UIControlEvents.TouchUpInside)
         self.view.addSubview(closeButton)
     }
 

diff --git a/Pod/Classes/Core/ImageSlideshow.swift b/Pod/Classes/Core/ImageSlideshow.swift
@@ -128,7 +128,7 @@ public class ImageSlideshow: UIView, UIScrollViewDelegate {
                 view.zoomOut()
             }
             view.frame = CGRectMake(scrollView.frame.size.width * CGFloat(i), 0, scrollView.frame.size.width, scrollView.frame.size.height)
-            i++
+            i += 1
         }
 
         setCurrentPage(currentPage, animated: false)
@@ -147,7 +147,7 @@ public class ImageSlideshow: UIView, UIScrollViewDelegate {
             item.imageView.contentMode = self.contentScaleMode
             slideshowItems.append(item)
             scrollView.addSubview(item)
-            i++
+            i += 1
         }
 
         if circular && (scrollViewImages.count > 1) {
@@ -206,7 +206,7 @@ public class ImageSlideshow: UIView, UIScrollViewDelegate {
 
     private func setTimerIfNeeded() {
         if slideshowInterval > 0 && scrollViewImages.count > 1 && slideshowTimer == nil {
-            slideshowTimer = NSTimer.scheduledTimerWithTimeInterval(slideshowInterval, target: self, selector: "slideshowTick:", userInfo: nil, repeats: true)
+            slideshowTimer = NSTimer.scheduledTimerWithTimeInterval(slideshowInterval, target: self, selector: #selector(ImageSlideshow.slideshowTick(_:)), userInfo: nil, repeats: true)
         }
     }
 

diff --git a/Pod/Classes/Core/ImageSlideshowItem.swift b/Pod/Classes/Core/ImageSlideshowItem.swift
@@ -41,7 +41,7 @@ public class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate {
         self.maximumZoomScale = calculateMaximumScale()
 
         // tap gesture recognizer
-        let tapRecognizer = UITapGestureRecognizer(target: self, action: "tapZoom")
+        let tapRecognizer = UITapGestureRecognizer(target: self, action: #selector(ImageSlideshowItem.tapZoom))
         tapRecognizer.numberOfTapsRequired = 2
         imageView.addGestureRecognizer(tapRecognizer)
         gestureRecognizer = tapRecognizer

diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ ImageSlideshow is available through [CocoaPods](http://cocoapods.org). To instal
 it, simply add the following line to your Podfile:
 
 ```ruby
-pod 'ImageSlideshow', '~> 0.3'
+pod 'ImageSlideshow', '~> 0.4'
 ```
 
 ## Usage