Browse Source

Removed iOS 7 support from main brunch (cocoapods do not build it)

Evgenii Neumerzhitckii 9 years ago
parent
commit
90c29d1e80

+ 2 - 2
CHANGELOG.md

@@ -1,8 +1,8 @@
 # KeychainSwift version history
 # KeychainSwift version history
 
 
-## 3.1.0 (2016-04-15)
+## 3.0.13 (2016-04-15)
 
 
-Added iOS 7 support.
+Added iOS 7 support (https://github.com/marketplacer/keychain-swift/blob/iOS7/Distrib/KeychainSwiftDistrib.swift)
 
 
 ## 3.0.11 (2016-01-24)
 ## 3.0.11 (2016-01-24)
 
 

+ 1 - 6
Distrib/KeychainSwiftDistrib.swift

@@ -314,7 +314,6 @@ public enum KeychainSwiftAccessOptions {
   This is recommended for items that only need to be accessible while the application is in the foreground. Items with this attribute never migrate to a new device. After a backup is restored to a new device, these items are missing. No items can be stored in this class on devices without a passcode. Disabling the device passcode causes all items in this class to be deleted.
   This is recommended for items that only need to be accessible while the application is in the foreground. Items with this attribute never migrate to a new device. After a backup is restored to a new device, these items are missing. No items can be stored in this class on devices without a passcode. Disabling the device passcode causes all items in this class to be deleted.
   
   
   */
   */
-  @available(iOS 8, *)
   case AccessibleWhenPasscodeSetThisDeviceOnly
   case AccessibleWhenPasscodeSetThisDeviceOnly
   
   
   /**
   /**
@@ -348,11 +347,7 @@ public enum KeychainSwiftAccessOptions {
       return toString(kSecAttrAccessibleAlways)
       return toString(kSecAttrAccessibleAlways)
       
       
     case .AccessibleWhenPasscodeSetThisDeviceOnly:
     case .AccessibleWhenPasscodeSetThisDeviceOnly:
-      if #available(iOS 8.0, *) {
-        return toString(kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly)
-      } else {
-        fatalError("'kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly' is only available on iOS 8.0 or newer")
-      }
+      return toString(kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly)
       
       
     case .AccessibleAlwaysThisDeviceOnly:
     case .AccessibleAlwaysThisDeviceOnly:
       return toString(kSecAttrAccessibleAlwaysThisDeviceOnly)
       return toString(kSecAttrAccessibleAlwaysThisDeviceOnly)

+ 2 - 2
KeychainSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 Pod::Spec.new do |s|
   s.name        = "KeychainSwift"
   s.name        = "KeychainSwift"
-  s.version     = "3.1.1"
+  s.version     = "3.0.13"
   s.license     = { :type => "MIT" }
   s.license     = { :type => "MIT" }
   s.homepage    = "https://github.com/marketplacer/keychain-swift"
   s.homepage    = "https://github.com/marketplacer/keychain-swift"
   s.summary     = "A library for saving text and data in the Keychain with Swift."
   s.summary     = "A library for saving text and data in the Keychain with Swift."
@@ -15,7 +15,7 @@ Pod::Spec.new do |s|
   s.source      = { :git => "https://github.com/marketplacer/keychain-swift.git", :tag => s.version }
   s.source      = { :git => "https://github.com/marketplacer/keychain-swift.git", :tag => s.version }
   s.screenshots  = "https://raw.githubusercontent.com/marketplacer/keychain-swift/master/graphics/keychain-swift-demo.png"
   s.screenshots  = "https://raw.githubusercontent.com/marketplacer/keychain-swift/master/graphics/keychain-swift-demo.png"
   s.source_files = "KeychainSwift/*.swift"
   s.source_files = "KeychainSwift/*.swift"
-  s.ios.deployment_target = "7.1"
+  s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.10"
   s.osx.deployment_target = "10.10"
   s.watchos.deployment_target = "2.0"
   s.watchos.deployment_target = "2.0"
   s.tvos.deployment_target = "9.0"
   s.tvos.deployment_target = "9.0"

+ 1 - 6
KeychainSwift/KeychainSwiftAccessOptions.swift

@@ -61,7 +61,6 @@ public enum KeychainSwiftAccessOptions {
   This is recommended for items that only need to be accessible while the application is in the foreground. Items with this attribute never migrate to a new device. After a backup is restored to a new device, these items are missing. No items can be stored in this class on devices without a passcode. Disabling the device passcode causes all items in this class to be deleted.
   This is recommended for items that only need to be accessible while the application is in the foreground. Items with this attribute never migrate to a new device. After a backup is restored to a new device, these items are missing. No items can be stored in this class on devices without a passcode. Disabling the device passcode causes all items in this class to be deleted.
   
   
   */
   */
-  @available(iOS 8, *)
   case AccessibleWhenPasscodeSetThisDeviceOnly
   case AccessibleWhenPasscodeSetThisDeviceOnly
   
   
   /**
   /**
@@ -95,11 +94,7 @@ public enum KeychainSwiftAccessOptions {
       return toString(kSecAttrAccessibleAlways)
       return toString(kSecAttrAccessibleAlways)
       
       
     case .AccessibleWhenPasscodeSetThisDeviceOnly:
     case .AccessibleWhenPasscodeSetThisDeviceOnly:
-      if #available(iOS 8.0, *) {
-        return toString(kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly)
-      } else {
-        fatalError("'kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly' is only available on iOS 8.0 or newer")
-      }
+      return toString(kSecAttrAccessibleWhenPasscodeSetThisDeviceOnly)
       
       
     case .AccessibleAlwaysThisDeviceOnly:
     case .AccessibleAlwaysThisDeviceOnly:
       return toString(kSecAttrAccessibleAlwaysThisDeviceOnly)
       return toString(kSecAttrAccessibleAlwaysThisDeviceOnly)

+ 4 - 0
README.md

@@ -47,6 +47,10 @@ Here is how to use KeychainSwift in a *WatchKit extension* with CocoaPods.
 
 
 Use the [previous version of the library](https://github.com/marketplacer/keychain-swift/wiki/Swift-1.2-setup).
 Use the [previous version of the library](https://github.com/marketplacer/keychain-swift/wiki/Swift-1.2-setup).
 
 
+**iOS 7 support**
+
+Use [iOS 7 compatible](https://github.com/marketplacer/keychain-swift/blob/iOS7/Distrib/KeychainSwiftDistrib.swift) version of the library.
+
 ## Usage
 ## Usage
 
 
 Add `import KeychainSwift` to your source code if you used Carthage or CocoaPods setup methods.
 Add `import KeychainSwift` to your source code if you used Carthage or CocoaPods setup methods.