From 29b5f60d0ad6c222998930dbc04c33ad8c772c22 Mon Sep 17 00:00:00 2001 From: Leif Date: Thu, 2 Nov 2023 19:44:35 -0600 Subject: [PATCH] Reduce Swift version --- .github/workflows/docc.yml | 5 +---- .github/workflows/macOS.yml | 6 +----- Package.swift | 10 +++++----- Sources/AppState/Application+internal.swift | 4 ++-- Sources/AppState/Application+public.swift | 8 ++++---- 5 files changed, 13 insertions(+), 20 deletions(-) diff --git a/.github/workflows/docc.yml b/.github/workflows/docc.yml index ddd91c4..b9d19e2 100644 --- a/.github/workflows/docc.yml +++ b/.github/workflows/docc.yml @@ -14,13 +14,10 @@ jobs: environment: name: github-pages url: ${{ steps.deployment.outputs.page_url }} - runs-on: macos-13 + runs-on: macos-12 steps: - name: git checkout uses: actions/checkout@v3 - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: latest-stable - name: docbuild run: | xcodebuild docbuild -scheme AppState \ diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index d655f3e..f474908 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -9,13 +9,9 @@ on: jobs: build: - runs-on: macos-13 + runs-on: macos-latest steps: - - uses: swift-actions/setup-swift@v1 - - uses: maxim-lobanov/setup-xcode@v1 - with: - xcode-version: latest-stable - uses: actions/checkout@v3 - name: Build run: swift build -v diff --git a/Package.swift b/Package.swift index 7787ad2..86c3879 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.9 +// swift-tools-version: 5.7 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -6,10 +6,10 @@ import PackageDescription let package = Package( name: "AppState", platforms: [ - .iOS(.v17), - .watchOS(.v10), - .macOS(.v14), - .tvOS(.v17) + .iOS(.v16), + .watchOS(.v9), + .macOS(.v13), + .tvOS(.v16) ], products: [ // Products define the executables and libraries a package produces, making them visible to other packages. diff --git a/Sources/AppState/Application+internal.swift b/Sources/AppState/Application+internal.swift index b23d85c..4f44936 100644 --- a/Sources/AppState/Application+internal.swift +++ b/Sources/AppState/Application+internal.swift @@ -2,8 +2,8 @@ extension Application { static func codeID( fileID: StaticString, function: StaticString, - line: StaticBigInt, - column: StaticBigInt + line: Int, + column: Int ) -> String { "\(fileID)[\(function)@\(line)|\(column)]" } diff --git a/Sources/AppState/Application+public.swift b/Sources/AppState/Application+public.swift index 50c3e1a..9d28cfd 100644 --- a/Sources/AppState/Application+public.swift +++ b/Sources/AppState/Application+public.swift @@ -39,8 +39,8 @@ public extension Application { initial: @autoclosure () -> Value, _ fileID: StaticString = #fileID, _ function: StaticString = #function, - _ line: StaticBigInt = #line, - _ column: StaticBigInt = #column + _ line: Int = #line, + _ column: Int = #column ) -> State { state( initial: initial(), @@ -74,8 +74,8 @@ public extension Application { _ object: @autoclosure () -> Value, _ fileID: StaticString = #fileID, _ function: StaticString = #function, - _ line: StaticBigInt = #line, - _ column: StaticBigInt = #column + _ line: Int = #line, + _ column: Int = #column ) -> Value { dependency( object(),