From 400874ff171d2112db843f44040ef0453e5ae7d3 Mon Sep 17 00:00:00 2001 From: Vyacheslav Khorkov Date: Sat, 18 Jan 2025 13:59:47 +0500 Subject: [PATCH] =?UTF-8?q?=E2=9A=A0=EF=B8=8F=20Fix=20Xcode=2016=20Warning?= =?UTF-8?q?s=20(#432)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Use @retroactive to silent warning https://github.com/swiftlang/swift-evolution/blob/main/proposals/0364-retroactive-conformance-warning.md * Fix warning with nonisolated context https://github.com/swiftlang/swift-evolution/blob/main/proposals/0306-actors.md --- .github/workflows/checks.yml | 27 ++++++++++--------- .github/workflows/release.yml | 2 +- Example/Tests/cache_tests.sh | 4 +-- Example/Tests/cache_tests_multiproj.sh | 2 +- .../Commands/Basic/Build/BuildOptions.swift | 4 +-- Sources/Rugby/Commands/Basic/Warmup.swift | 3 ++- .../Logger/Printers/ProgressPrinter.swift | 4 +-- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index df03edaf..908a4351 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 \ @@ -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 @@ -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 \ @@ -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 @@ -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 @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 500ec24c..eac35499 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/Example/Tests/cache_tests.sh b/Example/Tests/cache_tests.sh index 3a4e60ee..53f45e55 100755 --- a/Example/Tests/cache_tests.sh +++ b/Example/Tests/cache_tests.sh @@ -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 \ @@ -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 \ diff --git a/Example/Tests/cache_tests_multiproj.sh b/Example/Tests/cache_tests_multiproj.sh index 0eb6d04a..80d5bfbf 100755 --- a/Example/Tests/cache_tests_multiproj.sh +++ b/Example/Tests/cache_tests_multiproj.sh @@ -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 diff --git a/Sources/Rugby/Commands/Basic/Build/BuildOptions.swift b/Sources/Rugby/Commands/Basic/Build/BuildOptions.swift index dad096da..c8e46ad3 100644 --- a/Sources/Rugby/Commands/Basic/Build/BuildOptions.swift +++ b/Sources/Rugby/Commands/Basic/Build/BuildOptions.swift @@ -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.") diff --git a/Sources/Rugby/Commands/Basic/Warmup.swift b/Sources/Rugby/Commands/Basic/Warmup.swift index 7b613d96..94b85228 100644 --- a/Sources/Rugby/Commands/Basic/Warmup.swift +++ b/Sources/Rugby/Commands/Basic/Warmup.swift @@ -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", diff --git a/Sources/Rugby/Utils/Logger/Printers/ProgressPrinter.swift b/Sources/Rugby/Utils/Logger/Printers/ProgressPrinter.swift index 161646bf..b1d95dfc 100644 --- a/Sources/Rugby/Utils/Logger/Printers/ProgressPrinter.swift +++ b/Sources/Rugby/Utils/Logger/Printers/ProgressPrinter.swift @@ -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?