Support for swift3

daisuke310vvv · Sep 16, 2016 · 65fb3d1 · 65fb3d1
1 parent 9f1cac3
commit 65fb3d1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,3 @@
-osx_image: xcode7.3
+osx_image: xcode8
 language: objective-c
-script: set -o pipefail && xcodebuild test -project Example/PopupController.xcodeproj -scheme PopupController -sdk iphonesimulator9.3 | xcpretty
+script: set -o pipefail && xcodebuild test -project Example/PopupController.xcodeproj -scheme PopupController -destination 'platform=iOS Simulator,name=iPhone 7' | xcpretty
diff --git a/Classes/PopupController.swift b/Classes/PopupController.swift
@@ -266,8 +266,8 @@ private extension PopupController {
         isShowingKeyboard = true
         let obj = (notification as NSNotification).userInfo?[UIKeyboardFrameEndUserInfoKey] as! NSValue
 
-        if needsToMoveFrom(obj.CGRectValue.origin) {
-            move(obj.CGRectValue.origin)
+        if needsToMoveFrom(obj.cgRectValue.origin) {
+            move(obj.cgRectValue.origin)
         }
     }
 
@@ -468,12 +468,12 @@ extension PopupController: UIGestureRecognizerDelegate {
     }
 }
 
-extension UIViewController {
-    func popupController() -> PopupController? {
-        var parent = parent
-        while !(parent is PopupController || parent == nil) {
-            parent = parent!.parent
-        }
-        return parent as? PopupController
-    }
-}
+//extension UIViewController {
+//    func popupController() -> PopupController? {
+//        var parent = parent
+//        while !(parent is PopupController || parent == nil) {
+//            parent = parent!.parent
+//        }
+//        return parent as? PopupController
+//    }
+//}
diff --git a/Example/PopupController.xcodeproj/project.pbxproj b/Example/PopupController.xcodeproj/project.pbxproj
@@ -290,7 +290,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -323,7 +322,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -365,7 +364,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_VERSION = 3.0;

diff --git a/PopupController.podspec b/PopupController.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "PopupController"
-  s.version      = "0.1.1"
+  s.version      = "0.2.0"
   s.summary      = "PopupController is a controller for showing temporary popup view."
   s.homepage     = "https://github.com/daisuke310vvv/PopupController"
   s.license      = { :type => "MIT", :file => "LICENSE" }