Skip to content

Commit

Permalink
Fix bigint dependency (#38)
Browse files Browse the repository at this point in the history
* Switch back to the original BigInt library

I am now one of the maintainers of the original BigInt library and will
make sure that it is always supported on the newest Swift version and
also on Linux.

This is not a breaking change for most people as the imports stay the same (the module
name was the same) but may be for some if they explicitely depended on
the fork. Those people should switch back to the original library as I'm
dropping support for the fork in favour of the original one.

* Switch to xcode version 9.4 on travis

* Switch to iPhone 8 for testing

* Switch back to simulator 11.3

* Switch to iPhone X

* Print available devices on travis

* Change instruments to only run on OSX on travis
  • Loading branch information
Koray Koska committed Jun 23, 2018
1 parent 77990ca commit fd050a2
Show file tree
Hide file tree
Showing 61 changed files with 3,360 additions and 1,995 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1
4.1.2
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ dist: trusty
language: generic
sudo: required

osx_image: xcode9.3beta
xcode_sdk: iphonesimulator11.3
osx_image: xcode9.4
xcode_sdk: iphonesimulator11.4
# cache: cocoapods
# podfile: Example/Podfile
before_install:
- if [ $TRAVIS_OS_NAME == "osx" ]; then instruments -s devices; fi
- gem install cocoapods # Since Travis is not always on latest version
- pod repo update
- pod install --project-directory=Example
Expand All @@ -37,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.3 -destination 'platform=iOS Simulator,name=iPhone 6,OS=11.3' ONLY_ACTIVE_ARCH=YES | xcpretty;
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;
pod lib lint --allow-warnings;
fi
- swift build
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Boilertalk/BigInt.swift" ~> 1.0
github "attaswift/BigInt" ~> 3.1
github "krzyzanowskim/CryptoSwift" ~> 0.8
github "Boilertalk/secp256k1.swift" ~> 0.1
github "mxcl/PromiseKit" ~> 6.0
14 changes: 9 additions & 5 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
PODS:
- BigInt.swift (1.0.0)
- BigInt (3.1.0):
- SipHash (~> 1.2)
- CryptoSwift (0.9.0)
- Nimble (7.0.3)
- PromiseKit/CorePromise (6.2.4)
- Quick (1.2.0)
- secp256k1.swift (0.1.4)
- SipHash (1.2.2)
- Web3 (0.2.1):
- Web3/Core (= 0.2.1)
- Web3/HTTPExtension (= 0.2.1)
- Web3/Core (0.2.1):
- BigInt.swift (~> 1.0)
- BigInt (~> 3.1)
- CryptoSwift (~> 0.8)
- secp256k1.swift (~> 0.1)
- Web3/HTTPExtension (0.2.1):
Expand All @@ -26,25 +28,27 @@ DEPENDENCIES:

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- BigInt.swift
- BigInt
- CryptoSwift
- Nimble
- PromiseKit
- Quick
- secp256k1.swift
- SipHash

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

SPEC CHECKSUMS:
BigInt.swift: 1e0ddf08d82166e72dfb0fa8d40301d273081afc
BigInt: 76b5dfdfa3e2e478d4ffdf161aeede5502e2742f
CryptoSwift: bca8c5b653dcc2d9734409242a070ff53bafac86
Nimble: 7f5a9c447a33002645a071bddafbfb24ea70e0ac
PromiseKit: 625b1fc69944fc839503748101c5968cf54b527b
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
secp256k1.swift: a7e7a214f6db6ce5db32cc6b2b45e5c4dd633634
Web3: 302e96088450557de6a45f880214fc9e4bcfd356
SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4
Web3: 85ae1f09ebc28399615c32e1951d132f70e3f5c2

PODFILE CHECKSUM: 2f710184f832269e9555625936985a2bc3b69022

Expand Down
43 changes: 0 additions & 43 deletions Example/Pods/BigInt.swift/BigInt/Classes/Hashable.swift

This file was deleted.

77 changes: 0 additions & 77 deletions Example/Pods/BigInt.swift/README.md

This file was deleted.

20 changes: 20 additions & 0 deletions Example/Pods/BigInt/LICENSE.md

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

Loading

0 comments on commit fd050a2

Please sign in to comment.