Merge branch 'release/0.4.0'

uport-project · Feb 27, 2019 · 4d18831 · 4d18831
2 parents 53bfa8c + 4efcf08
commit 4d18831
Show file tree

Hide file tree

Showing 1,250 changed files with 2,129 additions and 257,935 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,7 +27,7 @@ Example/.idea
 .bundle
 
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
+Carthage/Checkouts
 
 Carthage/Build
 

diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,4 @@
+github "attaswift/BigInt"
+github "uport-project/UPTEthereumSigner" "feature/162158041-convert-to-carthage-fixes-build-issue"
+github "krzyzanowskim/CryptoSwift"
+github "jedisct1/swift-sodium"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,8 @@
+github "attaswift/BigInt" "v3.1.0"
+github "attaswift/SipHash" "v1.2.2"
+github "jedisct1/swift-sodium" "0.7.0"
+github "krzyzanowskim/CryptoSwift" "0.14.0"
+github "square/Valet" "2.4.2"
+github "uport-project/UPTEthereumSigner" "12a02d4d0ca472c1634dc386dd4a70732b73ef9f"
+github "uport-project/openssl" "v1.0.1e"
+github "uport-project/uport-ios-core-eth" "v1.0.0"
diff --git a/Example/Podfile b/Example/Podfile
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
diff --git a/Example/Pods/BigInt/LICENSE.md b/Example/Pods/BigInt/LICENSE.md