Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ${{ matrix.os }}
env:
IOS_SIMULATOR: ${{ matrix.os == 'macos-15' && 'iPhone 16' || 'iPhone 16e' }}
IOS_VERSION: ${{ matrix.os == 'macos-15' && '18.5' || '26.0.1' }}
IOS_VERSION: ${{ matrix.os == 'macos-15' && '18.5' || '26.1' }}
steps:
- uses: actions/checkout@v4
- name: "xcrun simctl list"
Expand Down Expand Up @@ -72,10 +72,11 @@ jobs:
run: ./run-tests.sh
- name: "Run tests (tuist)"
run: |
brew update
brew install tuist
cd Tests/Tuist/SQLite-Test
tuist install
tuist test
# tuist test
build-linux:
runs-on: ubuntu-latest
steps:
Expand Down
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
source "https://rubygems.org"

# https://github.com/CocoaPods/CocoaPods/pull/12816
gem 'cocoapods', :git => 'https://github.com/jberkel/CocoaPods.git', branch: 'watchos-fourflusher'
gem 'cocoapods'
66 changes: 29 additions & 37 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,32 +1,8 @@
GIT
remote: https://github.com/jberkel/CocoaPods.git
revision: 32a90c184bc5dc9ec8b7b9b8ad08e98b7253dec2
branch: watchos-fourflusher
specs:
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (~> 4.1.0)
xcodeproj (>= 1.27.0, < 2.0)

GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.8)
activesupport (7.2.3)
activesupport (7.2.3.1)
base64
benchmark (>= 0.3)
bigdecimal
Expand All @@ -35,7 +11,7 @@ GEM
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
minitest (>= 5.1, < 6)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.9.0)
Expand All @@ -46,8 +22,26 @@ GEM
atomos (0.1.3)
base64 (0.3.0)
benchmark (0.5.0)
bigdecimal (4.0.1)
bigdecimal (4.1.2)
claide (1.1.0)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
Expand Down Expand Up @@ -75,31 +69,29 @@ GEM
ethon (0.18.0)
ffi (>= 1.15.0)
logger
ffi (1.17.3)
ffi (1.17.3-arm64-darwin)
ffi (1.17.4)
ffi (1.17.4-arm64-darwin)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.9.0)
mutex_m
i18n (1.14.8)
concurrent-ruby (~> 1.0)
json (2.18.0)
json (2.19.4)
logger (1.7.0)
minitest (6.0.1)
prism (~> 1.5)
minitest (5.27.0)
molinillo (0.8.0)
mutex_m (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
netrc (0.11.0)
prism (1.7.0)
public_suffix (4.0.7)
rexml (3.4.4)
ruby-macho (4.1.0)
ruby-macho (2.5.1)
securerandom (0.4.1)
typhoeus (1.4.1)
ethon (>= 0.9.0)
typhoeus (1.6.0)
ethon (>= 0.18.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.27.0)
Expand All @@ -115,7 +107,7 @@ PLATFORMS
ruby

DEPENDENCIES
cocoapods!
cocoapods

BUNDLED WITH
2.6.9
4 changes: 2 additions & 2 deletions run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ elif [ -n "$VALIDATOR_SUBSPEC" ]; then
bundle install
case "$VALIDATOR_SUBSPEC" in
none)
bundle exec pod lib lint --no-subspecs --fail-fast
bundle exec pod lib lint --no-subspecs --fail-fast --platforms=ios,macos
;;
*)
bundle exec pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast
bundle exec pod lib lint --subspec="${VALIDATOR_SUBSPEC}" --fail-fast --platforms=ios,macos
;;
esac
elif [ -n "$CARTHAGE_PLATFORM" ]; then
Expand Down
Loading