Skip to content

Commit f1c53dc

Browse files
authored
Merge branch 'main' into dependabot/github_actions/swiftwasm/swiftwasm-action-5.9
2 parents c4e324b + ae0648d commit f1c53dc

File tree

265 files changed

+3537
-245188
lines changed

Some content is hidden

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

265 files changed

+3537
-245188
lines changed

.github/workflows/carthage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ on:
1313
jobs:
1414
carthage:
1515
name: Carthage Build
16-
runs-on: macos-12
16+
runs-on: macos-14
1717
steps:
1818
- uses: actions/checkout@v4
1919
- uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: 2.7
21+
ruby-version: 3.2
2222
bundler-cache: true
2323
- run: ./test carthage

.github/workflows/ci-swiftpm.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@ on:
1111
- "*"
1212

1313
jobs:
14-
swiftpm_darwin_monterey:
14+
swiftpm_darwin_ventura:
1515
name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
16-
runs-on: macos-12
16+
runs-on: macos-13
1717
strategy:
1818
matrix:
19-
xcode: ["14.0.1", "14.1", "14.2"]
19+
xcode: ["14.3.1"]
2020
env:
2121
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
2222
steps:
2323
- uses: actions/checkout@v4
2424
- run: ./test swiftpm
2525

26-
swiftpm_darwin_ventura:
26+
swiftpm_darwin_sonoma:
2727
name: SwiftPM, Darwin, Xcode ${{ matrix.xcode }}
28-
runs-on: macos-13
28+
runs-on: macos-14
2929
strategy:
3030
matrix:
31-
xcode: ["14.3.1"]
31+
xcode: ["15.3", "16.1"]
3232
env:
3333
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
3434
steps:
@@ -43,6 +43,8 @@ jobs:
4343
container:
4444
- swift:5.7
4545
- swift:5.8
46+
- swift:5.9
47+
- swift:6.0
4648
# - swiftlang/swift:nightly
4749
fail-fast: false
4850
container: ${{ matrix.container }}

.github/workflows/ci-xcode.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ on:
1111
- "*"
1212

1313
jobs:
14-
xcode_monterey:
14+
xcode_ventura:
1515
name: Xcode ${{ matrix.xcode }} (Xcode Project)
16-
runs-on: macos-12
16+
runs-on: macos-13
1717
strategy:
1818
matrix:
19-
xcode: ["14.0.1", "14.1", "14.2"]
19+
xcode: ["14.3.1"]
2020
fail-fast: false
2121
env:
2222
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
@@ -27,12 +27,12 @@ jobs:
2727
- run: ./test tvos
2828
- run: ./test watchos
2929

30-
xcode_ventura:
30+
xcode_sonoma:
3131
name: Xcode ${{ matrix.xcode }} (Xcode Project)
32-
runs-on: macos-13
32+
runs-on: macos-14
3333
strategy:
3434
matrix:
35-
xcode: ["14.3.1"]
35+
xcode: ["15.4", "16.1"]
3636
fail-fast: false
3737
env:
3838
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
@@ -45,10 +45,10 @@ jobs:
4545

4646
xcode_spm:
4747
name: Xcode ${{ matrix.xcode }} (Swift Package)
48-
runs-on: macos-12
48+
runs-on: macos-14
4949
strategy:
5050
matrix:
51-
xcode: ["14.0.1"]
51+
xcode: ["16.1"]
5252
fail-fast: false
5353
env:
5454
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"

.github/workflows/cocoapods.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ on:
1313
jobs:
1414
cocoapods:
1515
name: CocoaPods Lint
16-
runs-on: macos-12
16+
runs-on: macos-14
1717
steps:
1818
- uses: actions/checkout@v4
1919
- uses: ruby/setup-ruby@v1
2020
with:
21-
ruby-version: 2.7
21+
ruby-version: 3.2
2222
bundler-cache: true
2323
- run: ./test podspec
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: Build Documentation
2+
on:
3+
push:
4+
branches:
5+
- main
6+
tags:
7+
- "*"
8+
pull_request:
9+
branches:
10+
- "*"
11+
12+
permissions:
13+
contents: write
14+
15+
jobs:
16+
build-documentation:
17+
runs-on: ubuntu-latest
18+
container: swift:latest
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
23+
- name: Build Docs
24+
run: |
25+
./script/build_docs
26+
27+
- name: Deploy Docs
28+
if: github.ref == 'refs/heads/main'
29+
uses: JamesIves/github-pages-deploy-action@v4
30+
with:
31+
folder: docs

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77
jobs:
88
carthage_archive:
99
name: Darwin, Xcode 14.0
10-
runs-on: macos-12
10+
runs-on: macos-14
1111
strategy:
1212
matrix:
13-
xcode: ["14.0.1"]
13+
xcode: ["16.1"]
1414
env:
1515
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app"
1616
steps:
@@ -21,7 +21,7 @@ jobs:
2121
./test carthage
2222
zip -r Nimble.xcframework.zip Carthage/Build/Nimble.xcframework
2323
- name: Upload Nimble.xcframework.zip
24-
uses: softprops/action-gh-release@v1
24+
uses: softprops/action-gh-release@v2
2525
with:
2626
files: |
2727
Nimble.xcframework.zip

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# A sample Gemfile
22
source "https://rubygems.org"
33

4-
gem 'cocoapods', '~> 1.14'
5-
gem 'jazzy', '~> 0.14'
4+
gem 'cocoapods', '~> 1.16'
5+
gem 'jazzy', '~> 0.15'

Gemfile.lock

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,36 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.6)
4+
CFPropertyList (3.0.7)
5+
base64
6+
nkf
57
rexml
6-
activesupport (7.1.2)
8+
activesupport (7.2.2)
79
base64
10+
benchmark (>= 0.3)
811
bigdecimal
9-
concurrent-ruby (~> 1.0, >= 1.0.2)
12+
concurrent-ruby (~> 1.0, >= 1.3.1)
1013
connection_pool (>= 2.2.5)
1114
drb
1215
i18n (>= 1.6, < 2)
16+
logger (>= 1.4.2)
1317
minitest (>= 5.1)
14-
mutex_m
15-
tzinfo (~> 2.0)
16-
addressable (2.8.6)
17-
public_suffix (>= 2.0.2, < 6.0)
18+
securerandom (>= 0.3)
19+
tzinfo (~> 2.0, >= 2.0.5)
20+
addressable (2.8.7)
21+
public_suffix (>= 2.0.2, < 7.0)
1822
algoliasearch (1.27.5)
1923
httpclient (~> 2.8, >= 2.8.3)
2024
json (>= 1.5.1)
2125
atomos (0.1.3)
2226
base64 (0.2.0)
23-
bigdecimal (3.1.5)
27+
benchmark (0.4.0)
28+
bigdecimal (3.1.8)
2429
claide (1.1.0)
25-
cocoapods (1.14.3)
30+
cocoapods (1.16.2)
2631
addressable (~> 2.8)
2732
claide (>= 1.0.2, < 2.0)
28-
cocoapods-core (= 1.14.3)
33+
cocoapods-core (= 1.16.2)
2934
cocoapods-deintegrate (>= 1.0.3, < 2.0)
3035
cocoapods-downloader (>= 2.1, < 3.0)
3136
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -39,8 +44,8 @@ GEM
3944
molinillo (~> 0.8.0)
4045
nap (~> 1.0)
4146
ruby-macho (>= 2.3.0, < 3.0)
42-
xcodeproj (>= 1.23.0, < 2.0)
43-
cocoapods-core (1.14.3)
47+
xcodeproj (>= 1.27.0, < 2.0)
48+
cocoapods-core (1.16.2)
4449
activesupport (>= 5.0, < 8)
4550
addressable (~> 2.8)
4651
algoliasearch (~> 1.0)
@@ -60,71 +65,71 @@ GEM
6065
netrc (~> 0.11)
6166
cocoapods-try (1.2.0)
6267
colored2 (3.1.2)
63-
concurrent-ruby (1.2.2)
68+
concurrent-ruby (1.3.4)
6469
connection_pool (2.4.1)
65-
drb (2.2.0)
66-
ruby2_keywords
70+
drb (2.2.1)
6771
escape (0.0.4)
6872
ethon (0.16.0)
6973
ffi (>= 1.15.0)
70-
ffi (1.16.3)
74+
ffi (1.17.0)
7175
fourflusher (2.3.1)
7276
fuzzy_match (2.0.4)
7377
gh_inspector (1.1.3)
7478
httpclient (2.8.3)
75-
i18n (1.14.1)
79+
i18n (1.14.6)
7680
concurrent-ruby (~> 1.0)
77-
jazzy (0.14.4)
81+
jazzy (0.15.3)
7882
cocoapods (~> 1.5)
7983
mustache (~> 1.1)
8084
open4 (~> 1.3)
8185
redcarpet (~> 3.4)
82-
rexml (~> 3.2)
86+
rexml (>= 3.2.7, < 4.0)
8387
rouge (>= 2.0.6, < 5.0)
8488
sassc (~> 2.1)
8589
sqlite3 (~> 1.3)
8690
xcinvoke (~> 0.3.0)
87-
json (2.7.1)
91+
json (2.8.1)
8892
liferaft (0.0.6)
89-
mini_portile2 (2.8.5)
90-
minitest (5.20.0)
93+
logger (1.6.1)
94+
mini_portile2 (2.8.7)
95+
minitest (5.25.1)
9196
molinillo (0.8.0)
9297
mustache (1.1.1)
93-
mutex_m (0.2.0)
94-
nanaimo (0.3.0)
98+
nanaimo (0.4.0)
9599
nap (1.1.0)
96100
netrc (0.11.0)
101+
nkf (0.2.0)
97102
open4 (1.3.4)
98103
public_suffix (4.0.7)
99104
redcarpet (3.6.0)
100-
rexml (3.2.6)
101-
rouge (4.2.0)
105+
rexml (3.4.2)
106+
rouge (4.4.0)
102107
ruby-macho (2.5.1)
103-
ruby2_keywords (0.0.5)
104108
sassc (2.4.0)
105109
ffi (~> 1.9)
106-
sqlite3 (1.6.9)
110+
securerandom (0.3.1)
111+
sqlite3 (1.7.3)
107112
mini_portile2 (~> 2.8.0)
108113
typhoeus (1.4.1)
109114
ethon (>= 0.9.0)
110115
tzinfo (2.0.6)
111116
concurrent-ruby (~> 1.0)
112117
xcinvoke (0.3.0)
113118
liferaft (~> 0.0.6)
114-
xcodeproj (1.23.0)
119+
xcodeproj (1.27.0)
115120
CFPropertyList (>= 2.3.3, < 4.0)
116121
atomos (~> 0.1.3)
117122
claide (>= 1.0.2, < 2.0)
118123
colored2 (~> 3.1)
119-
nanaimo (~> 0.3.0)
120-
rexml (~> 3.2.4)
124+
nanaimo (~> 0.4.0)
125+
rexml (>= 3.3.6, < 4.0)
121126

122127
PLATFORMS
123128
ruby
124129

125130
DEPENDENCIES
126-
cocoapods (~> 1.14)
127-
jazzy (~> 0.14)
131+
cocoapods (~> 1.16)
132+
jazzy (~> 0.15)
128133

129134
BUNDLED WITH
130135
2.1.4

Nimble.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Nimble"
3-
s.version = "13.2.0"
3+
s.version = "13.7.1"
44
s.summary = "A Matcher Framework for Swift and Objective-C"
55
s.description = <<-DESC
66
Use Nimble to express the expected outcomes of Swift or Objective-C expressions. Inspired by Cedar.
@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
3636
}
3737

3838
[s.osx, s.ios, s.visionos].each do |platform|
39-
platform.dependency 'CwlPreconditionTesting', '~> 2.1.0'
39+
platform.dependency 'CwlPreconditionTesting', '~> 2.2.0'
4040
end
4141

4242
s.cocoapods_version = '>= 1.4.0'

0 commit comments

Comments
 (0)