Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
590d30b
wip
stephencelis Oct 30, 2023
d2f35d1
wip
stephencelis Oct 30, 2023
5a6e1c3
fix
stephencelis Oct 30, 2023
b53ebe2
wip
stephencelis Oct 30, 2023
f9e78d7
wip
stephencelis Oct 31, 2023
a90d494
wip
stephencelis Oct 31, 2023
59cd6df
wip
stephencelis Oct 31, 2023
dd1d027
wip
stephencelis Oct 31, 2023
d57c164
wip
stephencelis Nov 2, 2023
6233b5b
ranges
mbrandonw Nov 10, 2023
0fba1e5
docs
mbrandonw Nov 10, 2023
a3e8db8
wip
stephencelis Nov 10, 2023
614a9fc
wip
mbrandonw Nov 10, 2023
a32f204
wip
stephencelis Nov 10, 2023
d64f1a2
wip
stephencelis Nov 10, 2023
31e2a56
wip
stephencelis Nov 10, 2023
48e1711
fix
stephencelis Nov 11, 2023
51a828f
wip
stephencelis Nov 11, 2023
85402d2
customizable method name
mbrandonw Nov 11, 2023
cd77f03
docs for @DependencyEndpoint
mbrandonw Nov 11, 2023
667ca77
clean up code
mbrandonw Nov 11, 2023
ba4b3b4
wip
mbrandonw Nov 11, 2023
fdc8aff
fix
mbrandonw Nov 11, 2023
9d5ba24
fixes
mbrandonw Nov 11, 2023
f300299
validate method
stephencelis Nov 12, 2023
fc53106
wip
stephencelis Nov 12, 2023
9112233
wip
stephencelis Nov 12, 2023
7dd49c0
add test
mbrandonw Nov 12, 2023
4993178
add test
mbrandonw Nov 12, 2023
ec6e00e
apply availability even when using @DependencyEndpoint(method:)
mbrandonw Nov 12, 2023
b79421e
wip
mbrandonw Nov 12, 2023
1f8dfc5
wip
stephencelis Nov 12, 2023
e763327
wip
stephencelis Nov 12, 2023
a2381bd
wip
stephencelis Nov 13, 2023
a0cbe0d
wip
stephencelis Nov 13, 2023
f660c88
wip
stephencelis Nov 13, 2023
e92c082
wip
stephencelis Nov 13, 2023
d82952b
docs fix
mbrandonw Nov 13, 2023
0f86009
wip
stephencelis Nov 13, 2023
c6d1faf
wip
stephencelis Nov 13, 2023
f0c28c8
wip
stephencelis Nov 13, 2023
3cd33cd
wip
stephencelis Nov 13, 2023
1dc21bd
wip
stephencelis Nov 13, 2023
32872c4
wip
stephencelis Nov 13, 2023
1dc3a53
Handle escaped identifiers correctly.
mbrandonw Nov 14, 2023
2ca782b
update diagnostic
mbrandonw Nov 14, 2023
e28790e
wip
stephencelis Nov 14, 2023
cf97576
updated gotchas
mbrandonw Nov 15, 2023
8778818
Disable windows and integration tests.
mbrandonw Nov 15, 2023
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
64 changes: 25 additions & 39 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,48 +15,34 @@ concurrency:

jobs:
macos:
name: macOS 13 (Xcode 14.3.1)
name: macOS
runs-on: macos-13
strategy:
matrix:
config: ['debug', 'release']
xcode: ['14.3.1', '15.0.1']
steps:
- uses: actions/checkout@v3
- name: Select Xcode 14.3.1
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
- name: Select Xcode ${{ matrix.xcode }}
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
- name: Skip macro validation
run: defaults write com.apple.dt.Xcode IDESkipMacroFingerprintValidation -bool YES
- name: Run tests
run: make test-swift
- name: Build platforms ${{ matrix.config }}
run: CONFIG=${{ matrix.config }} make build-all-platforms
- name: Build for library evolution
run: make build-for-library-evolution

# xcode-13:
# name: macOS 12 (Xcode 13.4.1)
# runs-on: macos-12
# strategy:
# matrix:
# config: ['debug', 'release']
# integration:
# name: Integration (UI Tests)
# runs-on: macos-13
# steps:
# - uses: actions/checkout@v3
# - name: Select Xcode 13.4.1
# run: sudo xcode-select -s /Applications/Xcode_13.4.1.app
# - name: Select Xcode 14.3.1
# run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
# - name: Run tests
# run: make test-swift
# - name: Build platforms ${{ matrix.config }}
# run: CONFIG=${{ matrix.config }} make build-all-platforms
# - name: Build for library evolution
# run: make build-for-library-evolution

integration:
name: Integration (UI Tests)
runs-on: macos-13
steps:
- uses: actions/checkout@v3
- name: Select Xcode 14.3
run: sudo xcode-select -s /Applications/Xcode_14.3.app
- name: Run tests
run: make test-integration
# run: make test-integration

ubuntu:
name: Linux
Expand All @@ -80,20 +66,20 @@ jobs:
with:
shell-action: carton test --environment node

windows:
name: Windows
runs-on: windows-latest
steps:
- uses: compnerd/gha-setup-swift@main
with:
branch: swift-5.8-release
tag: 5.8-RELEASE
# windows:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @brianmichel, we've been experiencing flakiness with windows CI and so have been slowly disabling them. Not sure if this is something you want to look into eventually.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @mbrandonw sorry for the delay, we're in burn down mode for getting the first version of the Windows app out to a few folks, I'm not exactly sure what's going on here, but have a personal todo to take a peek once I have more free time.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @brianmichel, no problem at all! We're happy to turn it back on when possible, but definitely not urgent. Thanks for responding!

# name: Windows
# runs-on: windows-latest
# steps:
# - uses: compnerd/gha-setup-swift@main
# with:
# branch: swift-5.8-release
# tag: 5.8-RELEASE

- uses: actions/checkout@v3
- name: Run tests
run: swift test
- name: Run tests (release)
run: swift test -c release
# - uses: actions/checkout@v3
# - name: Run tests
# run: swift test
# - name: Run tests (release)
# run: swift test -c release

static-stdlib:
strategy:
Expand Down
72 changes: 0 additions & 72 deletions .github/workflows/documentation.yml

This file was deleted.

10 changes: 4 additions & 6 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ concurrency:
jobs:
swift_format:
name: swift-format
runs-on: macos-12
runs-on: macos-13
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Xcode Select
run: sudo xcode-select -s /Applications/Xcode_14.0.1.app
- name: Tap
run: brew tap pointfreeco/formulae
run: sudo xcode-select -s /Applications/Xcode_15.0.1.app
- name: Install
run: brew install Formulae/swift-format@5.7
run: brew install swift-format
- name: Format
run: make format
- uses: stefanzweifel/git-auto-commit-action@v4
Expand Down
7 changes: 7 additions & 0 deletions .spi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 1
builder:
configs:
- documentation_targets:
- Dependencies
- DependenciesMacros
swift_version: 5.9
27 changes: 27 additions & 0 deletions Dependencies.xcworkspace/xcshareddata/swiftpm/Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
CONFIG = debug
PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iPhone,iOS-16)
PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS 17,iPhone \d\+ Pro [^M])
PLATFORM_MACOS = macOS
PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,TV,tvOS-16)
PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,Watch,watchOS-9)
PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS 17,TV)
PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS 10,Watch)

default: test

Expand Down Expand Up @@ -31,7 +31,7 @@ test-linux:
--rm \
-v "$(PWD):$(PWD)" \
-w "$(PWD)" \
swift:5.7-focal \
swift:5.9-focal \
bash -c 'apt-get update && apt-get -y install make && make test-swift'

build-for-static-stdlib:
Expand All @@ -54,23 +54,23 @@ build-for-static-stdlib-docker:
@docker run \
-v "$(PWD):$(PWD)" \
-w "$(PWD)" \
swift:5.8-focal \
swift:5.9-focal \
bash -c "swift build -c debug --static-swift-stdlib"
@docker run \
-v "$(PWD):$(PWD)" \
-w "$(PWD)" \
swift:5.8-focal \
swift:5.9-focal \
bash -c "swift build -c release --static-swift-stdlib"

format:
swift format \
--ignore-unparsable-files \
--in-place \
--recursive \
./Package.swift ./Sources ./Tests
./Package.swift ./Sources ./Tests/DependenciesTests

.PHONY: test test-swift test-linux build-for-library-evolution format

define udid_for
$(shell xcrun simctl list --json devices available $(1) | jq -r '.devices | to_entries | map(select(.value | add)) | sort_by(.key) | .[] | select(.key | contains("$(2)")) | .value | last.udid')
$(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }')
endef
27 changes: 27 additions & 0 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading