Skip to content

Commit c69dd2b

Browse files
committed
Merge branch 'master' into feature/async-provider
2 parents fdef3cd + 4317095 commit c69dd2b

144 files changed

Lines changed: 346 additions & 343 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/setup/action.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@ name: Set up environment
22
description: Set up the environment for building and testing the library on a given platform
33

44
inputs:
5+
ruby:
6+
description: The version of Ruby to use
7+
required: true
8+
59
xcode:
610
description: The version of Xcode to use
711
required: true
@@ -10,16 +14,16 @@ runs:
1014
using: composite
1115

1216
steps:
13-
1417
- name: Set up Ruby
15-
uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # pinned to version v1.191.0
18+
uses: ruby/setup-ruby@6ca151fd1bfcfd6fe0c4eb6837eb0584d0134a0c # pin@v1.290.0
1619
with:
17-
ruby-version: '3.1.0'
20+
ruby-version: ${{ inputs.ruby }}
1821
bundler-cache: true
1922
cache-version: 1
2023

2124
- name: Setup Xcode
22-
uses: mxcl/xcodebuild@6e60022a0cbe8c89278be2dd1773a2f68e7c5c87
25+
uses: mxcl/xcodebuild@d3ee9b419c1be9a988086c58fe0988f32d99cfc5 # pin@v3.6.0
2326
with:
2427
xcode: ${{ inputs.xcode }}
2528
action: none
29+
verbosity: xcbeautify

.github/actions/test/action.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ inputs:
55
xcode:
66
description: The version of Xcode to use
77
required: true
8+
89
scheme:
910
description: The Xcode scheme to use
1011
required: true
12+
1113
platform:
1214
description: The platform to build for
1315
required: true
@@ -16,18 +18,15 @@ runs:
1618
using: composite
1719

1820
steps:
19-
- name: Install xcpretty
20-
run: gem install xcpretty
21-
shell: bash
22-
2321
- name: Save Xcode version
2422
run: xcodebuild -version | tee .xcode-version
2523
shell: bash
2624

2725
- name: Run tests
28-
uses: mxcl/xcodebuild@6e60022a0cbe8c89278be2dd1773a2f68e7c5c87
26+
uses: mxcl/xcodebuild@d3ee9b419c1be9a988086c58fe0988f32d99cfc5 # pin@v3.6.0
2927
with:
3028
xcode: ${{ inputs.xcode }}
3129
scheme: ${{ inputs.scheme }}
3230
platform: ${{ inputs.platform }}
3331
code-coverage: true
32+
verbosity: xcbeautify

.github/dependabot.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,26 @@ updates:
88
ignore:
99
- dependency-name: '*'
1010
update-types: [version-update:semver-major]
11+
labels:
12+
- dependencies
1113

1214
- package-ecosystem: github-actions
1315
directory: /
1416
schedule:
1517
interval: daily
18+
labels:
19+
- dependencies
20+
21+
- package-ecosystem: github-actions
22+
directory: /.github/actions/setup
23+
schedule:
24+
interval: daily
25+
labels:
26+
- dependencies
27+
28+
- package-ecosystem: github-actions
29+
directory: /.github/actions/test
30+
schedule:
31+
interval: daily
32+
labels:
33+
- dependencies

.github/workflows/main.yml

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ concurrency:
1212
group: ${{ github.workflow }}-${{ github.ref }}
1313
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
1414

15+
env:
16+
ruby: '3.3.1'
17+
1518
jobs:
1619
authorize:
1720
name: Authorize
@@ -24,7 +27,7 @@ jobs:
2427
needs: authorize # Require approval before running on forked pull requests
2528
name: Test on ${{ matrix.platform.os }} using Xcode ${{ matrix.xcode }}
2629
environment: ${{ github.event.pull_request.head.repo.fork && 'external' || 'internal' }}
27-
runs-on: macos-13
30+
runs-on: macos-14
2831

2932
env:
3033
xcodeproj: SimpleKeychain.xcodeproj
@@ -36,15 +39,16 @@ jobs:
3639
- { os: macOS, scheme: SimpleKeychain-macOS }
3740
- { os: tvOS, scheme: SimpleKeychain-tvOS }
3841
xcode:
39-
- '15.0.1'
42+
- '16.1'
4043

4144
steps:
4245
- name: Checkout
43-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
46+
uses: actions/checkout@v6
4447

4548
- name: Set up environment
4649
uses: ./.github/actions/setup
4750
with:
51+
ruby: ${{ env.ruby }}
4852
xcode: ${{ matrix.xcode }}
4953

5054
- name: Run tests
@@ -60,59 +64,64 @@ jobs:
6064

6165
- name: Upload coverage report
6266
if: ${{ matrix.platform.os == 'iOS' }}
63-
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # pin@5.3.1
67+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # pin@5.5.2
6468
with:
6569
token: ${{ secrets.CODECOV_TOKEN }}
6670

6771
test-package:
6872
name: Test Swift package using Xcode ${{ matrix.xcode }}
69-
runs-on: macos-13
73+
runs-on: macos-14
7074

7175
strategy:
7276
matrix:
7377
xcode:
74-
- '15.0.1'
78+
- '16.1'
7579

7680
steps:
7781
- name: Checkout
78-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
82+
uses: actions/checkout@v6
7983

8084
- name: Set up environment
8185
uses: ./.github/actions/setup
8286
with:
87+
ruby: ${{ env.ruby }}
8388
xcode: ${{ matrix.xcode }}
8489

8590
- name: Run tests
8691
run: swift test
8792

8893
pod-lint:
8994
name: Lint podspec using Xcode ${{ matrix.xcode }}
90-
runs-on: macos-13-xlarge
95+
runs-on: macos-14-xlarge
9196

9297
strategy:
9398
matrix:
9499
xcode:
95-
- '15.2'
100+
- '16.1'
96101

97102
steps:
98103
- name: Checkout
99-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
104+
uses: actions/checkout@v6
100105

101106
- name: Set up environment
102107
uses: ./.github/actions/setup
103108
with:
109+
ruby: ${{ env.ruby }}
104110
xcode: ${{ matrix.xcode }}
105111

106112
- name: Run pod lib lint
107113
run: bundle exec pod lib lint --allow-warnings --fail-fast
108114

109115
swiftlint:
110116
name: Lint code with SwiftLint
111-
runs-on: macos-13
117+
runs-on: macos-14
112118

113119
steps:
114120
- name: Checkout
115-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
121+
uses: actions/checkout@v6
122+
123+
- name: Install SwiftLint
124+
run: brew install swiftlint
116125

117126
- name: Run SwiftLint
118127
run: swiftlint lint --reporter github-actions-logging

.github/workflows/sca_scan.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: SCA
2+
3+
on:
4+
push:
5+
branches:
6+
- "**"
7+
8+
jobs:
9+
snyk-cli:
10+
uses: auth0/devsecops-tooling/.github/workflows/sca-scan.yml@main
11+
with:
12+
additional-arguments: "--exclude=README.md"
13+
secrets: inherit

.github/workflows/semgrep.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

.github/workflows/snyk.yml

Lines changed: 0 additions & 40 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Change Log
22

3+
## [1.3.0](https://github.com/auth0/SimpleKeychain/tree/1.3.0) (2025-03-14)
4+
[Full Changelog](https://github.com/auth0/SimpleKeychain/compare/1.2.0...1.3.0)
5+
6+
**Added**
7+
- feat: add `errSecMissingEntitlement` error [\#224](https://github.com/auth0/SimpleKeychain/pull/224) ([grdsdev](https://github.com/grdsdev))
8+
- Add `Sendable` conformance [\#235](https://github.com/auth0/SimpleKeychain/pull/235) ([Widcket](https://github.com/Widcket))
9+
310
## [1.2.0](https://github.com/auth0/SimpleKeychain/tree/1.2.0) (2024-09-16)
411
[Full Changelog](https://github.com/auth0/SimpleKeychain/compare/1.1.0...1.2.0)
512

0 commit comments

Comments
 (0)