Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
android_copy_files: .env.testing
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
2 changes: 1 addition & 1 deletion .swift-format
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"indentation": {
"spaces": 4
},
"indentConditionalCompilationBlocks": true,
"indentConditionalCompilationBlocks": false,
"indentSwitchCaseLabels": false,
"lineBreakAroundMultilineExpressionChainComponents": false,
"lineBreakBeforeControlFlowKeywords": false,
Expand Down
12 changes: 9 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"]),
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -86,6 +89,9 @@ let package = Package(
.target(name: "ImperialShopify"),
.product(name: "VaporTesting", package: "vapor"),
],
resources: [
.copy("../../.env.testing")
],
swiftSettings: swiftSettings
),
]
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 1 addition & 0 deletions Sources/ImperialShopify/URL+Shopify.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Crypto
import Foundation
import Vapor

extension URL {
func generateHMAC(key: String) -> String {
Expand Down
2 changes: 2 additions & 0 deletions Tests/ImperialTests/ImperialTests.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if canImport(Testing)
import ImperialAuth0
import ImperialDeviantArt
import ImperialDiscord
Expand Down Expand Up @@ -295,3 +296,4 @@ struct ImperialTests {
#expect(ImperialError.missingEnvVar("foo") == ImperialError.missingEnvVar("bar"))
}
}
#endif // canImport(Testing)
2 changes: 2 additions & 0 deletions Tests/ImperialTests/ShopifyTests.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if canImport(Testing)
import Foundation
import Testing
import VaporTesting
Expand Down Expand Up @@ -71,3 +72,4 @@ struct ShopifyTests {
#expect(hmac == "700e2dadb827fcc8609e9d5ce208b2e9cdaab9df07390d2cbca10d7c328fc4bf")
}
}
#endif // canImport(Testing)
2 changes: 2 additions & 0 deletions Tests/ImperialTests/withApp.swift
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#if canImport(Testing)
import ImperialCore
import Testing
import Vapor
Expand Down Expand Up @@ -30,3 +31,4 @@ let isLoggingConfigured: Bool = {
}
return true
}()
#endif // canImport(Testing)