Merge pull request nori0620#1 from mono0926/ios8

Ios8

.travis.yml

@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode6.4
 
 script:
   - bundle exec rake default

SwiftFilePath.podspec

@@ -2,12 +2,12 @@
 Pod::Spec.new do |s|
 
   s.name         = "SwiftFilePath"
-  s.version      = "0.0.3"
+  s.version      = "0.0.5"
   s.summary      = "Simple and powerful wrapper for NSFileManager."
   s.homepage     = "https://github.com/nori0620/SwiftFilePath"
   s.license      = "MIT"
   s.author       = { "Norihiro Sakamoto" => "nori0620@gmail.com" }
-  s.source       = { :git => "https://github.com/nori0620/SwiftFilePath.git", :tag => "0.0.3" }
+  s.source       = { :git => "https://github.com/nori0620/SwiftFilePath.git", :tag => "0.0.5" }
   s.platform     = :ios, '8.0'
   s.source_files = "SwiftFilePath/**/*.swift"
   s.requires_arc = true

SwiftFilePath.xcodeproj/project.pbxproj

@@ -282,7 +282,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -322,7 +322,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
+				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -335,6 +335,7 @@
 		CC7833031A610125005E77C3 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -350,6 +351,7 @@
 		CC7833041A610125005E77C3 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

SwiftFilePath/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.3</string>
+	<string>0.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

SwiftFilePath/Path.swift

@@ -12,7 +12,7 @@ public class Path {
 
     public class func isDir(path:NSString) -> Bool {
         var isDirectory: ObjCBool = false
-        let isFileExists = NSFileManager.defaultManager().fileExistsAtPath(path, isDirectory:&isDirectory)
+        let isFileExists = NSFileManager.defaultManager().fileExistsAtPath(path as! String, isDirectory:&isDirectory)
 
         return isDirectory ? true : false
     }

SwiftFilePath/PathExtensionDir.swift

@@ -29,7 +29,7 @@ extension Path {
     }
 
     private class func userDomainOf(pathEnum:NSSearchPathDirectory)->Path{
-        let pathString = NSSearchPathForDirectoriesInDomains(pathEnum, .UserDomainMask, true)[0] as String
+        let pathString = NSSearchPathForDirectoriesInDomains(pathEnum, .UserDomainMask, true)[0] as! String
         return Path( pathString )
     }
 
@@ -54,7 +54,7 @@ extension Path: SequenceType {
         }
 
         return contents!.map({ [unowned self] content in
-            return self.content(content as String)
+            return self.content(content as! String)
         })
 
     }
@@ -64,7 +64,7 @@ extension Path: SequenceType {
     }
 
     public func content(path_string:NSString) -> Path {
-        return Path( self.path_string.stringByAppendingPathComponent(path_string) )
+        return Path( self.path_string.stringByAppendingPathComponent(path_string as! String) )
     }
 
     public func child(path:NSString) -> Path {
@@ -88,7 +88,7 @@ extension Path: SequenceType {
         assert(self.isDir,"To get iterator, path must be dir< \(path_string) >")
         let iterator = fileManager.enumeratorAtPath(path_string)
         return GeneratorOf<Path>() {
-            let optionalContent = iterator?.nextObject() as String?
+            let optionalContent = iterator?.nextObject() as! String?
             if var content = optionalContent {
                 return self.content(content)
             } else {

SwiftFilePathTests/SwiftFilePathTests.swift

@@ -16,7 +16,7 @@ extension String {
     func match(pattern: String) -> Bool {
         var error : NSError?
         let matcher = NSRegularExpression(pattern: pattern, options: nil, error: &error)
-        return matcher?.numberOfMatchesInString(self, options: nil, range: NSMakeRange(0, self.utf16Count)) != 0
+        return matcher?.numberOfMatchesInString(self, options: nil, range: NSMakeRange(0, count(self.utf16))) != 0
     }
 
 }