Updates to support Swift 2.3

yoavlt · Oct 8, 2016 · 0335ac7 · 0335ac7
1 parent 05d80ad
commit 0335ac7
Show file tree

Hide file tree

Showing 10 changed files with 205 additions and 317 deletions.
diff --git a/Example/LiquidLoader.xcodeproj/project.pbxproj b/Example/LiquidLoader.xcodeproj/project.pbxproj
@@ -215,9 +215,11 @@
  TargetAttributes = {
  607FACCF1AFB9204008FA782 = {
  CreatedOnToolsVersion = 6.3.1;
+ LastSwiftMigration = 0800;
  };
  607FACE41AFB9204008FA782 = {
  CreatedOnToolsVersion = 6.3.1;
+ LastSwiftMigration = 0800;
  TestTargetID = 607FACCF1AFB9204008FA782;
  };
  };
@@ -494,6 +496,7 @@
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 2.3;
  };
  name = Debug;
  };
@@ -507,6 +510,7 @@
  MODULE_NAME = ExampleApp;
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 2.3;
  };
  name = Release;
  };
@@ -527,6 +531,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 2.3;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LiquidLoader_Example.app/LiquidLoader_Example";
  };
  name = Debug;
@@ -544,6 +549,7 @@
  LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
  PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.$(PRODUCT_NAME:rfc1034identifier)";
  PRODUCT_NAME = "$(TARGET_NAME)";
+ SWIFT_VERSION = 2.3;
  TEST_HOST = "$(BUILT_PRODUCTS_DIR)/LiquidLoader_Example.app/LiquidLoader_Example";
  };
  name = Release;

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
- - LiquidLoader (0.1.1)
+ - LiquidLoader (1.2.1)
 
 DEPENDENCIES:
  - LiquidLoader (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
  :path: "../"
 
 SPEC CHECKSUMS:
- LiquidLoader: cf49954a6643f610c06a7db45da2da81a68a154b
+ LiquidLoader: 73adf4f43b260ecb9dae807064e566d72c629dfd
 
 PODFILE CHECKSUM: 45161a1a5c5a941a9031074d8a3962f9f4583638
 

diff --git a/Example/Pods/Local Podspecs/LiquidLoader.podspec.json b/Example/Pods/Local Podspecs/LiquidLoader.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/Example/Pods/Pods.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/Example/Pods/Target Support Files/LiquidLoader/Info.plist b/Example/Pods/Target Support Files/LiquidLoader/Info.plist
diff --git a/Example/Pods/Target Support Files/LiquidLoader/ResourceBundle-LiquidLoader-Info.plist b/Example/Pods/Target Support Files/LiquidLoader/ResourceBundle-LiquidLoader-Info.plist
diff --git a/Pod/Classes/CircularGradientLayer.swift b/Pod/Classes/CircularGradientLayer.swift
@@ -25,6 +25,6 @@ class CircularGradientLayer : CALayer {
  var locations = CGMath.linSpace(0.0, to: 1.0, n: colors.count)
  locations = Array(locations.map { 1.0 - $0 * $0 }.reverse())
  let gradients = CGGradientCreateWithColors(CGColorSpaceCreateDeviceRGB(), colors.map { $0.CGColor }, locations)
- CGContextDrawRadialGradient(ctx, gradients, self.frame.center, CGFloat(0.0), self.frame.center, max(self.frame.width, self.frame.height), CGGradientDrawingOptions(rawValue: 10))
+ CGContextDrawRadialGradient(ctx, gradients!, self.frame.center, CGFloat(0.0), self.frame.center, max(self.frame.width, self.frame.height), CGGradientDrawingOptions(rawValue: 10))
  }
 }
diff --git a/Pod/Classes/LiquidLoadEffect.swift b/Pod/Classes/LiquidLoadEffect.swift
@@ -73,7 +73,7 @@ class LiquidLoadEffect : NSObject {
  }
  resize()
 
- timer = CADisplayLink(target: self, selector: "update")
+ timer = CADisplayLink(target: self, selector: #selector(LiquidLoadEffect.update))
  timer?.addToRunLoop(NSRunLoop.mainRunLoop(), forMode: NSRunLoopCommonModes)
  }
 
@@ -130,4 +130,4 @@ class LiquidLoadEffect : NSObject {
  func stopTimer() {
  timer?.invalidate()
  }
-}
+}