Skip to content

Commit 90b55a6

Browse files
TonioMacaronioTonioMacaronio
authored
Merge pull request #179 from matter-labs/develop
2.2.0
2 parents 8c7bc1a + 358d2a2 commit 90b55a6

File tree

2,196 files changed

+110339
-192568
lines changed

Some content is hidden

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

2,196 files changed

+110339
-192568
lines changed

‎.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ playground.xcworkspace
5252
# Add this line if you want to avoid checking in source code from Carthage dependencies.
5353
# Carthage/Checkouts
5454

55-
Carthage/Build
55+
#Carthage/Build
5656

5757
# fastlane
5858
#
@@ -66,5 +66,5 @@ fastlane/Preview.html
6666
fastlane/screenshots
6767
fastlane/test_output
6868
API_keys.plist
69-
web3swiftTests/key.json
70-
web3swiftTests/Resources/key.json
69+
70+
.DS_Store

‎.travis.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ xcode_project: web3swift.xcworkspace
55
xcode_scheme: web3swift-iOS
66
xcode_destination: platform=iOS Simulator, OS=12.2, name=iPhone X
77
before_install:
8-
- gem install cocoapods --pre
9-
- pod install --repo-update
8+
- brew install carthage || true
9+
- brew outdated carthage || brew upgrade carthage
10+
before_script:
11+
- carthage bootstrap --platform iOS --no-use-binaries --cache-builds
1012
script:
11-
- xcodebuild -scheme web3swift-iOS -workspace web3swift.xcworkspace -sdk iphonesimulator build test
13+
- xcodebuild -scheme web3swift -project web3swift.xcodeproj -sdk iphonesimulator build test
1214
after_success:
1315
- bash <(curl -s https://codecov.io/bash)

‎Cartfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
github "mxcl/PromiseKit" ~> 6.8.4
2+
github "attaswift/BigInt" ~> 3.1
3+
github "daltoniam/Starscream" ~> 3.1.0
4+
github "krzyzanowskim/CryptoSwift" ~> 1.0.0

‎Cartfile.resolved

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
github "attaswift/BigInt" "v3.1.0"
2+
github "attaswift/SipHash" "v1.2.2"
3+
github "daltoniam/Starscream" "3.1.0"
4+
github "krzyzanowskim/CryptoSwift" "1.0.0"
5+
github "mxcl/PromiseKit" "6.8.4"

‎Carthage/Checkouts/BigInt/.codecov.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
ignore:
2+
- "/tests/*"
3+
comment:
4+
layout: "header, diff"
5+
behavior: default
6+
require_changes: no
7+
coverage:
8+
status:
9+
project:
10+
default:
11+
target: auto
12+
threshold: null
13+
base: auto
14+
paths: "sources/*"

‎Carthage/Checkouts/BigInt/.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/Carthage/Build
2+
/.build
3+
/Packages
4+
xcuserdata
5+
/Package.pins
6+
/Package.resolved

‎Carthage/Checkouts/BigInt/.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "Carthage/Checkouts/SipHash"]
2+
path = Carthage/Checkouts/SipHash
3+
url = https://github.com/attaswift/SipHash.git

‎Carthage/Checkouts/BigInt/.swift-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
4.0

‎Carthage/Checkouts/BigInt/.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
language: objective-c
2+
osx_image: xcode9.3
3+
script:
4+
- swift build
5+
- swift test
6+
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-macOS test
7+
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-iOS
8+
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-watchOS
9+
- xcrun xcodebuild -workspace BigInt.xcworkspace -scheme BigInt-tvOS
10+
after_success: bash <(curl -s https://codecov.io/bash)

‎Carthage/Checkouts/BigInt/BigInt.podspec

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
2+
Pod::Spec.new do |spec|
3+
spec.name = 'BigInt'
4+
spec.version = '3.1.0'
5+
spec.ios.deployment_target = "8.0"
6+
spec.osx.deployment_target = "10.9"
7+
spec.tvos.deployment_target = "9.0"
8+
spec.watchos.deployment_target = "2.0"
9+
spec.license = { :type => 'MIT', :file => 'LICENSE.md' }
10+
spec.summary = 'Arbitrary-precision arithmetic in pure Swift'
11+
spec.homepage = 'https://github.com/attaswift/BigInt'
12+
spec.author = 'Károly Lőrentey'
13+
spec.source = { :git => 'https://github.com/attaswift/BigInt.git', :tag => 'v' + String(spec.version) }
14+
spec.source_files = 'sources/*.swift'
15+
spec.social_media_url = 'https://twitter.com/lorentey'
16+
spec.documentation_url = 'http://attaswift.github.io/BigInt/'
17+
spec.dependency 'SipHash', '~> 1.2'
18+
end

0 commit comments

Comments
 (0)