Skip to content
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.

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

Swift 5.10 #74

Merged
merged 6 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ on:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_15.2.app
DEVELOPER_DIR: /Applications/Xcode_15.4.app

jobs:
publish-docs:
name: Publish Documentation
runs-on: macos-13
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Build docs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_15.2.app
DEVELOPER_DIR: /Applications/Xcode_15.4.app

jobs:
validation:
name: Validation
runs-on: macos-13
runs-on: macos-14
Copy link
Member

Choose a reason for hiding this comment

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

@rasberik
Can you update for Test on macOS job as well?

Copy link
Contributor Author

@rasberik rasberik Dec 2, 2024

Choose a reason for hiding this comment

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

Ahhh Im making same mistakes everywhere. Thanks, updated

steps:
- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.9
// swift-tools-version:5.10

import PackageDescription

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ The generated snapshot images can be used for more advanced visual regression te

## Requirements

- Swift 5.9+
- Xcode 15.2+
- Swift 5.10
- Xcode 15.4
- iOS 13.0+ (PlaybookUI: iOS 15.0+)

---
Expand Down
30 changes: 11 additions & 19 deletions Tools/Package.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"originHash" : "a1f9ea7a19ae6973a83e10ce28f3cf6cf947b4bc1ec106e475e75f804ecfc04b",
"pins" : [
{
"identity" : "aexml",
Expand All @@ -9,15 +10,6 @@
"version" : "4.6.1"
}
},
{
"identity" : "graphviz",
"kind" : "remoteSourceControl",
"location" : "https://github.com/SwiftDocOrg/GraphViz.git",
"state" : {
"revision" : "70bebcf4597b9ce33e19816d6bbd4ba9b7bdf038",
"version" : "0.2.0"
}
},
{
"identity" : "jsonutilities",
"kind" : "remoteSourceControl",
Expand Down Expand Up @@ -75,10 +67,10 @@
{
"identity" : "swift-format",
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-format.git",
"location" : "https://github.com/swiftlang/swift-format.git",
"state" : {
"revision" : "83248b4fa37919f78ffbd4650946759bcc54c2b5",
"version" : "509.0.0"
"revision" : "7996ac678197d293f6c088a1e74bb778b4e10139",
"version" : "510.1.0"
}
},
{
Expand All @@ -95,8 +87,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/apple/swift-syntax.git",
"state" : {
"revision" : "64889f0c732f210a935a0ad7cda38f77f876262d",
"version" : "509.1.1"
"revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82",
"version" : "510.0.3"
}
},
{
Expand All @@ -122,17 +114,17 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/yonaskolb/XcodeGen.git",
"state" : {
"revision" : "9816466703aede482c7436fddc6535684a7a9168",
"version" : "2.40.1"
"revision" : "82c6ab9bbd5b6075fc0887d897733fc0c4ffc9ab",
"version" : "2.42.0"
}
},
{
"identity" : "xcodeproj",
"kind" : "remoteSourceControl",
"location" : "https://github.com/tuist/XcodeProj.git",
"state" : {
"revision" : "6e60fb55271c80f83a186c9b1b4982fd991cfc0a",
"version" : "8.13.0"
"revision" : "447c159b0c5fb047a024fd8d942d4a76cf47dde0",
"version" : "8.16.0"
}
},
{
Expand All @@ -145,5 +137,5 @@
}
}
],
"version" : 2
"version" : 3
}
6 changes: 3 additions & 3 deletions Tools/Package.swift
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// swift-tools-version:5.9
// swift-tools-version:5.10

import PackageDescription

let package = Package(
name: "dev-tools",
dependencies: [
.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"),
.package(url: "https://github.com/swiftlang/swift-format.git", exact: "510.1.0"),
.package(url: "https://github.com/yonaskolb/XcodeGen.git", exact: "2.42.0"),
]
)
Loading