Merge branch 'master' into osxmacos

kishikawakatsumi · Nov 12, 2023 · 5cac110 · 5cac110
2 parents 390dba5 + 6511d2a
commit 5cac110
Show file tree

Hide file tree

Showing 4 changed files with 120 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,114 @@
+name: Test
+on:
+  pull_request:
+    branches: [master]
+  push:
+    branches: [master]
+  workflow_dispatch:
+
+jobs:
+  test:
+    name: ${{ matrix.command }} on  ${{ matrix.platform }} (xcode ${{ matrix.xcode }}, ${{ matrix.macos }})
+    runs-on: ${{ matrix.macos }}
+    strategy:
+      fail-fast: false
+      matrix:
+        macos: ["macos-11", "macos-12", "macos-13"]
+        xcode: ["11.7", "12.5.1", "13.2.1", "14.2", "14.3.1", "15.0.1"]
+        platform: ["ios"]
+        command: ["test"]
+        exclude:
+          - macos: "macos-11"
+            xcode: "14.2"
+          - macos: "macos-11"
+            xcode: "14.3.1"
+          - macos: "macos-11"
+            xcode: "15.0.1"
+          - macos: "macos-12"
+            xcode: "11.7"
+          - macos: "macos-12"
+            xcode: "12.5.1"
+          - macos: "macos-12"
+            xcode: "13.2.1"
+          - macos: "macos-12"
+            xcode: "14.3.1"
+          - macos: "macos-12"
+            xcode: "15.0.1"
+          - macos: "macos-13"
+            xcode: "11.7"
+          - macos: "macos-13"
+            xcode: "12.5.1"
+          - macos: "macos-13"
+            xcode: "13.2.1"
+          - macos: "macos-13"
+            xcode: "14.2"
+    steps:
+      - uses: actions/checkout@v4
+      - uses: maxim-lobanov/[email protected]
+        with:
+          xcode-version: ${{ matrix.xcode }}
+      - name: Install the Apple certificate and provisioning profile
+        env:
+          BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
+          P12_PASSWORD: ${{ secrets.P12_PASSWORD }}
+          BUILD_PROVISION_PROFILE_BASE64: ${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          # create variables
+          CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
+          PP_PATH=$RUNNER_TEMP/build_pp.provisionprofile
+          KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
+
+          # import certificate and provisioning profile from secrets
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
+          echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
+
+          # create temporary keychain
+          security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+          security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
+
+          # import certificate to keychain
+          security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
+          security list-keychain -d user -s $KEYCHAIN_PATH
+
+          # apply provisioning profile
+          mkdir -p ~/Library/MobileDevice/Provisioning\ Profiles
+          cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
+      - name: Test
+        if: ${{ matrix.xcode=='11.7' && matrix.platform=='ios' }}
+        run: |
+          set -ex
+          xcodebuild test -workspace KeychainAccess.xcworkspace -scheme KeychainAccess -destination 'platform=iOS Simulator,OS=13.7,name=iPhone 11 Pro' -only-testing:KeychainAccessTests -resultBundlePath TestResults.xcresult
+      - name: Test
+        if: ${{ matrix.xcode=='12.5.1' && matrix.platform=='ios' }}
+        run: |
+          set -ex
+          xcodebuild test -workspace KeychainAccess.xcworkspace -scheme KeychainAccess -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 12 Pro' -only-testing:KeychainAccessTests -resultBundlePath TestResults.xcresult
+      - name: Test
+        if: ${{ matrix.xcode=='13.2.1' && matrix.platform=='ios' }}
+        run: |
+          set -ex
+          xcodebuild test -workspace KeychainAccess.xcworkspace -scheme KeychainAccess -destination 'platform=iOS Simulator,OS=15.2,name=iPhone 13 Pro' -only-testing:KeychainAccessTests -resultBundlePath TestResults.xcresult
+      - name: Test
+        if: ${{ matrix.xcode=='14.2' && matrix.platform=='ios' }}
+        run: |
+          set -ex
+          xcodebuild test -workspace KeychainAccess.xcworkspace -scheme KeychainAccess -destination 'platform=iOS Simulator,OS=16.2,name=iPhone 14 Pro' -only-testing:KeychainAccessTests -resultBundlePath TestResults.xcresult
+      - name: Test
+        if: ${{ matrix.xcode=='14.3.1' && matrix.platform=='ios' }}
+        run: |
+          set -ex
+          xcodebuild test -workspace KeychainAccess.xcworkspace -scheme KeychainAccess -destination 'platform=iOS Simulator,OS=16.4,name=iPhone 14 Pro' -only-testing:KeychainAccessTests -resultBundlePath TestResults1.xcresult
+          xcodebuild test -workspace KeychainAccess.xcworkspace -scheme KeychainAccess -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 14 Pro' -only-testing:KeychainAccessTests -resultBundlePath TestResults2.xcresult
+          xcrun xcresulttool merge TestResults1.xcresult TestResults2.xcresult --output-path TestResults.xcresult
+      - name: Test
+        if: ${{ matrix.xcode=='15.0.1' && matrix.platform=='ios' }}
+        run: |
+          set -ex
+          xcodebuild test -workspace KeychainAccess.xcworkspace -scheme KeychainAccess -destination 'platform=iOS Simulator,OS=17.0.1,name=iPhone 15 Pro' -only-testing:KeychainAccessTests -resultBundlePath TestResults.xcresult
+      - uses: kishikawakatsumi/xcresulttool@v1
+        with:
+          path: TestResults.xcresult
+          title: "KeychainAccess test report"
+        if: always()
diff --git a/KeychainAccess.podspec b/KeychainAccess.podspec
@@ -1,9 +1,9 @@
 Pod::Spec.new do |s|
   s.name             = 'KeychainAccess'
   s.version          = '4.2.2'
-  s.summary          = 'KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X.'
+  s.summary          = 'KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and macOS.'
   s.description      = <<-DESC
-                         KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X.
+                         KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and macOS.
                          Makes using Keychain APIs exremely easy and much more palatable to use in Swift.
 
                          Features
@@ -13,7 +13,7 @@ Pod::Spec.new do |s|
                            - Support iCloud sharing
                            - **Support TouchID and Keychain integration (iOS 8+)**
                            - **Support Shared Web Credentials (iOS 8+)**
-                           - Works on both iOS & OS X
+                           - Works on both iOS & macOS
                            - watchOS and tvOS are also supported
                        DESC
   s.homepage         = 'https://github.com/kishikawakatsumi/KeychainAccess'

diff --git a/Lib/KeychainAccess/Keychain.swift b/Lib/KeychainAccess/Keychain.swift
@@ -485,12 +485,6 @@ public final class Keychain {
         self.init(options)
     }
 
-    public convenience init(service: String) {
-        var options = Options()
-        options.service = service
-        self.init(options)
-    }
-
     public convenience init(accessGroup: String) {
         var options = Options()
         if let bundleIdentifier = Bundle.main.bundleIdentifier {
@@ -500,7 +494,7 @@ public final class Keychain {
         self.init(options)
     }
 
-    public convenience init(service: String, accessGroup: String) {
+    public convenience init(service: String, accessGroup: String? = nil) {
         var options = Options()
         options.service = service
         options.accessGroup = accessGroup
@@ -1396,7 +1390,7 @@ extension Options {
                 }
                 attributes[AttributeAccessControl] = accessControl
             } else {
-                print("Unavailable 'Touch ID integration' on OS X versions prior to 10.10.")
+                print("Unavailable 'Touch ID integration' on macOS versions prior to 10.10.")
             }
         } else {
             attributes[AttributeAccessible] = accessibility.rawValue

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Version](https://img.shields.io/cocoapods/v/KeychainAccess.svg)](http://cocoadocs.org/docsets/KeychainAccess)
 [![Platform](https://img.shields.io/cocoapods/p/KeychainAccess.svg)](http://cocoadocs.org/docsets/KeychainAccess)
 
-KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X. Makes using Keychain APIs extremely easy and much more palatable to use in Swift.
+KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and macOS. Makes using Keychain APIs extremely easy and much more palatable to use in Swift.
 
 <img src="https://raw.githubusercontent.com/kishikawakatsumi/KeychainAccess/master/Screenshots/01.png" width="320px" />
 <img src="https://raw.githubusercontent.com/kishikawakatsumi/KeychainAccess/master/Screenshots/02.png" width="320px" />