Merge pull request #170 from kishikawakatsumi/release-231

Bump version to 2.3.1
kishikawakatsumi · Nov 1, 2015 · afe9d5a · afe9d5a
2 parents dca6034 + b44d9b7
commit afe9d5a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/KeychainAccess.podspec b/KeychainAccess.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "KeychainAccess"
-  s.version          = "2.3.0"
+  s.version          = "2.3.1"
   s.summary          = "KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X."
   s.description      = <<-DESC
                          KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X.

diff --git a/Lib/KeychainAccess/Info.plist b/Lib/KeychainAccess/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.3.0</string>
+	<string>2.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Lib/KeychainAccessTests/KeychainAccessTests.swift b/Lib/KeychainAccessTests/KeychainAccessTests.swift
@@ -536,7 +536,11 @@ class KeychainAccessTests: XCTestCase {
                 XCTAssertNil(attributes?.ref)
                 XCTAssertNotNil(attributes?.persistentRef)
                 XCTAssertEqual(attributes?.accessible, Accessibility.AfterFirstUnlock.rawValue)
-                XCTAssertNil(attributes?.accessControl)
+                if #available(iOS 9.0, *) {
+                    XCTAssertNil(attributes?.accessControl)
+                } else {
+                    XCTAssertNotNil(attributes?.accessControl)
+                }
                 XCTAssertEqual(attributes?.accessGroup, "")
                 XCTAssertNotNil(attributes?.synchronizable)
                 XCTAssertNotNil(attributes?.creationDate)
@@ -574,7 +578,11 @@ class KeychainAccessTests: XCTestCase {
                 XCTAssertNil(attributes?.ref)
                 XCTAssertNotNil(attributes?.persistentRef)
                 XCTAssertEqual(attributes?.accessible, Accessibility.AfterFirstUnlock.rawValue)
-                XCTAssertNil(attributes?.accessControl)
+                if #available(iOS 9.0, *) {
+                    XCTAssertNil(attributes?.accessControl)
+                } else {
+                    XCTAssertNotNil(attributes?.accessControl)
+                }
                 XCTAssertEqual(attributes?.accessGroup, "")
                 XCTAssertNotNil(attributes?.synchronizable)
                 XCTAssertNotNil(attributes?.creationDate)
@@ -613,7 +621,11 @@ class KeychainAccessTests: XCTestCase {
                 XCTAssertNil(attributes?.ref)
                 XCTAssertNotNil(attributes?.persistentRef)
                 XCTAssertEqual(attributes?.accessible, Accessibility.AfterFirstUnlock.rawValue)
-                XCTAssertNil(attributes?.accessControl)
+                if #available(iOS 9.0, *) {
+                    XCTAssertNil(attributes?.accessControl)
+                } else {
+                    XCTAssertNotNil(attributes?.accessControl)
+                }
                 XCTAssertEqual(attributes?.accessGroup, "")
                 XCTAssertNotNil(attributes?.synchronizable)
                 XCTAssertNotNil(attributes?.creationDate)

diff --git a/Lib/Rakefile b/Lib/Rakefile
@@ -6,14 +6,13 @@ def destinations
         'name=iPhone 6 Plus,OS=9.0'
       ]
   else
-    [ 
-      # 'name=iPad 2,OS=8.1',
-      # 'name=iPad Air,OS=8.1',
-      # 'name=iPhone 4s,OS=8.1',
-      # 'name=iPhone 5,OS=8.1',
-      # 'name=iPhone 5s,OS=8.1',
-      # 'name=iPhone 6,OS=8.1',
-      # 'name=iPhone 6 Plus,OS=8.1',
+    [ 'name=iPad 2,OS=8.1',
+      'name=iPad Air,OS=8.1',
+      'name=iPhone 4s,OS=8.1',
+      'name=iPhone 5,OS=8.1',
+      'name=iPhone 5s,OS=8.1',
+      'name=iPhone 6,OS=8.1',
+      'name=iPhone 6 Plus,OS=8.1',
       'name=iPhone 6,OS=9.0',
       'name=iPhone 6 Plus,OS=9.0',
       'name=iPhone 6,OS=9.1',