Skip to content

Commit

Permalink
Merge pull request #177 from argentlabs/issue/duplicate-cryptoswift-m…
Browse files Browse the repository at this point in the history
…odule

[FIX] Avoid using  module name to avoid conflict with full library
  • Loading branch information
DarthMike authored Feb 7, 2022
2 parents d7b2b78 + 1a5be1d commit 7362feb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ let package = Package(
dependencies:
[.target(name: "keccaktiny"),
.target(name: "aes"),
.target(name: "CryptoSwift"),
.target(name: "Internal_CryptoSwift_PBDKF2"),
"BigInt",
"GenericJSON",
"secp256k1"],
Expand All @@ -33,7 +33,7 @@ let package = Package(
dependencies: [],
path: "web3swift/lib/aes",
exclude: ["module.map"]),
.target(name: "CryptoSwift",
.target(name: "Internal_CryptoSwift_PBDKF2",
dependencies: [],
path: "web3swift/lib/CryptoSwift"),
.testTarget(name: "web3swiftTests",
Expand Down
2 changes: 1 addition & 1 deletion web3swift/src/Utils/KeyDerivation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Foundation
import CommonCrypto
#endif
#if !COCOAPODS
import CryptoSwift
import Internal_CryptoSwift_PBDKF2
#endif

enum KeyDerivationAlgorithm {
Expand Down

0 comments on commit 7362feb

Please sign in to comment.