Skip to content

Commit

Permalink
Update CI to run on Xcode 13.4.1 (#437)
Browse files Browse the repository at this point in the history
* Update CI to run on Xcode 13.4.1

* Update SPM format to be compatible with swift-tools-version:5.4

* Pin swift-tools-support-core to 0.2.5

This is due to conflicting macOS version requirements after this release

* Remove .executableTarget since it wasn't added until 5.4
  • Loading branch information
wbond authored Aug 19, 2022
1 parent 7ef56b4 commit 4befad6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,26 @@ on:
branches: [ master ]

env:
DEVELOPER_DIR: /Applications/Xcode_12.5.1.app
DEVELOPER_DIR: /Applications/Xcode_13.4.1.app

jobs:
build:
runs-on: macos-11
runs-on: macos-12
steps:
- uses: actions/checkout@v2
- name: "NeedleFoundationTests"
run: xcodebuild test -project NeedleFoundation.xcodeproj -scheme NeedleFoundation -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
run: xcodebuild test -project NeedleFoundation.xcodeproj -scheme NeedleFoundation -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 11'
- name: "NeedleGeneratorTests"
run: cd Generator && swift test -Xswiftc -DDEBUG
- name: "NeedleGeneratorBinary"
run: cd Generator && swift build -c release
- name: "NeedleSampleMVCApp"
run: xcodebuild build -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
run: xcodebuild build -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 11'
- name: "NeedleSampleMVCTests"
run: xcodebuild test -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeTests -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
run: xcodebuild test -project Sample/MVC/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeTests -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 11'
- name: "NeedleSamplePluginizedApp"
run: xcodebuild build -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
run: xcodebuild build -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToe -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 11'
- name: "NeedleSamplePluginizedScoreSheetTests"
run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme ScoreSheetTests -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme ScoreSheetTests -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 11'
- name: "NeedleSamplePluginizedTicTacToeCoreTests"
run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeCoreTests -destination 'platform=iOS Simulator,OS=14.5,name=iPhone 11'
run: xcodebuild test -project Sample/Pluginized/TicTacToe/TicTacToe.xcodeproj -scheme TicTacToeCoreTests -destination 'platform=iOS Simulator,OS=15.5,name=iPhone 11'
14 changes: 7 additions & 7 deletions Generator/Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ let swiftSyntaxVersion: Version = "0.50200.0"
#endif

var needleDependencies: Array<Target.Dependency> = [
"SwiftToolsSupport-auto",
"Concurrency",
"SourceParsingFramework",
"SwiftSyntax",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
.product(name: "Concurrency", package: "swift-concurrency"),
.product(name: "SourceParsingFramework", package: "swift-common"),
.product(name: "SwiftSyntax", package: "swift-syntax"),
]
#if swift(>=5.6)
needleDependencies.append("SwiftSyntaxParser")
needleDependencies.append(.product(name: "SwiftSyntaxParser", package: "swift-syntax"))
#endif

let package = Package(
Expand All @@ -31,7 +31,7 @@ let package = Package(
.library(name: "NeedleFramework", targets: ["NeedleFramework"])
],
dependencies: [
.package(url: "https://github.com/apple/swift-tools-support-core", .upToNextMajor(from: "0.1.5")),
.package(url: "https://github.com/apple/swift-tools-support-core", .exact("0.2.5")),
.package(url: "https://github.com/uber/swift-concurrency.git", .upToNextMajor(from: "0.6.5")),
.package(url: "https://github.com/uber/swift-common.git", .exact("0.5.0")),
.package(url: "https://github.com/apple/swift-syntax.git", .exact(swiftSyntaxVersion)),
Expand All @@ -51,7 +51,7 @@ let package = Package(
name: "needle",
dependencies: [
"NeedleFramework",
"CommandFramework",
.product(name: "CommandFramework", package: "swift-common")
]),
],
swiftLanguageVersions: [.v5]
Expand Down

0 comments on commit 4befad6

Please sign in to comment.