From bd4a038db8d108b64aec62e0825e2d4e8be0f568 Mon Sep 17 00:00:00 2001 From: Fumiya Tanaka Date: Mon, 23 Sep 2024 18:52:54 +0900 Subject: [PATCH] Update swift version to 5.10 (#57) * chore: Update swift version to 5.10 * chore: Update xcode version on CI --- .github/workflows/builder.yml | 6 +- .github/workflows/command.yml | 4 +- .github/workflows/lib.yml | 6 +- .gitignore | 4 +- .../xcshareddata/swiftpm/Package.resolved | 61 ++++++++-------- Package.resolved | 70 +++++++++++-------- Package.swift | 8 +-- 7 files changed, 84 insertions(+), 75 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 979cd0b..11bcdb8 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Build CsvBuilder" - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - uses: maxim-lobanov/setup-xcode@v1 @@ -25,12 +25,12 @@ jobs: set -o pipefail && \ xcodebuild -scheme CsvBuilder \ clean build test \ - -destination 'platform=OS X,arch=x86_64' \ + -destination 'platform=OS X,arch=arm64' \ | xcbeautify - name: Build and Test (iOS) run: | set -o pipefail && \ xcodebuild -scheme CsvBuilder \ clean build test \ - -destination 'platform=iOS Simulator,name=iPhone 13' \ + -destination 'platform=iOS Simulator,name=iPhone 15' \ | xcbeautify diff --git a/.github/workflows/command.yml b/.github/workflows/command.yml index 41d2100..4de4daf 100644 --- a/.github/workflows/command.yml +++ b/.github/workflows/command.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Build Csv2ImgCmd" - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - uses: maxim-lobanov/setup-xcode@v1 @@ -25,5 +25,5 @@ jobs: set -o pipefail && \ xcodebuild -scheme Csv2ImgCmd \ clean build test \ - -destination 'platform=OS X,arch=x86_64' \ + -destination 'platform=OS X,arch=arm64' \ | xcbeautify diff --git a/.github/workflows/lib.yml b/.github/workflows/lib.yml index 2382b26..be59f5d 100644 --- a/.github/workflows/lib.yml +++ b/.github/workflows/lib.yml @@ -12,7 +12,7 @@ on: jobs: test: name: "Build Csv2Img" - runs-on: macos-13 + runs-on: macos-14 steps: - uses: actions/checkout@v3 - uses: maxim-lobanov/setup-xcode@v1 @@ -25,12 +25,12 @@ jobs: set -o pipefail && \ xcodebuild -scheme Csv2Img \ clean build test \ - -destination 'platform=OS X,arch=x86_64' \ + -destination 'platform=OS X,arch=arm64' \ | xcbeautify - name: Build and Test (iOS) run: | set -o pipefail && \ xcodebuild -scheme Csv2Img \ clean build test \ - -destination 'platform=iOS Simulator,name=iPhone 13' \ + -destination 'platform=iOS Simulator,name=iPhone 15' \ | xcbeautify diff --git a/.gitignore b/.gitignore index 5e3c991..de1722a 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ xcuserdata/ DerivedData/ .netrc -.vscode \ No newline at end of file +.vscode + +.index-build/ \ No newline at end of file diff --git a/Csv2ImageApp/Csv2ImageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Csv2ImageApp/Csv2ImageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4285a54..a9a578f 100644 --- a/Csv2ImageApp/Csv2ImageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Csv2ImageApp/Csv2ImageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -1,34 +1,33 @@ { - "object": { - "pins": [ - { - "package": "swift-argument-parser", - "repositoryURL": "https://github.com/apple/swift-argument-parser", - "state": { - "branch": null, - "revision": "f3c9084a71ef4376f2fabbdf1d3d90a49f1fabdb", - "version": "1.1.2" - } - }, - { - "package": "SwiftDocCPlugin", - "repositoryURL": "https://github.com/apple/swift-docc-plugin", - "state": { - "branch": null, - "revision": "3303b164430d9a7055ba484c8ead67a52f7b74f6", - "version": "1.0.0" - } - }, - { - "package": "swift-syntax", - "repositoryURL": "https://github.com/apple/swift-syntax", - "state": { - "branch": null, - "revision": "6ad4ea24b01559dde0773e3d091f1b9e36175036", - "version": "509.0.2" - } + "originHash" : "b5a609958d4527ce07000982912bd4609927f45277d7cb706c744970b7051f59", + "pins" : [ + { + "identity" : "swift-argument-parser", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-argument-parser", + "state" : { + "revision" : "f3c9084a71ef4376f2fabbdf1d3d90a49f1fabdb", + "version" : "1.1.2" } - ] - }, - "version": 1 + }, + { + "identity" : "swift-docc-plugin", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-docc-plugin", + "state" : { + "revision" : "3303b164430d9a7055ba484c8ead67a52f7b74f6", + "version" : "1.0.0" + } + }, + { + "identity" : "swift-syntax", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-syntax", + "state" : { + "revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82", + "version" : "510.0.3" + } + } + ], + "version" : 3 } diff --git a/Package.resolved b/Package.resolved index 985385d..9805ed2 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,34 +1,42 @@ { - "object": { - "pins": [ - { - "package": "swift-argument-parser", - "repositoryURL": "https://github.com/apple/swift-argument-parser", - "state": { - "branch": null, - "revision": "f3c9084a71ef4376f2fabbdf1d3d90a49f1fabdb", - "version": "1.1.2" - } - }, - { - "package": "SwiftDocCPlugin", - "repositoryURL": "https://github.com/apple/swift-docc-plugin.git", - "state": { - "branch": null, - "revision": "3303b164430d9a7055ba484c8ead67a52f7b74f6", - "version": "1.0.0" - } - }, - { - "package": "SwiftSyntax", - "repositoryURL": "https://github.com/apple/swift-syntax", - "state": { - "branch": null, - "revision": "6ad4ea24b01559dde0773e3d091f1b9e36175036", - "version": "509.0.2" - } + "originHash" : "b5a609958d4527ce07000982912bd4609927f45277d7cb706c744970b7051f59", + "pins" : [ + { + "identity" : "swift-argument-parser", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-argument-parser", + "state" : { + "revision" : "f3c9084a71ef4376f2fabbdf1d3d90a49f1fabdb", + "version" : "1.1.2" } - ] - }, - "version": 1 + }, + { + "identity" : "swift-docc-plugin", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-docc-plugin", + "state" : { + "revision" : "85e4bb4e1cd62cec64a4b8e769dcefdf0c5b9d64", + "version" : "1.4.3" + } + }, + { + "identity" : "swift-docc-symbolkit", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-docc-symbolkit", + "state" : { + "revision" : "b45d1f2ed151d057b54504d653e0da5552844e34", + "version" : "1.0.0" + } + }, + { + "identity" : "swift-syntax", + "kind" : "remoteSourceControl", + "location" : "https://github.com/swiftlang/swift-syntax", + "state" : { + "revision" : "2bc86522d115234d1f588efe2bcb4ce4be8f8b82", + "version" : "510.0.3" + } + } + ], + "version" : 3 } diff --git a/Package.swift b/Package.swift index 5dc5d99..0951ac3 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.5 +// swift-tools-version: 5.10 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -8,11 +8,11 @@ let argumentParser: PackageDescription.Package.Dependency = .package( .upToNextMinor(from: "1.1.0") ) let docc: PackageDescription.Package.Dependency = .package( - url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0" + url: "https://github.com/swiftlang/swift-docc-plugin", from: "1.0.0" ) let swiftSyntax = PackageDescription.Package.Dependency.package( - url: "https://github.com/apple/swift-syntax", - from: "509.0.2" + url: "https://github.com/swiftlang/swift-syntax", + from: "510.0.0" ) let package = Package(