From 9fa9217f83a5b5ee79a6a6e29093cdd0327566e7 Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Mon, 12 May 2025 15:28:59 +0200 Subject: [PATCH 1/6] Prepare for 2.0.0 release --- .github/workflows/test.yml | 3 +++ .swift-format | 2 +- Package.swift | 9 ++++++--- README.md | 2 +- Sources/ImperialShopify/URL+Shopify.swift | 1 + Tests/ImperialTests/ImperialTests.swift | 2 ++ Tests/ImperialTests/ShopifyTests.swift | 2 ++ Tests/ImperialTests/withApp.swift | 2 ++ 8 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7e451d25..763f2bca 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,5 +11,8 @@ jobs: uses: vapor/ci/.github/workflows/run-unit-tests.yml@main with: with_linting: true + with_musl: true + with_android: true + ios_scheme_name: Imperial secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/.swift-format b/.swift-format index 47901d18..980417b5 100644 --- a/.swift-format +++ b/.swift-format @@ -5,7 +5,7 @@ "indentation": { "spaces": 4 }, - "indentConditionalCompilationBlocks": true, + "indentConditionalCompilationBlocks": false, "indentSwitchCaseLabels": false, "lineBreakAroundMultilineExpressionChainComponents": false, "lineBreakBeforeControlFlowKeywords": false, diff --git a/Package.swift b/Package.swift index 67391756..d853038c 100755 --- a/Package.swift +++ b/Package.swift @@ -4,7 +4,10 @@ import PackageDescription let package = Package( name: "Imperial", platforms: [ - .macOS(.v13) + .macOS(.v13), + .iOS(.v16), + .tvOS(.v16), + .watchOS(.v9), ], products: [ .library(name: "ImperialCore", targets: ["ImperialCore"]), @@ -42,8 +45,8 @@ let package = Package( ), ], dependencies: [ - .package(url: "https://github.com/vapor/vapor.git", from: "4.110.1"), - .package(url: "https://github.com/vapor/jwt-kit.git", from: "5.1.1"), + .package(url: "https://github.com/vapor/vapor.git", from: "4.114.1"), + .package(url: "https://github.com/vapor/jwt-kit.git", from: "5.1.2"), ], targets: [ .target( diff --git a/README.md b/README.md index 09b40434..2f79764f 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Use the SPM string to easily include the dependendency in your `Package.swift` file ```swift -.package(url: "https://github.com/vapor-community/Imperial.git", from: "2.0.0-beta.2") +.package(url: "https://github.com/vapor-community/Imperial.git", from: "2.0.0") ``` and then add the desired provider to your target's dependencies: diff --git a/Sources/ImperialShopify/URL+Shopify.swift b/Sources/ImperialShopify/URL+Shopify.swift index 11050f9f..0b81bab8 100644 --- a/Sources/ImperialShopify/URL+Shopify.swift +++ b/Sources/ImperialShopify/URL+Shopify.swift @@ -1,5 +1,6 @@ import Crypto import Foundation +import Vapor extension URL { func generateHMAC(key: String) -> String { diff --git a/Tests/ImperialTests/ImperialTests.swift b/Tests/ImperialTests/ImperialTests.swift index c352b6fd..85e7bf90 100644 --- a/Tests/ImperialTests/ImperialTests.swift +++ b/Tests/ImperialTests/ImperialTests.swift @@ -1,3 +1,4 @@ +#if canImport(Testing) import ImperialAuth0 import ImperialDeviantArt import ImperialDiscord @@ -295,3 +296,4 @@ struct ImperialTests { #expect(ImperialError.missingEnvVar("foo") == ImperialError.missingEnvVar("bar")) } } +#endif // canImport(Testing) diff --git a/Tests/ImperialTests/ShopifyTests.swift b/Tests/ImperialTests/ShopifyTests.swift index f26ab057..8722d048 100644 --- a/Tests/ImperialTests/ShopifyTests.swift +++ b/Tests/ImperialTests/ShopifyTests.swift @@ -1,3 +1,4 @@ +#if canImport(Testing) import Foundation import Testing import VaporTesting @@ -71,3 +72,4 @@ struct ShopifyTests { #expect(hmac == "700e2dadb827fcc8609e9d5ce208b2e9cdaab9df07390d2cbca10d7c328fc4bf") } } +#endif // canImport(Testing) diff --git a/Tests/ImperialTests/withApp.swift b/Tests/ImperialTests/withApp.swift index 472f281e..dd3f5647 100644 --- a/Tests/ImperialTests/withApp.swift +++ b/Tests/ImperialTests/withApp.swift @@ -1,3 +1,4 @@ +#if canImport(Testing) import ImperialCore import Testing import Vapor @@ -30,3 +31,4 @@ let isLoggingConfigured: Bool = { } return true }() +#endif // canImport(Testing) From 3db6b027538dc08e13ceabdd55fa131312ebbd52 Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Mon, 12 May 2025 15:53:57 +0200 Subject: [PATCH 2/6] Try fixing iOS CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 763f2bca..b3630db7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,6 @@ jobs: with_linting: true with_musl: true with_android: true - ios_scheme_name: Imperial + ios_scheme_name: Imperial-Package secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file From 58bc58bce1bcf4c7b2f7ff400f87496a072b2542 Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Mon, 12 May 2025 16:11:32 +0200 Subject: [PATCH 3/6] Try copying the `.env` file as a resource --- Package.swift | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Package.swift b/Package.swift index d853038c..6c776826 100755 --- a/Package.swift +++ b/Package.swift @@ -89,6 +89,9 @@ let package = Package( .target(name: "ImperialShopify"), .product(name: "VaporTesting", package: "vapor"), ], + resources: [ + .copy("../../.env.testing") + ], swiftSettings: swiftSettings ), ] From 09fb8c7506332674f3bd70e8c8efb0be67411bba Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Mon, 12 May 2025 17:03:25 +0200 Subject: [PATCH 4/6] Try copying `.env` with Android action --- .github/workflows/test.yml | 1 + Package.swift | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index b3630db7..d0a50182 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,6 +13,7 @@ jobs: with_linting: true with_musl: true with_android: true + android_copy_files: .env.testing ios_scheme_name: Imperial-Package secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file diff --git a/Package.swift b/Package.swift index 6c776826..d853038c 100755 --- a/Package.swift +++ b/Package.swift @@ -89,9 +89,6 @@ let package = Package( .target(name: "ImperialShopify"), .product(name: "VaporTesting", package: "vapor"), ], - resources: [ - .copy("../../.env.testing") - ], swiftSettings: swiftSettings ), ] From 23376080ef47b93da1a03cae72ef231472c4dd49 Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Mon, 12 May 2025 17:39:38 +0200 Subject: [PATCH 5/6] Remove iOS CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d0a50182..7e2d7b91 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,9 +11,9 @@ jobs: uses: vapor/ci/.github/workflows/run-unit-tests.yml@main with: with_linting: true + with_release_mode_testing: true with_musl: true with_android: true android_copy_files: .env.testing - ios_scheme_name: Imperial-Package secrets: CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} \ No newline at end of file From 3bf8df36602851de2207ef9cac61f6f9a9f20753 Mon Sep 17 00:00:00 2001 From: Francesco Paolo Severino Date: Mon, 12 May 2025 17:59:02 +0200 Subject: [PATCH 6/6] Minor fixes --- .github/workflows/test.yml | 1 - Package.swift | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7e2d7b91..07c41e39 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,6 @@ jobs: uses: vapor/ci/.github/workflows/run-unit-tests.yml@main with: with_linting: true - with_release_mode_testing: true with_musl: true with_android: true android_copy_files: .env.testing diff --git a/Package.swift b/Package.swift index d853038c..6c776826 100755 --- a/Package.swift +++ b/Package.swift @@ -89,6 +89,9 @@ let package = Package( .target(name: "ImperialShopify"), .product(name: "VaporTesting", package: "vapor"), ], + resources: [ + .copy("../../.env.testing") + ], swiftSettings: swiftSettings ), ]