From 714c0315060e094ead8291ecf03223a0343fdf00 Mon Sep 17 00:00:00 2001 From: Yuuki Nishiyama Date: Wed, 26 Mar 2025 03:26:09 +0900 Subject: [PATCH 1/2] Fix issues of github_actions --- .github/workflows/build.yaml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index ca0898b..092a0ad 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -8,22 +8,22 @@ jobs: runs-on: macos-latest steps: - # - name: Checkout code - # uses: actions/checkout@v3 - - # - name: Install xcpretty - # run: gem install xcpretty - - # - name: Set up Xcode - # run: sudo xcode-select -s /Applications/Xcode.app - - # - name: Cache Derived Data - # uses: actions/cache@v3 - # with: - # path: ~/Library/Developer/Xcode/DerivedData - # key: ${{ runner.os }}-xcode-deriveddata-${{ github.sha }} - # restore-keys: | - # ${{ runner.os }}-xcode-deriveddata- + - name: Checkout code + uses: actions/checkout@v3 + + - name: Install xcpretty + run: gem install xcpretty + + - name: Set up Xcode + run: sudo xcode-select -s /Applications/Xcode.app + + - name: Cache Derived Data + uses: actions/cache@v3 + with: + path: ~/Library/Developer/Xcode/DerivedData + key: ${{ runner.os }}-xcode-deriveddata-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-xcode-deriveddata- - name: Run build run: | From ba87a5c133cd49de0bb27c44a4a2d9e84824e48f Mon Sep 17 00:00:00 2001 From: Yuuki Nishiyama Date: Wed, 26 Mar 2025 03:46:08 +0900 Subject: [PATCH 2/2] Update swift-tools-version: 5.10 -> 6.0 --- Package.resolved | 2 +- Package.swift | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index 0cd63b1..ccca44d 100644 --- a/Package.resolved +++ b/Package.resolved @@ -1,5 +1,5 @@ { - "originHash" : "a52d612ec11907b7a089984417002107831b61d9ff5ca6439ed33ef90a62df4c", + "originHash" : "9c8eba7832b9fa2c09b0da444eab02da13a43f28e2005653cdc8058dc34f7984", "pins" : [ { "identity" : "grdb.swift", diff --git a/Package.swift b/Package.swift index 9d02848..8f7a503 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.10.0 +// swift-tools-version: 6.0 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -14,7 +14,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/SwiftyJSON/SwiftyJSON.git", from: "5.0.2"), - .package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMinor(from: "7.3.0")), + .package(url: "https://github.com/groue/GRDB.swift.git", from: "7.3.0"), .package(url: "https://github.com/ashleymills/Reachability.swift.git", from: "5.2.4") ], targets: [ @@ -30,5 +30,6 @@ let package = Package( name: "com.awareframework.ios.coreTests", dependencies: ["com.awareframework.ios.core"] ) - ] + ], + swiftLanguageModes: [.v5] )