Skip to content

Commit 34efe36

Browse files
authored
Merge pull request #1 from tremblay/feature/spm-use-dependency
Feature/spm use dependency. Add the p-h-c SPM repository instead of the submodule
2 parents a8702c8 + b334b11 commit 34efe36

File tree

5 files changed

+25
-21
lines changed

5 files changed

+25
-21
lines changed

Argon2Swift.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Pod::Spec.new do |spec|
1818
spec.name = "Argon2Swift"
1919
spec.version = "1.0.1"
2020
spec.summary = "A Swift wrapper around the Argon2 reference implementation."
21-
spec.swift_version = "5.0"
21+
spec.swift_version = "5.0"
2222

2323
spec.description = <<-DESC
2424
A Swift wrapper around the Argon2 Reference implementation, built for simplicity and ease
@@ -46,7 +46,7 @@ Pod::Spec.new do |spec|
4646
# profile URL.
4747
#
4848

49-
spec.author = { "Tejas Mehta" => "[email protected]" }
49+
spec.author = { "Tejas Mehta" => "[email protected]" }
5050

5151
# ――― Source Location ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
5252
#

Package.resolved

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,17 @@ let package = Package(
1414
],
1515
dependencies: [
1616
// Dependencies declare other packages that this package depends on.
17-
// .package(url: /* package url */, from: "1.0.0"),
17+
.package(
18+
name: "argon2",
19+
url: "https://github.com/P-H-C/phc-winner-argon2.git", .branch("master")
20+
)
1821
],
1922
targets: [
2023
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
2124
// Targets can depend on other targets in this package, and on products in packages this package depends on.
22-
.target(
23-
name: "Argon2",
24-
dependencies: [],
25-
path: "Sources/Argon2",
26-
exclude: [
27-
"Sources/Argon2/kats",
28-
"Sources/Argon2/vs2015",
29-
"Sources/Argon2/src/blake2/blamka-round-opt.h",
30-
"Sources/Argon2/src/run.c",
31-
"Sources/Argon2/src/test.c",
32-
"Sources/Argon2/src/opt.c",
33-
"Sources/Argon2/src/bench.c",
34-
"Sources/Argon2/src/genkat.c",
35-
"Sources/Argon2/src/genkat.h"
36-
]),
3725
.target(
3826
name: "Argon2Swift",
39-
dependencies: ["Argon2"],
27+
dependencies: ["argon2"],
4028
path: "Sources/Swift"),
4129
.testTarget(
4230
name: "Argon2SwiftTests",

Sources/Modules/module.modulemap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Argon2 {
1+
module argon2 {
22
header "../Argon2/include/argon2.h"
33
export *
44
}

Sources/Swift/Argon2Swift.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66

77
import Foundation
8-
import Argon2
8+
import argon2
99

1010
/// Main class to handle all Argon2 hashing and verification
1111
/// ### Usage Example ###

0 commit comments

Comments
 (0)