From 65892e9cfd679ae45cdd07e20bb50e3c93e08e5c Mon Sep 17 00:00:00 2001 From: WindowsMEMZ <45706356+WindowsMEMZ@users.noreply.github.com> Date: Sun, 19 Nov 2023 05:40:31 +0800 Subject: [PATCH 1/7] Update Package.swift --- Package.swift | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Package.swift b/Package.swift index e6ceaae..2b6e8ec 100644 --- a/Package.swift +++ b/Package.swift @@ -15,18 +15,14 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/Alamofire/Alamofire", exact: "5.5.0"), - .package(url: "https://github.com/SwiftyJSON/SwiftyJSON", from: "4.0.0"), - .package(url: "https://github.com/Kitura/Swift-JWT", from: "4.0.1"), - .package(url: "https://github.com/malcommac/SwiftDate", from: "7.0.0") + .package(url: "https://github.com/SwiftyJSON/SwiftyJSON", from: "4.0.0") ], targets: [ .target( name: "DarockKit", dependencies: [ "Alamofire", - "SwiftyJSON", - //"SwiftJWT", - "SwiftDate" + "SwiftyJSON" ] ) ] From 0227c584a2db0b524d78e6d92a7e7dab3d21c492 Mon Sep 17 00:00:00 2001 From: WindowsMEMZ <45706356+WindowsMEMZ@users.noreply.github.com> Date: Sun, 19 Nov 2023 05:49:21 +0800 Subject: [PATCH 2/7] Update swift.yml --- .github/workflows/swift.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 13dc401..8071cf2 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -11,10 +11,14 @@ on: jobs: build: - - runs-on: macos-latest + runs-on: macos-13 steps: - uses: actions/checkout@v3 - - name: Build - run: swift build -v + + - name: Set Xcode Version + run: sudo xcode-select -s /Applications/Xcode_15.0.app + + - name: Archive + run: xcodebuild archive -scheme DarockKit -destination "generic/platform=iOS" -archivePath "./DarockKit" + From b3b514898119320d1381e2e108382bf57ccfbdbb Mon Sep 17 00:00:00 2001 From: WindowsMEMZ <45706356+WindowsMEMZ@users.noreply.github.com> Date: Sun, 19 Nov 2023 05:59:00 +0800 Subject: [PATCH 3/7] Update swift.yml --- .github/workflows/swift.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 8071cf2..c75273d 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -12,7 +12,9 @@ on: jobs: build: runs-on: macos-13 - + strategy: + matrix: + configuration: [iOS, watchOS, macOS] steps: - uses: actions/checkout@v3 @@ -20,5 +22,13 @@ jobs: run: sudo xcode-select -s /Applications/Xcode_15.0.app - name: Archive - run: xcodebuild archive -scheme DarockKit -destination "generic/platform=iOS" -archivePath "./DarockKit" + env: + deOs: ${{ matrix.configuration }} + run: xcodebuild archive -scheme DarockKit -destination "generic/platform=$env:deOs" -archivePath "./DarockKit-$env:deOs" + - name: Upload Archive + uses: actions/upload-artifact@v3 + with: + name: DarockKit-${{ matrix.configuration }} + path: ./DarockKit-${{ matrix.configuration }} + From f30818650f71278fb04a3159948951b8e7ab2834 Mon Sep 17 00:00:00 2001 From: WindowsMEMZ <45706356+WindowsMEMZ@users.noreply.github.com> Date: Sun, 19 Nov 2023 06:07:33 +0800 Subject: [PATCH 4/7] Update swift.yml --- .github/workflows/swift.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index c75273d..8403c90 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -23,9 +23,9 @@ jobs: - name: Archive env: - deOs: ${{ matrix.configuration }} - run: xcodebuild archive -scheme DarockKit -destination "generic/platform=$env:deOs" -archivePath "./DarockKit-$env:deOs" - + deOs: ${{ matrix.configuration }} + run: xcodebuild archive -scheme DarockKit -destination "generic/platform=${{ env.deOs }}" -archivePath "./DarockKit-${{ env.deOs }}" + - name: Upload Archive uses: actions/upload-artifact@v3 with: From 10b5d58b152ceec48cab2a6556c568d52816defe Mon Sep 17 00:00:00 2001 From: WindowsMEMZ <45706356+WindowsMEMZ@users.noreply.github.com> Date: Sun, 19 Nov 2023 06:16:48 +0800 Subject: [PATCH 5/7] Update swift.yml --- .github/workflows/swift.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml index 8403c90..4c9958a 100644 --- a/.github/workflows/swift.yml +++ b/.github/workflows/swift.yml @@ -14,7 +14,7 @@ jobs: runs-on: macos-13 strategy: matrix: - configuration: [iOS, watchOS, macOS] + configuration: [iOS, watchOS] steps: - uses: actions/checkout@v3 From ff01753e35c4b0a2d2ea0bb313c9d0cb88622146 Mon Sep 17 00:00:00 2001 From: Mark Chan <45706356+WindowsMEMZ@users.noreply.github.com> Date: Sat, 9 Dec 2023 15:39:33 +0800 Subject: [PATCH 6/7] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index 2b6e8ec..babbb44 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.7 +// swift-tools-version: 5.5 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription From eee2eb242a2008d628990cbdaf7ee27b400df2d9 Mon Sep 17 00:00:00 2001 From: Mark Chan <45706356+WindowsMEMZ@users.noreply.github.com> Date: Sat, 9 Dec 2023 15:49:04 +0800 Subject: [PATCH 7/7] Update Package.swift --- Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.swift b/Package.swift index babbb44..39bbb30 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.5 +// swift-tools-version: 5.6 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription