Skip to content

Commit

Permalink
Merge pull request #151 from matter-labs/develop
Browse files Browse the repository at this point in the history
2.1.3 fix
  • Loading branch information
BaldyAsh committed Apr 6, 2019
2 parents 6214e55 + 19c4114 commit 67f656a
Show file tree
Hide file tree
Showing 7 changed files with 102 additions and 98 deletions.
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
def import_pods
pod 'Starscream', '3.0.2'
pod 'Starscream', '3.1.0'
pod 'PromiseKit', '6.4.1'
pod 'BigInt', '3.1'
pod 'CryptoSwift', '0.15.0'
Expand Down
8 changes: 4 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ PODS:
- PromiseKit/CorePromise
- secp256k1_swift (1.0.3)
- SipHash (1.2.2)
- Starscream (3.0.6)
- Starscream (3.1.0)
- SwiftRLP (1.1):
- BigInt (~> 3.1)

Expand All @@ -30,7 +30,7 @@ DEPENDENCIES:
- EthereumAddress (= 1.0.0)
- PromiseKit (= 6.4.1)
- secp256k1_swift (= 1.0.3)
- Starscream (~> 3.0.2)
- Starscream (= 3.1.0)
- SwiftRLP (= 1.1)

SPEC REPOS:
Expand All @@ -53,9 +53,9 @@ SPEC CHECKSUMS:
PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc
secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
Starscream: ef3ece99d765eeccb67de105bfa143f929026cf5
Starscream: 08172b481e145289c4930cb567230fb55897cfa4
SwiftRLP: 5512899925f1a9e1c78c902ed3bf857880e814a0

PODFILE CHECKSUM: f6bd64afcf880b538c28f14d7d04eee536ec1a2f
PODFILE CHECKSUM: 429b4775205f039533979812eac3d89270bb42cf

COCOAPODS: 1.7.0.beta.3
8 changes: 4 additions & 4 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

162 changes: 81 additions & 81 deletions Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Pods/Starscream/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Pods/Starscream/Sources/Starscream/WebSocket.swift

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions web3swift.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "web3swift"
s.version = "2.1.3"
s.version = "2.1.4"
s.summary = "Web3 implementation in vanilla Swift for iOS ans macOS"

s.description = <<-DESC
Expand All @@ -24,10 +24,10 @@ s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
s.frameworks = 'CoreImage'
s.dependency 'BigInt', '3.1'
s.dependency 'CryptoSwift', '0.15.0'
s.dependency 'PromiseKit', '6.3'
s.dependency 'PromiseKit', '6.4.1'
s.dependency 'secp256k1_swift', '1.0.3'
s.dependency 'SwiftRLP', '1.1'
s.dependency 'EthereumAddress', '1.0.0'
s.dependency 'EthereumABI', '1.1.1'
s.dependency 'Starscream', '3.0.2'
s.dependency 'Starscream', '3.1.0'
end

0 comments on commit 67f656a

Please sign in to comment.