Skip to content

Commit 5a60dd5

Browse files
authored
Merge pull request #131 from BANKEX/develop
switch to using modular headers
2 parents 9b46a44 + 8bbde2e commit 5a60dd5

File tree

335 files changed

+6233
-4990
lines changed

Some content is hidden

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

335 files changed

+6233
-4990
lines changed

Podfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ def import_pods
22
pod 'Alamofire', '~> 4.7'
33
pod 'Alamofire-Synchronous', '~> 4.0'
44
pod 'BigInt', '~> 3.0.1'
5-
pod 'CryptoSwift'
5+
pod 'CryptoSwift', '~> 0.10.0'
66
pod 'Result', '~> 3.0.0'
77
pod 'libsodium', :modular_headers => true
88
pod 'secp256k1_ios', :git => 'https://github.com/shamatar/secp256k1_ios.git', :modular_headers => true
99
end
1010

1111
target 'web3swift-macOS' do
1212
platform :osx, '10.13'
13-
use_frameworks!
14-
# use_modular_headers!
13+
# use_frameworks!
14+
use_modular_headers!
1515
import_pods
1616

1717
target 'web3swift-macOS_Tests' do
@@ -21,8 +21,8 @@ end
2121

2222
target 'web3swift-iOS' do
2323
platform :ios, '9.0'
24-
use_frameworks!
25-
# use_modular_headers!
24+
# use_frameworks!
25+
use_modular_headers!
2626
import_pods
2727

2828
target 'web3swift-iOS_Tests' do

Podfile.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PODS:
44
- Alamofire (~> 4.0)
55
- BigInt (3.0.1):
66
- SipHash (~> 1.2)
7-
- CryptoSwift (0.9.0)
7+
- CryptoSwift (0.10.0)
88
- libsodium (1.0.12)
99
- Result (3.0.0)
1010
- secp256k1_ios (0.1.3)
@@ -14,7 +14,7 @@ DEPENDENCIES:
1414
- Alamofire (~> 4.7)
1515
- Alamofire-Synchronous (~> 4.0)
1616
- BigInt (~> 3.0.1)
17-
- CryptoSwift
17+
- CryptoSwift (~> 0.10.0)
1818
- libsodium
1919
- Result (~> 3.0.0)
2020
- secp256k1_ios (from `https://github.com/shamatar/secp256k1_ios.git`)
@@ -42,12 +42,12 @@ SPEC CHECKSUMS:
4242
Alamofire: e4fa87002c137ba2d8d634d2c51fabcda0d5c223
4343
Alamofire-Synchronous: eedf1e6e961c3795a63c74990b3f7d9fbfac7e50
4444
BigInt: 8e8a52161c745cd3ab78e3dc346a9fbee51e6cf6
45-
CryptoSwift: bca8c5b653dcc2d9734409242a070ff53bafac86
45+
CryptoSwift: 6c778d69282bed3b4e975ff97a79d074f20bb011
4646
libsodium: 9a8faa5ef2fa0d2d57bd7f7d79bf8fb7c1a9f0ea
4747
Result: 1b3e431f37cbcd3ad89c6aa9ab0ae55515fae3b6
4848
secp256k1_ios: ac9ef04e761f43c58012b28548afa91493761f17
4949
SipHash: b26918dbe6925368d4322374371437c62c9038e2
5050

51-
PODFILE CHECKSUM: e13ad9f4ec7273a5a0d11848b959afdd2efcf396
51+
PODFILE CHECKSUM: 2c461e9c1483a288888d90dbec2cc53282615fad
5252

53-
COCOAPODS: 1.5.2
53+
COCOAPODS: 1.5.3

Pods/CryptoSwift/README.md

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

0 commit comments

Comments
 (0)