Skip to content

Commit

Permalink
Merge pull request #78 from Boilertalk/swift5
Browse files Browse the repository at this point in the history
Swift5
  • Loading branch information
Koray Koska authored Jul 7, 2019
2 parents d1cbe0a + 0ef4e64 commit 7e0ef07
Show file tree
Hide file tree
Showing 235 changed files with 6,836 additions and 5,420 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.2
5.0.1
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ dist: trusty
language: generic
sudo: required

osx_image: xcode9.4
xcode_sdk: iphonesimulator11.4
osx_image: xcode10.2
xcode_sdk: iphonesimulator12.2
# cache: cocoapods
# podfile: Example/Podfile
before_install:
Expand All @@ -38,7 +38,7 @@ script:
- while sleep 60; do echo "=====[ $SECONDS seconds still running ]====="; done &
# Actual script
- if [ $TRAVIS_OS_NAME == "osx" ]; then
set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/Web3.xcworkspace -scheme Web3-Example -sdk iphonesimulator11.4 -destination 'platform=iOS Simulator,name=iPhone X,OS=11.4' ONLY_ACTIVE_ARCH=YES | xcpretty;
set -o pipefail && xcodebuild test -enableCodeCoverage YES -workspace Example/Web3.xcworkspace -scheme Web3-Example -sdk iphonesimulator12.2 -destination 'platform=iOS Simulator,name=iPhone X,OS=12.2' ONLY_ACTIVE_ARCH=YES | xcpretty;
pod lib lint --allow-warnings;
fi
- swift build
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "attaswift/BigInt" ~> 3.1
github "krzyzanowskim/CryptoSwift" ~> 0.8
github "attaswift/BigInt" ~> 4.0
github "krzyzanowskim/CryptoSwift" ~> 1.0
github "Boilertalk/secp256k1.swift" ~> 0.1
github "mxcl/PromiseKit" ~> 6.0
6 changes: 3 additions & 3 deletions Example/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ target 'Web3_Tests' do
pod 'Web3', :path => '../'
pod 'Web3/PromiseKit', :path => '../'
pod 'Web3/ContractABI', :path => '../'
pod 'Quick', '~> 1.2.0'
pod 'Nimble', '~> 7.0.2'

pod 'Quick', '~> 2.1.0'
pod 'Nimble', '~> 8.0.2'
end
52 changes: 24 additions & 28 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
PODS:
- BigInt (3.1.0):
- SipHash (~> 1.2)
- CryptoSwift (0.9.0)
- Nimble (7.0.3)
- PromiseKit/CorePromise (6.2.4)
- Quick (1.2.0)
- BigInt (4.0.0)
- CryptoSwift (1.0.0)
- Nimble (8.0.2)
- PromiseKit/CorePromise (6.10.0)
- Quick (2.1.0)
- secp256k1.swift (0.1.4)
- SipHash (1.2.2)
- Web3 (0.3.0):
- Web3/Core (= 0.3.0)
- Web3/HTTPExtension (= 0.3.0)
- Web3/ContractABI (0.3.0):
- Web3 (0.3.1):
- Web3/Core (= 0.3.1)
- Web3/HTTPExtension (= 0.3.1)
- Web3/ContractABI (0.3.1):
- Web3/Core
- Web3/Core (0.3.0):
- BigInt (~> 3.1)
- CryptoSwift (~> 0.8)
- Web3/Core (0.3.1):
- BigInt (~> 4.0)
- CryptoSwift (~> 1.0)
- secp256k1.swift (~> 0.1)
- Web3/HTTPExtension (0.3.0):
- Web3/HTTPExtension (0.3.1):
- Web3/Core
- Web3/PromiseKit (0.3.0):
- Web3/PromiseKit (0.3.1):
- PromiseKit/CorePromise (~> 6.0)
- Web3/Core

DEPENDENCIES:
- Nimble (~> 7.0.2)
- Quick (~> 1.2.0)
- Nimble (~> 8.0.2)
- Quick (~> 2.1.0)
- Web3 (from `../`)
- Web3/ContractABI (from `../`)
- Web3/PromiseKit (from `../`)
Expand All @@ -37,22 +35,20 @@ SPEC REPOS:
- PromiseKit
- Quick
- secp256k1.swift
- SipHash

EXTERNAL SOURCES:
Web3:
:path: "../"

SPEC CHECKSUMS:
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
CryptoSwift: bca8c5b653dcc2d9734409242a070ff53bafac86
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
PromiseKit: 625b1fc69944fc839503748101c5968cf54b527b
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
BigInt: 2aad1a9942dc932ec8b84290d2c564a3d76f97ab
CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
Nimble: 622629381bda1dd5678162f21f1368cec7cbba60
PromiseKit: 1fdaeb6c0a94a5114fcb814ff3d772b86886ad4e
Quick: 4be43f6634acfa727dd106bdf3929ce125ffa79d
secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
Web3: cbfa8062fe4dffd88249a1dbf51c845937f0dff3
Web3: dbfb28278f2c87c8de8e7b87a2e24fd038db0926

PODFILE CHECKSUM: 50a96c0fbb540a167dac95d16fafaeb3da752eca
PODFILE CHECKSUM: eb77564a1c4f7b215467898368b05a3e1fde7eb9

COCOAPODS: 1.5.3
COCOAPODS: 1.6.1
13 changes: 9 additions & 4 deletions Example/Pods/BigInt/README.md

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

2 changes: 0 additions & 2 deletions Example/Pods/BigInt/sources/BigInt.swift

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

16 changes: 7 additions & 9 deletions Example/Pods/BigInt/sources/Hashable.swift

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

32 changes: 13 additions & 19 deletions Example/Pods/BigInt/sources/String Conversion.swift

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

Loading

0 comments on commit 7e0ef07

Please sign in to comment.