Skip to content

Commit

Permalink
⚠️ Fix Xcode 16 Warnings (#432)
Browse files Browse the repository at this point in the history
  • Loading branch information
swiftyfinch authored Jan 18, 2025
1 parent 5b00ba7 commit 400874f
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 22 deletions.
27 changes: 14 additions & 13 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,22 @@ on:
jobs:
swiftformat:
name: SwiftFormat
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- run: swiftformat . --lint --quiet --reporter github-actions-log

swiftlint:
name: SwiftLint
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- run: brew install swiftlint
- run: swiftlint --strict --quiet --reporter github-actions-logging

install:
name: Install Script
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- name: Install Rugby
Expand All @@ -35,7 +36,7 @@ jobs:

release:
name: Build Binary
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
Expand All @@ -48,7 +49,7 @@ jobs:

unit-tests:
name: Unit Tests
runs-on: macos-13
runs-on: macos-15
env:
LCOV_PATH: .build/artifacts/info.lcov
BUILD_FOLDER: .build/debug/RugbyPackageTests.xctest/Contents/MacOS/RugbyPackageTests
Expand Down Expand Up @@ -90,7 +91,7 @@ jobs:
smoke-build-frameworks:
name: Smoke Build (Frameworks)
needs: unit-tests
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
Expand Down Expand Up @@ -124,7 +125,7 @@ jobs:
-workspace Example.xcworkspace \
-scheme ExampleFrameworks \
-testPlan ExampleFrameworks \
-destination 'platform=iOS Simulator,name=iPhone 14' \
-destination 'platform=iOS Simulator,name=iPhone 16' \
COMPILER_INDEX_STORE_ENABLE=NO \
SWIFT_COMPILATION_MODE=wholemodule \
CODE_SIGNING_ALLOWED=NO \
Expand All @@ -133,7 +134,7 @@ jobs:
smoke-build-libs:
name: Smoke Build (Libraries)
needs: unit-tests
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
Expand Down Expand Up @@ -162,7 +163,7 @@ jobs:
-workspace Example.xcworkspace \
-scheme ExampleLibs \
-testPlan ExampleLibs \
-destination 'platform=iOS Simulator,name=iPhone 14' \
-destination 'platform=iOS Simulator,name=iPhone 16' \
COMPILER_INDEX_STORE_ENABLE=NO \
SWIFT_COMPILATION_MODE=wholemodule \
CODE_SIGNING_ALLOWED=NO \
Expand All @@ -171,7 +172,7 @@ jobs:
smoke-test-multiproj:
name: Smoke Test (Multiproj)
needs: unit-tests
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
Expand All @@ -193,13 +194,13 @@ jobs:
working-directory: ./Example
run: |
rugby _test --targets-as-regex framework \
--simulator-name 'iPhone 14' \
--simulator-name 'iPhone 16' \
--testplan-template-path ExampleFrameworks
smoke-test:
name: Smoke Test (Frameworks)
needs: unit-tests
runs-on: macos-13
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: actions/download-artifact@v4
Expand All @@ -221,5 +222,5 @@ jobs:
working-directory: ./Example
run: |
rugby _test --targets-as-regex framework \
--simulator-name 'iPhone 14' \
--simulator-name 'iPhone 16' \
--testplan-template-path ExampleFrameworks
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:

jobs:
bump:
runs-on: macos-13
runs-on: macos-15
steps:
# Checkout with custom token for pushin to protected branch
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions Example/Tests/cache_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -o pipefail && env NSUnbufferedIO=YES arch -arm64 xcodebuild test \
-workspace Example.xcworkspace \
-scheme ExampleFrameworks \
-testPlan ExampleFrameworks \
-destination "platform=iOS Simulator,name=iPhone 15" \
-destination "platform=iOS Simulator,name=iPhone 16" \
COMPILER_INDEX_STORE_ENABLE=NO \
SWIFT_COMPILATION_MODE=wholemodule \
CODE_SIGNING_ALLOWED=NO \
Expand All @@ -28,7 +28,7 @@ set -o pipefail && env NSUnbufferedIO=YES arch -arm64 xcodebuild test \
-workspace Example.xcworkspace \
-scheme ExampleLibs \
-testPlan ExampleLibs \
-destination "platform=iOS Simulator,name=iPhone 15" \
-destination "platform=iOS Simulator,name=iPhone 16" \
COMPILER_INDEX_STORE_ENABLE=NO \
SWIFT_COMPILATION_MODE=wholemodule \
CODE_SIGNING_ALLOWED=NO \
Expand Down
2 changes: 1 addition & 1 deletion Example/Tests/cache_tests_multiproj.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ MULTIPLE_PROJECTS=true pod install --repo-update

header "Rugby Test"
rugby _test -g framework \
-n 'iPhone 15' \
-n 'iPhone 16' \
-p ExampleFrameworks \
--output multiline
4 changes: 2 additions & 2 deletions Sources/Rugby/Commands/Basic/Build/BuildOptions.swift
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import ArgumentParser
import RugbyFoundation

extension SDK: ExpressibleByArgument {}
extension Architecture: ExpressibleByArgument {}
extension SDK: @retroactive ExpressibleByArgument {}
extension Architecture: @retroactive ExpressibleByArgument {}

struct BuildOptions: AsyncParsableCommand {
@Option(name: .shortAndLong, help: "Build SDK: sim or ios.")
Expand Down
3 changes: 2 additions & 1 deletion Sources/Rugby/Commands/Basic/Warmup.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import Fish
import Foundation
import RugbyFoundation

extension ArchiveType: ExpressibleByArgument {}
extension ArchiveType: @retroactive ExpressibleByArgument {}

struct Warmup: AsyncParsableCommand {
static var configuration = CommandConfiguration(
commandName: "warmup",
Expand Down
4 changes: 2 additions & 2 deletions Sources/Rugby/Utils/Logger/Printers/ProgressPrinter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ final actor ProgressPrinter {
private let timeInterval: TimeInterval = 0.125

// Dependencies
private let printer: Printer
private nonisolated let printer: Printer
private let timerTaskFactory: ITimerTaskFactory
private let clock: IClock
private nonisolated let clock: IClock

// Variables
private var timerTask: ITimerTask?
Expand Down

0 comments on commit 400874f

Please sign in to comment.