From 4befad6dbaaca8d287de5825b33889cd4ed7ff4c Mon Sep 17 00:00:00 2001 From: Will Bond Date: Fri, 19 Aug 2022 18:11:42 -0400 Subject: [PATCH] Update CI to run on Xcode 13.4.1 (#437) * 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 --- .github/workflows/ci.yml | 16 ++++++++-------- Generator/Package.swift | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 64cdb106..db9a7532 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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' diff --git a/Generator/Package.swift b/Generator/Package.swift index b9bdfcde..f85e6cc4 100644 --- a/Generator/Package.swift +++ b/Generator/Package.swift @@ -15,13 +15,13 @@ let swiftSyntaxVersion: Version = "0.50200.0" #endif var needleDependencies: Array = [ - "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( @@ -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)), @@ -51,7 +51,7 @@ let package = Package( name: "needle", dependencies: [ "NeedleFramework", - "CommandFramework", + .product(name: "CommandFramework", package: "swift-common") ]), ], swiftLanguageVersions: [.v5]