Merge pull request #9 from Raizlabs/enhancement/nevillco/Swift-3.0

Swift 3.0 Conversion

RIGImageGallery.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
  s.name = "RIGImageGallery"
- s.version = "0.1.0"
+ s.version = "0.2.0"
  s.summary = "An image gallery view controller designed to work with the Raizlabs Interface Guidelines for iOS."
 
  s.description = <<-DESC

RIGImageGallery.xcodeproj/project.pbxproj

@@ -280,19 +280,22 @@
  isa = PBXProject;
  attributes = {
  LastSwiftUpdateCheck = 0730;
- LastUpgradeCheck = 0720;
+ LastUpgradeCheck = 0810;
  ORGANIZATIONNAME = Raizlabs;
  TargetAttributes = {
  72060F4F1D2FFA6C001281E0 = {
  CreatedOnToolsVersion = 7.3.1;
+ LastSwiftMigration = 0810;
  };
  72A828081C68F24500B25CEE = {
  CreatedOnToolsVersion = 7.2.1;
  DevelopmentTeam = 336S848KQ4;
+ LastSwiftMigration = 0810;
  };
  72BA26511C6B985900F1FE22 = {
  CreatedOnToolsVersion = 7.2.1;
  DevelopmentTeam = 336S848KQ4;
+ LastSwiftMigration = 0810;
  };
  };
  };
@@ -442,6 +445,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.raizlabs.RIGImageGalleryTests;
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 3.0;
  };
  name = Debug;
  };
@@ -454,6 +458,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.raizlabs.RIGImageGalleryTests;
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 3.0;
  };
  name = Release;
  };
@@ -470,8 +475,10 @@
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -518,8 +525,10 @@
  CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
  CLANG_WARN_EMPTY_BODY = YES;
  CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
  CLANG_WARN_INT_CONVERSION = YES;
  CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
  CLANG_WARN_UNREACHABLE_CODE = YES;
  CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -539,6 +548,7 @@
  IPHONEOS_DEPLOYMENT_TARGET = 9.2;
  MTL_ENABLE_DEBUG_INFO = NO;
  SDKROOT = iphoneos;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
  TARGETED_DEVICE_FAMILY = "1,2";
  VALIDATE_PRODUCT = YES;
  VERSIONING_SYSTEM = "apple-generic";
@@ -549,32 +559,34 @@
  72A828191C68F24500B25CEE /* Debug */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_IDENTITY = "iPhone Developer";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
  FRAMEWORK_SEARCH_PATHS = "$(inherited)";
  INFOPLIST_FILE = "$(SRCROOT)/RIGImageGalleryDemo/Assets/Info.plist";
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.raizlabs.RigImageGalleryDemo;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE = "";
+ SWIFT_VERSION = 3.0;
  };
  name = Debug;
  };
  72A8281A1C68F24500B25CEE /* Release */ = {
  isa = XCBuildConfiguration;
  buildSettings = {
+ ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
  ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
  CODE_SIGN_IDENTITY = "iPhone Developer";
  "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
  FRAMEWORK_SEARCH_PATHS = "$(inherited)";
  INFOPLIST_FILE = "$(SRCROOT)/RIGImageGalleryDemo/Assets/Info.plist";
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = com.raizlabs.RigImageGalleryDemo;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE = "";
+ SWIFT_VERSION = 3.0;
  };
  name = Release;
  };
@@ -583,7 +595,7 @@
  buildSettings = {
  CLANG_ENABLE_MODULES = YES;
  CODE_SIGN_IDENTITY = "iPhone Developer";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
@@ -595,6 +607,7 @@
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
  SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 3.0;
  };
  name = Debug;
  };
@@ -603,7 +616,7 @@
  buildSettings = {
  CLANG_ENABLE_MODULES = YES;
  CODE_SIGN_IDENTITY = "iPhone Developer";
- "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
  DEFINES_MODULE = YES;
  DYLIB_COMPATIBILITY_VERSION = 1;
  DYLIB_CURRENT_VERSION = 1;
@@ -614,6 +627,7 @@
  PRODUCT_BUNDLE_IDENTIFIER = com.raizlabs.RIGImageGallery;
  PRODUCT_NAME = "$(TARGET_NAME)";
  SKIP_INSTALL = YES;
+ SWIFT_VERSION = 3.0;
  };
  name = Release;
  };

RIGImageGallery.xcodeproj/xcshareddata/xcschemes/RIGImageGallery.xcscheme

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

RIGImageGallery/RIGAutoCenteringScrollView.swift

@@ -44,7 +44,7 @@ class RIGAutoCenteringScrollView: UIScrollView {
  }
  }
 
- private var contentView: UIImageView?
+ fileprivate var contentView: UIImageView?
 
  override init(frame: CGRect) {
  super.init(frame: frame)
@@ -65,7 +65,7 @@ class RIGAutoCenteringScrollView: UIScrollView {
 
 extension RIGAutoCenteringScrollView {
 
- func toggleZoom(animated animated: Bool = true) {
+ func toggleZoom(animated: Bool = true) {
  if zoomScale != minimumZoomScale {
  setZoomScale(minimumZoomScale, animated: animated)
  }
@@ -78,7 +78,7 @@ extension RIGAutoCenteringScrollView {
 
 private extension RIGAutoCenteringScrollView {
 
- func updateZoomScale(preserveScale preserveScale: Bool) {
+ func updateZoomScale(preserveScale: Bool) {
  guard let image = zoomImage else {
  contentSize = frame.size
  minimumZoomScale = 1
@@ -113,7 +113,7 @@ private extension RIGAutoCenteringScrollView {
 
  // After much fiddling, using insets to correct zoom behavior was found at: http://petersteinberger.com/blog/2013/how-to-center-uiscrollview/
  func centerContent() {
- guard !CGSizeEqualToSize(contentSize, CGSize()) else {
+ guard !contentSize.equalTo(CGSize()) else {
  return
  }
  let adjustedSize = UIEdgeInsetsInsetRect(bounds, baseInsets).size
@@ -141,11 +141,11 @@ private extension RIGAutoCenteringScrollView {
 
 extension RIGAutoCenteringScrollView: UIScrollViewDelegate {
 
- func viewForZoomingInScrollView(scrollView: UIScrollView) -> UIView? {
+ func viewForZooming(in scrollView: UIScrollView) -> UIView? {
  return allowZoom ? contentView : nil
  }
 
- func scrollViewDidZoom(scrollView: UIScrollView) {
+ func scrollViewDidZoom(_ scrollView: UIScrollView) {
  centerContent()
  }