Skip to content

Commit c31ac93

Browse files
committed
fix: solve namespace naming conflicts
1 parent 485bd9b commit c31ac93

File tree

12 files changed

+13
-13
lines changed

12 files changed

+13
-13
lines changed

Package.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ let package = Package(
1515
// Exposed libraries.
1616
products: [.library(name: "Requests",
1717
targets: ["Requests"]),
18-
.library(name: "Storage",
19-
targets: ["Storage"]),
20-
.library(name: "StorageCrypto",
21-
targets: ["StorageCrypto"])],
18+
.library(name: "Storages",
19+
targets: ["Storages"]),
20+
.library(name: "EncryptedStorages",
21+
targets: ["EncryptedStorages"])],
2222
// Package dependencies.
2323
dependencies: [.package(url: "https://github.com/kishikawakatsumi/KeychainAccess",
2424
.upToNextMinor(from: "4.2.2"))],
2525
// All targets.
2626
targets: [.target(name: "Core"),
2727
.target(name: "Requests",
2828
dependencies: ["Core"]),
29-
.target(name: "Storage",
29+
.target(name: "Storages",
3030
dependencies: []),
31-
.target(name: "StorageCrypto",
32-
dependencies: ["Storage", "KeychainAccess"]),
31+
.target(name: "EncryptedStorages",
32+
dependencies: ["Storages", "KeychainAccess"]),
3333
.testTarget(name: "ComposableRequestTests",
34-
dependencies: ["Requests", "Storage", "StorageCrypto"])]
34+
dependencies: ["Requests", "Storages", "EncryptedStorages"])]
3535
)
3636

3737
if ProcessInfo.processInfo.environment["TARGETING_WATCHOS"] == "true" {

Sources/StorageCrypto/KeychainStorage.swift renamed to Sources/EncryptedStorages/KeychainStorage.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import Foundation
99

1010
import KeychainAccess
11-
import protocol Storage.Storable
12-
import protocol Storage.ThrowingStorage
11+
import protocol Storages.Storable
12+
import protocol Storages.ThrowingStorage
1313

1414
/// A `typealias` for `KeychainAccess.Keychain`.
1515
///
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)