Skip to content

Commit eb0d7e0

Browse files
skywinderskywinder
committed
Merge branch 'develop' into feature/SupportObjC
2 parents c4de9b7 + aa1336a commit eb0d7e0

File tree

97 files changed

+3926
-4881
lines changed

Some content is hidden

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

97 files changed

+3926
-4881
lines changed

‎.travis.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
language: objective-c
2+
osx_image: xcode10
3+
xcode_project: web3swift.xcworkspace # path to your xcodeproj folder
4+
xcode_scheme: web3swift-iOS
5+
xcode_destination: platform=iOS Simulator, OS=12.0, name=iPhone X
6+
before_install:
7+
- gem install cocoapods --pre --no-rdoc --no-ri --no-document --quiet
8+
- pod install
9+
script:
10+
- xcodebuild -scheme web3swift-iOS -workspace web3swift.xcworkspace -sdk iphonesimulator build test
11+
after_success:
12+
- bash <(curl -s https://codecov.io/bash)

‎Example/web3swiftExample/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,4 +50,4 @@ SPEC CHECKSUMS:
5050

5151
PODFILE CHECKSUM: 8d61818b8900609b53352708ddba0659befd3536
5252

53-
COCOAPODS: 1.6.0.beta.1
53+
COCOAPODS: 1.5.3

‎Example/web3swiftExample/Pods/Headers/Private/scrypt/Cimpl.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Example/web3swiftExample/Pods/Headers/Public/scrypt/scrypt-umbrella.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Example/web3swiftExample/Pods/Headers/Public/scrypt/scrypt-umbrella.h

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

‎Example/web3swiftExample/Pods/Headers/Public/scrypt/scrypt.modulemap

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎Example/web3swiftExample/Pods/Headers/Public/scrypt/scrypt.modulemap

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

‎Example/web3swiftExample/Pods/Headers/Public/web3swift/web3swift-umbrella.h

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/web3swiftExample/Pods/Manifest.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Example/web3swiftExample/Pods/Pods.xcodeproj/project.pbxproj

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

0 commit comments

Comments
 (0)