Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 9a9d38a

Browse files
authored
Merge pull request #1316 from stephencelis/fix-build
Update CI / build
2 parents 870ea89 + 718c798 commit 9a9d38a

File tree

5 files changed

+63
-84
lines changed

5 files changed

+63
-84
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@ name: Build and test
22
on: [push, pull_request]
33
env:
44
IOS_SIMULATOR: "iPhone 15"
5-
IOS_VERSION: "17.2"
5+
IOS_VERSION: "17.5"
66
jobs:
77
build:
8-
runs-on: macos-14
8+
runs-on: macos-15
99
steps:
1010
- uses: actions/checkout@v2
11-
- name: "Select Xcode"
12-
# Currently only works with Xcode 14.2:
13-
# https://github.com/CocoaPods/CocoaPods/issues/11839
14-
run: |
15-
xcode-select -p
16-
sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
1711
- name: "Lint"
1812
run: make lint
1913
- name: "Run tests (PACKAGE_MANAGER_COMMAND: test)"

‎Gemfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
source "https://rubygems.org"
22

3-
gem 'cocoapods', :git => 'https://github.com/SagarSDagdu/CocoaPods.git', tag: '1.15.2.1-sagard'
3+
# https://github.com/CocoaPods/CocoaPods/pull/12816
4+
gem 'cocoapods', :git => 'https://github.com/jberkel/CocoaPods.git', branch: 'watchos-fourflusher'

‎Gemfile.lock‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
GIT
2-
remote: https://github.com/SagarSDagdu/CocoaPods.git
3-
revision: d96f491f79abd2804d1359c5228cce404dd365b7
4-
tag:1.15.2.1-sagard
2+
remote: https://github.com/jberkel/CocoaPods.git
3+
revision: 32a90c184bc5dc9ec8b7b9b8ad08e98b7253dec2
4+
branch:watchos-fourflusher
55
specs:
6-
cocoapods (1.15.2.1.pre.sagard)
6+
cocoapods (1.16.2)
77
addressable (~> 2.8)
88
claide (>= 1.0.2, < 2.0)
9-
cocoapods-core (= 1.15.2)
9+
cocoapods-core (= 1.16.2)
1010
cocoapods-deintegrate (>= 1.0.3, < 2.0)
1111
cocoapods-downloader (>= 2.1, < 3.0)
1212
cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -19,8 +19,8 @@ GIT
1919
gh_inspector (~> 1.0)
2020
molinillo (~> 0.8.0)
2121
nap (~> 1.0)
22-
ruby-macho (>=2.3.0, <3.0)
23-
xcodeproj (>= 1.23.0, < 2.0)
22+
ruby-macho (~>4.1.0)
23+
xcodeproj (>= 1.27.0, < 2.0)
2424

2525
GEM
2626
remote: https://rubygems.org/
@@ -29,26 +29,29 @@ GEM
2929
base64
3030
nkf
3131
rexml
32-
activesupport (7.1.3.2)
32+
activesupport (7.2.2.1)
3333
base64
34+
benchmark (>= 0.3)
3435
bigdecimal
35-
concurrent-ruby (~> 1.0, >= 1.0.2)
36+
concurrent-ruby (~> 1.0, >= 1.3.1)
3637
connection_pool (>= 2.2.5)
3738
drb
3839
i18n (>= 1.6, < 2)
40+
logger (>= 1.4.2)
3941
minitest (>= 5.1)
40-
mutex_m
41-
tzinfo (~> 2.0)
42-
addressable (2.8.6)
43-
public_suffix (>= 2.0.2, < 6.0)
42+
securerandom (>=0.3)
43+
tzinfo (~> 2.0, >=2.0.5)
44+
addressable (2.8.7)
45+
public_suffix (>= 2.0.2, < 7.0)
4446
algoliasearch (1.27.5)
4547
httpclient (~> 2.8, >= 2.8.3)
4648
json (>= 1.5.1)
4749
atomos (0.1.3)
4850
base64 (0.2.0)
49-
bigdecimal (3.1.7)
51+
benchmark (0.4.0)
52+
bigdecimal (3.1.9)
5053
claide (1.1.0)
51-
cocoapods-core (1.15.2)
54+
cocoapods-core (1.16.2)
5255
activesupport (>= 5.0, < 8)
5356
addressable (~> 2.8)
5457
algoliasearch (~> 1.0)
@@ -68,41 +71,45 @@ GEM
6871
netrc (~> 0.11)
6972
cocoapods-try (1.2.0)
7073
colored2 (3.1.2)
71-
concurrent-ruby (1.2.3)
72-
connection_pool (2.4.1)
73-
drb (2.2.1)
74+
concurrent-ruby (1.3.5)
75+
connection_pool (2.5.3)
76+
drb (2.2.3)
7477
escape (0.0.4)
7578
ethon (0.16.0)
7679
ffi (>= 1.15.0)
77-
ffi (1.16.3)
80+
ffi (1.17.2)
81+
ffi (1.17.2-arm64-darwin)
7882
fourflusher (2.3.1)
7983
fuzzy_match (2.0.4)
8084
gh_inspector (1.1.3)
81-
httpclient (2.8.3)
82-
i18n (1.14.4)
85+
httpclient (2.9.0)
86+
mutex_m
87+
i18n (1.14.7)
8388
concurrent-ruby (~> 1.0)
84-
json (2.7.2)
85-
minitest (5.22.3)
89+
json (2.12.0)
90+
logger (1.7.0)
91+
minitest (5.25.5)
8692
molinillo (0.8.0)
87-
mutex_m (0.2.0)
88-
nanaimo (0.3.0)
93+
mutex_m (0.3.0)
94+
nanaimo (0.4.0)
8995
nap (1.1.0)
9096
netrc (0.11.0)
9197
nkf (0.2.0)
9298
public_suffix (4.0.7)
93-
rexml (3.2.6)
94-
ruby-macho (2.5.1)
99+
rexml (3.4.1)
100+
ruby-macho (4.1.0)
101+
securerandom (0.4.1)
95102
typhoeus (1.4.1)
96103
ethon (>= 0.9.0)
97104
tzinfo (2.0.6)
98105
concurrent-ruby (~> 1.0)
99-
xcodeproj (1.24.0)
106+
xcodeproj (1.27.0)
100107
CFPropertyList (>= 2.3.3, < 4.0)
101108
atomos (~> 0.1.3)
102109
claide (>= 1.0.2, < 2.0)
103110
colored2 (~> 3.1)
104-
nanaimo (~> 0.3.0)
105-
rexml (~> 3.2.4)
111+
nanaimo (~> 0.4.0)
112+
rexml (>= 3.3.6, <4.0)
106113

107114
PLATFORMS
108115
arm64-darwin-23
@@ -112,4 +119,4 @@ DEPENDENCIES
112119
cocoapods!
113120

114121
BUNDLED WITH
115-
2.5.4
122+
2.6.9

‎SQLite.swift.podspec‎

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,21 @@ Pod::Spec.new do |s|
1818
s.default_subspec = 'standard'
1919
s.swift_versions = ['5']
2020

21-
ios_deployment_target = '12.0'
22-
tvos_deployment_target = '12.0'
23-
osx_deployment_target = '10.13'
24-
watchos_deployment_target = '4.0'
25-
visionos_deployment_target = '1.0'
26-
27-
s.ios.deployment_target = ios_deployment_target
28-
s.tvos.deployment_target = tvos_deployment_target
29-
s.osx.deployment_target = osx_deployment_target
30-
s.watchos.deployment_target = watchos_deployment_target
31-
s.visionos.deployment_target = visionos_deployment_target
21+
s.ios.deployment_target = '12.0'
22+
s.tvos.deployment_target = '12.0'
23+
s.osx.deployment_target = '10.13'
24+
s.watchos.deployment_target = '4.0'
25+
s.visionos.deployment_target = '1.0'
3226

3327
s.subspec 'standard' do |ss|
3428
ss.source_files = 'Sources/SQLite/**/*.{c,h,m,swift}'
3529
ss.exclude_files = 'Sources/**/Cipher.swift'
3630
ss.library = 'sqlite3'
3731
ss.resource_bundle = { 'SQLite.swift' => 'Sources/SQLite/PrivacyInfo.xcprivacy' }
3832

39-
ss.ios.deployment_target = ios_deployment_target
40-
ss.tvos.deployment_target = tvos_deployment_target
41-
ss.osx.deployment_target = osx_deployment_target
42-
ss.watchos.deployment_target = watchos_deployment_target
43-
ss.visionos.deployment_target = visionos_deployment_target
44-
4533
ss.test_spec 'tests' do |test_spec|
4634
test_spec.resources = 'Tests/SQLiteTests/Resources/*'
4735
test_spec.source_files = 'Tests/SQLiteTests/*.swift'
48-
test_spec.ios.deployment_target = ios_deployment_target
49-
test_spec.tvos.deployment_target = tvos_deployment_target
50-
test_spec.osx.deployment_target = osx_deployment_target
5136
end
5237
end
5338

@@ -62,22 +47,20 @@ Pod::Spec.new do |s|
6247
}
6348
ss.dependency 'sqlite3'
6449

65-
ss.ios.deployment_target = ios_deployment_target
66-
ss.tvos.deployment_target = tvos_deployment_target
67-
ss.osx.deployment_target = osx_deployment_target
68-
ss.watchos.deployment_target = watchos_deployment_target
69-
ss.visionos.deployment_target = visionos_deployment_target
70-
7150
ss.test_spec 'tests' do |test_spec|
7251
test_spec.resources = 'Tests/SQLiteTests/Resources/*'
7352
test_spec.source_files = 'Tests/SQLiteTests/*.swift'
74-
test_spec.ios.deployment_target = ios_deployment_target
75-
test_spec.tvos.deployment_target = tvos_deployment_target
76-
test_spec.osx.deployment_target = osx_deployment_target
7753
end
7854
end
7955

8056
s.subspec 'SQLCipher' do |ss|
57+
# Disable unsupported visionOS
58+
# https://github.com/sqlcipher/sqlcipher/issues/483
59+
ss.ios.deployment_target = s.deployment_target(:ios)
60+
ss.tvos.deployment_target = s.deployment_target(:tvos)
61+
ss.osx.deployment_target = s.deployment_target(:osx)
62+
ss.watchos.deployment_target = s.deployment_target(:watchos)
63+
8164
ss.source_files = 'Sources/SQLite/**/*.{c,h,m,swift}'
8265
ss.resource_bundle = { 'SQLite.swift' => 'Sources/SQLite/PrivacyInfo.xcprivacy' }
8366

@@ -87,18 +70,9 @@ Pod::Spec.new do |s|
8770
}
8871
ss.dependency 'SQLCipher', '>= 4.0.0'
8972

90-
ss.ios.deployment_target = ios_deployment_target
91-
ss.tvos.deployment_target = tvos_deployment_target
92-
ss.osx.deployment_target = osx_deployment_target
93-
ss.watchos.deployment_target = watchos_deployment_target
94-
#ss.visionos.deployment_target = visionos_deployment_target # Not supported by SQLCipher for now
95-
9673
ss.test_spec 'tests' do |test_spec|
9774
test_spec.resources = 'Tests/SQLiteTests/Resources/*'
9875
test_spec.source_files = 'Tests/SQLiteTests/*.swift'
99-
test_spec.ios.deployment_target = ios_deployment_target
100-
test_spec.tvos.deployment_target = tvos_deployment_target
101-
test_spec.osx.deployment_target = osx_deployment_target
10276
end
10377
end
10478
end

‎run-tests.sh‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,18 @@ if [ -n "$BUILD_SCHEME" ]; then
88
fi
99
elif [ -n "$VALIDATOR_SUBSPEC" ]; then
1010
bundle install
11-
if [ "$VALIDATOR_SUBSPEC" == "none" ]; then
12-
bundle exec pod lib lint --no-subspecs --fail-fast
13-
else
14-
bundle exec pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast
15-
fi
11+
case "$VALIDATOR_SUBSPEC" in
12+
none)
13+
bundle exec pod lib lint --no-subspecs --fail-fast
14+
;;
15+
*)
16+
bundle exec pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast
17+
;;
18+
esac
1619
elif [ -n "$CARTHAGE_PLATFORM" ]; then
1720
cd Tests/Carthage && make test CARTHAGE_PLATFORM="$CARTHAGE_PLATFORM"
1821
elif [ -n "$SPM" ]; then
19-
cd Tests/SPM && swift ${SPM}
22+
cd Tests/SPM && swift "${SPM}"
2023
elif [ -n "${PACKAGE_MANAGER_COMMAND}" ]; then
2124
swift ${PACKAGE_MANAGER_COMMAND}
2225
fi

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /