Merge branch 'develop' into develop

Author: Valter4578

carthage-build.sh renamed to m≥.sh

@@ -2,4 +2,4 @@ github "attaswift/BigInt" "v5.3.0"
 github "attaswift/SipHash" "v1.2.2"
 github "daltoniam/Starscream" "4.0.4"
 github "krzyzanowskim/CryptoSwift" "1.4.2"
-github "mxcl/PromiseKit" "6.16.0"
+github "mxcl/PromiseKit" "6.16.1"

73a65a1766e605eaeb5d699fcaa8da02

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
   s.name = "PromiseKit"
 
-  s.version = '6.15.3'
+  s.version = '6.16.1'
 
   s.source = {
     :git => "https://github.com/mxcl/#{s.name}.git",

Cartfile.resolved

@@ -932,7 +932,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.15.3;
+				CURRENT_PROJECT_VERSION = 6.16.1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -994,7 +994,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.15.3;
+				CURRENT_PROJECT_VERSION = 6.16.1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;

Carthage/Checkouts/PromiseKit/PromiseKit.podspec

@@ -0,0 +1,23 @@
+# Uncomment the next line to define a global platform for your project
+# platform :ios, '9.0'
+
+source 'https://github.com/CocoaPods/Specs.git'
+
+target 'Web3support' do
+  # Comment the next line if you don't want to use dynamic frameworks
+  use_frameworks!
+
+  # Pods for Web3support
+    pod 'web3swift'
+
+
+  target 'Web3supportTests' do
+    inherit! :search_paths
+    # Pods for testing
+  end
+
+  target 'Web3supportUITests' do
+    # Pods for testing
+  end
+
+end

Carthage/Checkouts/PromiseKit/PromiseKit.xcodeproj/project.pbxproj

@@ -0,0 +1,44 @@
+PODS:
+  - BigInt (4.0.0)
+  - CryptoSwift (1.0.0)
+  - PromiseKit (6.8.5):
+    - PromiseKit/CorePromise (= 6.8.5)
+    - PromiseKit/Foundation (= 6.8.5)
+    - PromiseKit/UIKit (= 6.8.5)
+  - PromiseKit/CorePromise (6.8.5)
+  - PromiseKit/Foundation (6.8.5):
+    - PromiseKit/CorePromise
+  - PromiseKit/UIKit (6.8.5):
+    - PromiseKit/CorePromise
+  - secp256k1.c (0.1.2)
+  - Starscream (3.1.1)
+  - web3swift (2.3.0):
+    - BigInt (~> 4.0)
+    - CryptoSwift (~> 1.0.0)
+    - PromiseKit (~> 6.8.4)
+    - secp256k1.c (~> 0.1)
+    - Starscream (~> 3.1.0)
+
+DEPENDENCIES:
+  - web3swift
+
+SPEC REPOS:
+  trunk:
+    - BigInt
+    - CryptoSwift
+    - PromiseKit
+    - secp256k1.c
+    - Starscream
+    - web3swift
+
+SPEC CHECKSUMS:
+  BigInt: 2aad1a9942dc932ec8b84290d2c564a3d76f97ab
+  CryptoSwift: d81eeaa59dc5a8d03720fe919a6fd07b51f7439f
+  PromiseKit: 9616b0afef31eae56ab9ce044c8ec2b8612a15cd
+  secp256k1.c: db47b726585d80f027423682eb369729e61b3b20
+  Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
+  web3swift: 0f097eafe1d08f478694b882581b85a01afb6633
+
+PODFILE CHECKSUM: 88c1fe5ece120ef8aac94b776e02de991c51641d
+
+COCOAPODS: 1.10.2