Skip to content

Commit 502d34a

Browse files
authored
Add support for Xcode 15.2.0+ and drop support for lower (#118)
* Update xcode version and packages * Show git diff before fail * Re-add Package.resolved
1 parent 7dc2744 commit 502d34a

File tree

8 files changed

+42
-42
lines changed

8 files changed

+42
-42
lines changed

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99

1010
env:
11-
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app
11+
DEVELOPER_DIR: /Applications/Xcode_15.2.app
1212

1313
jobs:
1414
publish-docs:

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
workflow_dispatch:
1111

1212
env:
13-
DEVELOPER_DIR: /Applications/Xcode_14.3.1.app
13+
DEVELOPER_DIR: /Applications/Xcode_15.2.app
1414

1515
jobs:
1616
test:
@@ -57,8 +57,8 @@ jobs:
5757
- name: Validate format
5858
run: |
5959
make format
60-
if [ -n "$(git status --porcelain)" ]; then echo "Make sure that the code is formated by 'make format'."; exit 1; fi
60+
if [ -n "$(git status --porcelain)" ]; then git diff --name-only && echo "Make sure that the code is formated by 'make format'."; exit 1; fi
6161
- name: Validate example project
6262
run: |
6363
make proj
64-
if [ -n "$(git status --porcelain)" ]; then echo "Make sure that 'Examples/App.xcodeproj' is formated by 'make proj'."; exit 1; fi
64+
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

Examples/App.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
7700279A8EA052C81A41C049 /* CrossPlatform */,
7878
A62E7924E6736516B102BF53 /* iOS */,
7979
);
80-
name = Packages;
81-
sourceTree = SOURCE_ROOT;
80+
path = Packages;
81+
sourceTree = "<group>";
8282
};
8383
E9C3DB3EC6D7655028A9C0D3 /* Products */ = {
8484
isa = PBXGroup;

Examples/Packages/CrossPlatform/Sources/ExampleTodo/Views.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ struct TodoCreator: View {
6262
HStack {
6363
TextField("Enter your todo", text: $text)
6464

65-
#if os(iOS) || os(macOS)
66-
.textFieldStyle(.roundedBorder)
67-
#endif
65+
#if os(iOS) || os(macOS)
66+
.textFieldStyle(.roundedBorder)
67+
#endif
6868

6969
Button("Add", action: addTodo)
7070
.disabled(text.isEmpty)

Package.resolved

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ let package = Package(
2727
if ProcessInfo.processInfo.environment["SWIFTUI_ATOM_PROPERTIES_DEVELOPMENT"] != nil {
2828
package.dependencies.append(contentsOf: [
2929
.package(url: "https://github.com/apple/swift-docc-plugin", exact: "1.3.0"),
30-
.package(url: "https://github.com/apple/swift-format.git", exact: "508.0.1"),
31-
.package(url: "https://github.com/yonaskolb/XcodeGen.git", exact: "2.37.0"),
30+
.package(url: "https://github.com/apple/swift-format.git", exact: "509.0.0"),
31+
.package(url: "https://github.com/yonaskolb/XcodeGen.git", exact: "2.40.1"),
3232
])
3333
}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ Open `Examples/App.xcodeproj` and play around with it!
127127

128128
| |Minimum Version|
129129
|------:|--------------:|
130-
|Swift |5.8.1 |
131-
|Xcode |14.3.1 |
130+
|Swift |5.9 |
131+
|Xcode |15.2 |
132132
|iOS |14.0 |
133133
|macOS |11.0 |
134134
|tvOS |14.0 |

scripts/test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pushd "$(cd $(dirname $0)/.. && pwd)" &>/dev/null
99

1010
case $PLATFORM in
1111
ios)
12-
platform="iOS Simulator,name=iPhone 14 Pro"
12+
platform="iOS Simulator,name=iPhone 15 Pro"
1313
;;
1414
macos)
1515
platform="macOS"
@@ -18,7 +18,7 @@ tvos)
1818
platform="tvOS Simulator,name=Apple TV 4K (3rd generation)"
1919
;;
2020
watchos)
21-
platform="watchOS Simulator,name=Apple Watch Ultra (49mm)"
21+
platform="watchOS Simulator,name=Apple Watch Ultra 2 (49mm)"
2222
;;
2323
esac
2424

0 commit comments

Comments
 (0)