Skip to content

Add support for Xcode 15.2.0+ and drop support for lower #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Add support for Xcode 15.2.0+ and drop support for lower #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05d539b
Update xcode version and packages
ra1028 Apr 22, 2024
39c277d
Show git diff before fail
ra1028 Apr 22, 2024
5831564
Re-add Package.resolved
ra1028 Apr 22, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app
DEVELOPER_DIR: /Applications/Xcode_15.2.app

jobs:
publish-docs:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app
DEVELOPER_DIR: /Applications/Xcode_15.2.app

jobs:
test:
Expand Down Expand Up @@ -57,8 +57,8 @@ jobs:
- name: Validate format
run: |
make format
if [ -n "$(git status --porcelain)" ]; then echo "Make sure that the code is formated by 'make format'."; exit 1; fi
if [ -n "$(git status --porcelain)" ]; then git diff --name-only && echo "Make sure that the code is formated by 'make format'."; exit 1; fi
- name: Validate example project
run: |
make proj
if [ -n "$(git status --porcelain)" ]; then echo "Make sure that 'Examples/App.xcodeproj' is formated by 'make proj'."; exit 1; fi
if [ -n "$(git status --porcelain)" ]; then git diff --name-only && echo "Make sure that 'Examples/App.xcodeproj' is formated by 'make proj'."; exit 1; fi
4 changes: 2 additions & 2 deletions Examples/App.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@
7700279A8EA052C81A41C049 /* CrossPlatform */,
A62E7924E6736516B102BF53 /* iOS */,
);
name = Packages;
sourceTree = SOURCE_ROOT;
path = Packages;
sourceTree = "<group>";
};
E9C3DB3EC6D7655028A9C0D3 /* Products */ = {
isa = PBXGroup;
Expand Down
6 changes: 3 additions & 3 deletions Examples/Packages/CrossPlatform/Sources/ExampleTodo/Views.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ struct TodoCreator: View {
HStack {
TextField("Enter your todo", text: $text)

#if os(iOS) || os(macOS)
.textFieldStyle(.roundedBorder)
#endif
#if os(iOS) || os(macOS)
.textFieldStyle(.roundedBorder)
#endif

Button("Add", action: addTodo)
.disabled(text.isEmpty)
Expand Down
54 changes: 27 additions & 27 deletions Package.resolved
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ let package = Package(
if ProcessInfo.processInfo.environment["SWIFTUI_ATOM_PROPERTIES_DEVELOPMENT"] != nil {
package.dependencies.append(contentsOf: [
.package(url: "https://github.com/apple/swift-docc-plugin", exact: "1.3.0"),
.package(url: "https://github.com/apple/swift-format.git", exact: "508.0.1"),
.package(url: "https://github.com/yonaskolb/XcodeGen.git", exact: "2.37.0"),
.package(url: "https://github.com/apple/swift-format.git", exact: "509.0.0"),
.package(url: "https://github.com/yonaskolb/XcodeGen.git", exact: "2.40.1"),
])
}
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ Open `Examples/App.xcodeproj` and play around with it!

| |Minimum Version|
|------:|--------------:|
|Swift |5.8.1 |
|Xcode |14.3.1 |
|Swift |5.9 |
|Xcode |15.2 |
|iOS |14.0 |
|macOS |11.0 |
|tvOS |14.0 |
Expand Down
4 changes: 2 additions & 2 deletions scripts/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pushd "$(cd $(dirname $0)/.. && pwd)" &>/dev/null

case $PLATFORM in
ios)
platform="iOS Simulator,name=iPhone 14 Pro"
platform="iOS Simulator,name=iPhone 15 Pro"
;;
macos)
platform="macOS"
Expand All @@ -18,7 +18,7 @@ tvos)
platform="tvOS Simulator,name=Apple TV 4K (3rd generation)"
;;
watchos)
platform="watchOS Simulator,name=Apple Watch Ultra (49mm)"
platform="watchOS Simulator,name=Apple Watch Ultra 2 (49mm)"
;;
esac

Expand Down