Skip to content

Commit c30d058

Browse files
authored
Update CI execution environment (#89)
* Update Danger execution environment to macOS13 * Update swift build execution environment to macOS13 * Update xcode build execution environment to macOS13 * Update minimum deployment target to macOS 10.13 * Update Sauce.framework v2.4.0 * Update dependency gems
1 parent 3a683b6 commit c30d058

File tree

9 files changed

+119
-96
lines changed

9 files changed

+119
-96
lines changed

.github/workflows/Danger.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,21 @@ on: pull_request
55
jobs:
66
danger:
77

8-
runs-on: macos-latest
8+
runs-on: macos-13
99

1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v4
1212
with:
1313
submodules: recursive
1414
fetch-depth: 0
1515

1616
- name: Setup ruby
17-
uses: actions/setup-ruby@v1
17+
uses: ruby/setup-ruby@v1
1818
with:
19-
ruby-version: '2.6'
19+
ruby-version: '3.2'
2020

2121
- name: Select Xcode
22-
run: sudo xcode-select -s /Applications/Xcode_11.4.app
22+
run: sudo xcode-select -s /Applications/Xcode_15.0.app/Contents/Developer
2323

2424
- name: Cache RubyGems
2525
uses: actions/cache@v1
@@ -64,4 +64,4 @@ jobs:
6464
env:
6565
MINT_PATH: ${{ github.workspace }}/mint
6666
MINT_LINK_PATH: ${{ github.workspace }}/mint/bin
67-
SWIFTLINT_VERSION: 0.39.1
67+
SWIFTLINT_VERSION: 0.53.0

.github/workflows/Swift-Build.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@ name: Swift-Build
22
on: [push, pull_request]
33
jobs:
44
test:
5-
runs-on: macos-latest
5+
runs-on: ${{ matrix.os }}
6+
strategy:
7+
matrix:
8+
os: [macos-12, macos-13]
9+
xcode: ['14.2', '15.0']
10+
exclude:
11+
- os: macos-12
12+
xcode: '15.0'
13+
env:
14+
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
615
steps:
7-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
817
with:
918
submodules: recursive
10-
11-
- name: Xcode select
12-
run: sudo xcode-select -s /Applications/Xcode_11.4.app
13-
1419
- name: Build and Test
15-
run: |
16-
swift test
20+
run: swift test

.github/workflows/Xcode-Build.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,30 @@ name: Xcode-Build
22
on: [push, pull_request]
33
jobs:
44
test:
5-
runs-on: macos-latest
5+
runs-on: ${{ matrix.os }}
6+
strategy:
7+
matrix:
8+
os: [macos-12, macos-13]
9+
xcode: ['14.2', '15.0']
10+
exclude:
11+
- os: macos-12
12+
xcode: '15.0'
13+
env:
14+
DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer"
615
steps:
7-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v4
817
with:
918
submodules: recursive
10-
11-
- name: Xcode select
12-
run: sudo xcode-select -s /Applications/Xcode_11.4.app
13-
1419
- name: Build and Test
1520
run: |
1621
set -o pipefail
1722
xcodebuild build-for-testing test-without-building \
1823
-workspace "$PROJECT" \
1924
-scheme "$SCHEME" \
2025
-sdk "$SDK" \
21-
-destination "$DESTINATION" \
2226
-configuration Debug \
2327
ENABLE_TESTABILITY=YES | xcpretty -c;
2428
env:
2529
PROJECT: Magnet.xcworkspace
2630
SCHEME: Magnet
2731
SDK: macosx
28-
DESTINATION: arch=x86_64

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "Clipy/Sauce" "v2.2.0"
1+
github "Clipy/Sauce" "v2.4.0"

Example/Example.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
287287
GCC_WARN_UNUSED_FUNCTION = YES;
288288
GCC_WARN_UNUSED_VARIABLE = YES;
289-
MACOSX_DEPLOYMENT_TARGET = 10.11;
289+
MACOSX_DEPLOYMENT_TARGET = 10.13;
290290
MTL_ENABLE_DEBUG_INFO = YES;
291291
ONLY_ACTIVE_ARCH = YES;
292292
SDKROOT = macosx;
@@ -336,7 +336,7 @@
336336
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
337337
GCC_WARN_UNUSED_FUNCTION = YES;
338338
GCC_WARN_UNUSED_VARIABLE = YES;
339-
MACOSX_DEPLOYMENT_TARGET = 10.11;
339+
MACOSX_DEPLOYMENT_TARGET = 10.13;
340340
MTL_ENABLE_DEBUG_INFO = NO;
341341
SDKROOT = macosx;
342342
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Gemfile.lock

Lines changed: 82 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,152 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
CFPropertyList (3.0.2)
5-
activesupport (4.2.11.3)
6-
i18n (~> 0.7)
7-
minitest (~> 5.1)
8-
thread_safe (~> 0.3, >= 0.3.4)
9-
tzinfo (~> 1.1)
10-
addressable (2.8.0)
11-
public_suffix (>= 2.0.2, < 5.0)
12-
algoliasearch (1.27.2)
4+
CFPropertyList (3.0.6)
5+
rexml
6+
activesupport (7.1.0)
7+
base64
8+
bigdecimal
9+
concurrent-ruby (~> 1.0, >= 1.0.2)
10+
connection_pool (>= 2.2.5)
11+
drb
12+
i18n (>= 1.6, < 2)
13+
minitest (>= 5.1)
14+
mutex_m
15+
tzinfo (~> 2.0)
16+
addressable (2.8.5)
17+
public_suffix (>= 2.0.2, < 6.0)
18+
algoliasearch (1.27.5)
1319
httpclient (~> 2.8, >= 2.8.3)
1420
json (>= 1.5.1)
1521
atomos (0.1.3)
16-
claide (1.0.3)
22+
base64 (0.1.1)
23+
bigdecimal (3.1.4)
24+
claide (1.1.0)
1725
claide-plugins (0.9.2)
1826
cork
1927
nap
2028
open4 (~> 1.3)
21-
cocoapods (1.9.2)
22-
activesupport (>= 4.0.2, < 5)
29+
cocoapods (1.13.0)
30+
addressable (~> 2.8)
2331
claide (>= 1.0.2, < 2.0)
24-
cocoapods-core (= 1.9.2)
32+
cocoapods-core (= 1.13.0)
2533
cocoapods-deintegrate (>= 1.0.3, < 2.0)
26-
cocoapods-downloader (>= 1.2.2, < 2.0)
34+
cocoapods-downloader (>= 1.6.0, < 2.0)
2735
cocoapods-plugins (>= 1.0.0, < 2.0)
2836
cocoapods-search (>= 1.0.0, < 2.0)
29-
cocoapods-stats (>= 1.0.0, < 2.0)
30-
cocoapods-trunk (>= 1.4.0, < 2.0)
37+
cocoapods-trunk (>= 1.6.0, < 2.0)
3138
cocoapods-try (>= 1.1.0, < 2.0)
3239
colored2 (~> 3.1)
3340
escape (~> 0.0.4)
3441
fourflusher (>= 2.3.0, < 3.0)
3542
gh_inspector (~> 1.0)
36-
molinillo (~> 0.6.6)
43+
molinillo (~> 0.8.0)
3744
nap (~> 1.0)
38-
ruby-macho (~> 1.4)
39-
xcodeproj (>= 1.14.0, < 2.0)
40-
cocoapods-core (1.9.2)
41-
activesupport (>= 4.0.2, < 6)
45+
ruby-macho (>= 2.3.0, < 3.0)
46+
xcodeproj (>= 1.23.0, < 2.0)
47+
cocoapods-core (1.13.0)
48+
activesupport (>= 5.0, < 8)
49+
addressable (~> 2.8)
4250
algoliasearch (~> 1.0)
4351
concurrent-ruby (~> 1.1)
4452
fuzzy_match (~> 2.0.4)
4553
nap (~> 1.0)
4654
netrc (~> 0.11)
55+
public_suffix (~> 4.0)
4756
typhoeus (~> 1.0)
48-
cocoapods-deintegrate (1.0.4)
49-
cocoapods-downloader (1.3.0)
57+
cocoapods-deintegrate (1.0.5)
58+
cocoapods-downloader (1.6.3)
5059
cocoapods-plugins (1.0.0)
5160
nap
52-
cocoapods-search (1.0.0)
53-
cocoapods-stats (1.1.0)
54-
cocoapods-trunk (1.5.0)
61+
cocoapods-search (1.0.1)
62+
cocoapods-trunk (1.6.0)
5563
nap (>= 0.8, < 2.0)
5664
netrc (~> 0.11)
5765
cocoapods-try (1.2.0)
5866
colored2 (3.1.2)
59-
concurrent-ruby (1.1.6)
67+
concurrent-ruby (1.2.2)
68+
connection_pool (2.4.1)
6069
cork (0.3.0)
6170
colored2 (~> 3.1)
62-
danger (8.0.0)
71+
danger (9.3.2)
6372
claide (~> 1.0)
6473
claide-plugins (>= 0.9.2)
6574
colored2 (~> 3.1)
6675
cork (~> 0.1)
67-
faraday (>= 0.9.0, < 2.0)
76+
faraday (>= 0.9.0, < 3.0)
6877
faraday-http-cache (~> 2.0)
69-
git (~> 1.7)
70-
kramdown (~> 2.0)
78+
git (~> 1.13)
79+
kramdown (~> 2.3)
7180
kramdown-parser-gfm (~> 1.0)
7281
no_proxy_fix
73-
octokit (~> 4.7)
74-
terminal-table (~> 1)
75-
danger-swiftlint (0.24.2)
82+
octokit (~> 6.0)
83+
terminal-table (>= 1, < 4)
84+
danger-swiftlint (0.33.0)
7685
danger
7786
rake (> 10)
7887
thor (~> 0.19)
88+
drb (2.1.1)
89+
ruby2_keywords
7990
escape (0.0.4)
80-
ethon (0.12.0)
81-
ffi (>= 1.3.0)
82-
faraday (1.0.1)
83-
multipart-post (>= 1.2, < 3)
84-
faraday-http-cache (2.2.0)
91+
ethon (0.16.0)
92+
ffi (>= 1.15.0)
93+
faraday (2.7.11)
94+
base64
95+
faraday-net_http (>= 2.0, < 3.1)
96+
ruby2_keywords (>= 0.0.4)
97+
faraday-http-cache (2.5.0)
8598
faraday (>= 0.8)
86-
ffi (1.12.2)
99+
faraday-net_http (3.0.2)
100+
ffi (1.16.3)
87101
fourflusher (2.3.1)
88102
fuzzy_match (2.0.4)
89103
gh_inspector (1.1.3)
90-
git (1.7.0)
104+
git (1.18.0)
105+
addressable (~> 2.8)
91106
rchardet (~> 1.8)
92107
httpclient (2.8.3)
93-
i18n (0.9.5)
108+
i18n (1.14.1)
94109
concurrent-ruby (~> 1.0)
95-
json (2.3.0)
96-
kramdown (2.3.1)
110+
json (2.6.3)
111+
kramdown (2.4.0)
97112
rexml
98113
kramdown-parser-gfm (1.1.0)
99114
kramdown (~> 2.0)
100-
minitest (5.14.1)
101-
molinillo (0.6.6)
102-
multipart-post (2.1.1)
103-
nanaimo (0.2.6)
115+
minitest (5.20.0)
116+
molinillo (0.8.0)
117+
mutex_m (0.1.2)
118+
nanaimo (0.3.0)
104119
nap (1.1.0)
105120
netrc (0.11.0)
106121
no_proxy_fix (0.1.2)
107-
octokit (4.18.0)
108-
faraday (>= 0.9)
109-
sawyer (~> 0.8.0, >= 0.5.3)
122+
octokit (6.1.1)
123+
faraday (>= 1, < 3)
124+
sawyer (~> 0.9)
110125
open4 (1.3.4)
111-
public_suffix (4.0.6)
112-
rake (13.0.1)
126+
public_suffix (4.0.7)
127+
rake (13.0.6)
113128
rchardet (1.8.0)
114-
rexml (3.2.5)
115-
ruby-macho (1.4.0)
116-
sawyer (0.8.2)
129+
rexml (3.2.6)
130+
ruby-macho (2.5.1)
131+
ruby2_keywords (0.0.5)
132+
sawyer (0.9.2)
117133
addressable (>= 2.3.5)
118-
faraday (> 0.8, < 2.0)
119-
terminal-table (1.8.0)
120-
unicode-display_width (~> 1.1, >= 1.1.1)
134+
faraday (>= 0.17.3, < 3)
135+
terminal-table (3.0.2)
136+
unicode-display_width (>= 1.1.1, < 3)
121137
thor (0.20.3)
122-
thread_safe (0.3.6)
123138
typhoeus (1.4.0)
124139
ethon (>= 0.9.0)
125-
tzinfo (1.2.7)
126-
thread_safe (~> 0.1)
127-
unicode-display_width (1.7.0)
128-
xcodeproj (1.16.0)
140+
tzinfo (2.0.6)
141+
concurrent-ruby (~> 1.0)
142+
unicode-display_width (2.5.0)
143+
xcodeproj (1.23.0)
129144
CFPropertyList (>= 2.3.3, < 4.0)
130145
atomos (~> 0.1.3)
131146
claide (>= 1.0.2, < 2.0)
132147
colored2 (~> 3.1)
133-
nanaimo (~> 0.2.6)
148+
nanaimo (~> 0.3.0)
149+
rexml (~> 3.2.4)
134150

135151
PLATFORMS
136152
ruby
@@ -141,4 +157,4 @@ DEPENDENCIES
141157
danger-swiftlint
142158

143159
BUNDLED WITH
144-
2.1.4
160+
2.3.5

Lib/Magnet.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@
388388
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
389389
GCC_WARN_UNUSED_FUNCTION = YES;
390390
GCC_WARN_UNUSED_VARIABLE = YES;
391-
MACOSX_DEPLOYMENT_TARGET = 10.10;
391+
MACOSX_DEPLOYMENT_TARGET = 10.13;
392392
MTL_ENABLE_DEBUG_INFO = YES;
393393
ONLY_ACTIVE_ARCH = YES;
394394
SDKROOT = macosx;
@@ -441,7 +441,7 @@
441441
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
442442
GCC_WARN_UNUSED_FUNCTION = YES;
443443
GCC_WARN_UNUSED_VARIABLE = YES;
444-
MACOSX_DEPLOYMENT_TARGET = 10.10;
444+
MACOSX_DEPLOYMENT_TARGET = 10.13;
445445
MTL_ENABLE_DEBUG_INFO = NO;
446446
SDKROOT = macosx;
447447
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ import PackageDescription
55
let package = Package(
66
name: "Magnet",
77
platforms: [
8-
.macOS(.v10_10)
8+
.macOS(.v10_13)
99
],
1010
products: [
1111
.library(
1212
name: "Magnet",
1313
targets: ["Magnet"]),
1414
],
1515
dependencies: [
16-
.package(url: "https://github.com/Clipy/Sauce", .upToNextMinor(from: "2.2.0")),
16+
.package(url: "https://github.com/Clipy/Sauce", .upToNextMinor(from: "2.4.0")),
1717
],
1818
targets: [
1919
.target(

0 commit comments

Comments
 (0)