Skip to content

Commit e6af4b5

Browse files
authored
Merge pull request #39 from matterinc/develop
Update for XCode 10
2 parents ae0330c + 5fbf48c commit e6af4b5

File tree

102 files changed

+2400
-3808
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+2400
-3808
lines changed

Podfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
def import_pods
2-
pod 'scrypt', '~> 1.7'
2+
pod 'scrypt', '~> 2.0'
33
pod "PromiseKit", "~> 6.3"
44
pod 'BigInt', '~> 3.1'
55
pod 'CryptoSwift', '~> 0.11'
6-
pod 'Result', '~> 3.0'
7-
# pod 'libsodium', :modular_headers => true
6+
pod 'Result', '~> 4.0'
87
pod 'secp256k1_ios', :git => 'https://github.com/shamatar/secp256k1_ios.git', :modular_headers => true
98
end
109

Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ PODS:
1111
- PromiseKit/CorePromise
1212
- PromiseKit/UIKit (6.4.0):
1313
- PromiseKit/CorePromise
14-
- Result (3.2.4)
15-
- scrypt (1.7):
14+
- Result (4.0.0)
15+
- scrypt (2.0):
1616
- CryptoSwift (~> 0.11)
1717
- secp256k1_ios (0.1.3)
1818
- SipHash (1.2.2)
@@ -21,8 +21,8 @@ DEPENDENCIES:
2121
- BigInt (~> 3.1)
2222
- CryptoSwift (~> 0.11)
2323
- PromiseKit (~> 6.3)
24-
- Result (~> 3.0)
25-
- scrypt (~> 1.7)
24+
- Result (~> 4.0)
25+
- scrypt (~> 2.0)
2626
- secp256k1_ios (from `https://github.com/shamatar/secp256k1_ios.git`)
2727

2828
SPEC REPOS:
@@ -47,11 +47,11 @@ SPEC CHECKSUMS:
4747
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
4848
CryptoSwift: ad5208dd2aae0a764ea4ce2c2d34bd067cae67f0
4949
PromiseKit: ae3616f45d7bb9bf4ff1e91abc9b7a8c48a340e0
50-
Result: d2d07204ce72856f1fd9130bbe42c35a7b0fea10
51-
scrypt: a828bd579086977f6db7f9798d1c6332ccaaed4e
50+
Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713
51+
scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84
5252
secp256k1_ios: ac9ef04e761f43c58012b28548afa91493761f17
5353
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
5454

55-
PODFILE CHECKSUM: f536cef086b9f22f5c02cedf59f84825befa9b5f
55+
PODFILE CHECKSUM: f6c71566157938ba8afa59f1e6a3ffc11d709d7b
5656

57-
COCOAPODS: 1.5.3
57+
COCOAPODS: 1.6.0.beta.1

Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h

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

Pods/Headers/Public/BigInt/BigInt-iOS.modulemap

Lines changed: 0 additions & 7 deletions
This file was deleted.

Pods/Headers/Public/BigInt/BigInt-iOS.modulemap

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

Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h

Lines changed: 0 additions & 16 deletions
This file was deleted.

Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h

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

Pods/Headers/Public/BigInt/BigInt-macOS.modulemap

Lines changed: 0 additions & 7 deletions
This file was deleted.

Pods/Headers/Public/BigInt/BigInt-macOS.modulemap

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

0 commit comments

Comments
 (0)