Merge pull request #183 from zcash/update-grpc-swift

update grpc-swift
2020-09-04 14:39:32 -03:00 · 2020-09-04 14:39:32 -03:00 · 2b11c7a0d4
parent 97abbf2a4e 2ef4abd498
commit 2b11c7a0d4
4 changed files with 77 additions and 77 deletions
--- a/Example/ZcashLightClientSample/Podfile
+++ b/Example/ZcashLightClientSample/Podfile
@ -6,7 +6,7 @@ target 'ZcashLightClientSample' do
  pod "KRProgressHUD"
  # Pods for ZcashLightClientSample
  pod 'ZcashLightClientKit', :path => '../../', :testspecs => ['Tests']
-  pod 'gRPC-Swift', '= 1.0.0-alpha.17'
+  pod 'gRPC-Swift', '= 1.0.0-alpha.19'
  pod 'PaginatedTableView'
  pod 'NotificationBubbles'
  pod 'MnemonicSwift'
--- a/Example/ZcashLightClientSample/Podfile.lock
+++ b/Example/ZcashLightClientSample/Podfile.lock
@ -1,15 +1,15 @@
 PODS:
-  - CGRPCZlib (1.0.0-alpha.17)
-  - CNIOAtomics (2.20.2)
-  - CNIOBoringSSL (2.9.0)
-  - CNIOBoringSSLShims (2.9.0):
-    - CNIOBoringSSL (= 2.9.0)
-  - CNIODarwin (2.20.2)
-  - CNIOHTTPParser (2.20.2)
-  - CNIOLinux (2.20.2)
-  - CNIOSHA1 (2.20.2)
-  - gRPC-Swift (1.0.0-alpha.17):
-    - CGRPCZlib (= 1.0.0-alpha.17)
+  - CGRPCZlib (1.0.0-alpha.19)
+  - CNIOAtomics (2.22.0)
+  - CNIOBoringSSL (2.9.1)
+  - CNIOBoringSSLShims (2.9.1):
+    - CNIOBoringSSL (= 2.9.1)
+  - CNIODarwin (2.22.0)
+  - CNIOHTTPParser (2.22.0)
+  - CNIOLinux (2.22.0)
+  - CNIOSHA1 (2.22.0)
+  - gRPC-Swift (1.0.0-alpha.19):
+    - CGRPCZlib (= 1.0.0-alpha.19)
    - Logging (< 2, >= 1.2.0)
    - SwiftNIO (< 3, >= 2.19.0)
    - SwiftNIOHTTP2 (< 2, >= 1.12.2)
@ -26,53 +26,53 @@ PODS:
  - SQLite.swift (0.12.2):
    - SQLite.swift/standard (= 0.12.2)
  - SQLite.swift/standard (0.12.2)
-  - SwiftNIO (2.20.2):
-    - CNIOAtomics (= 2.20.2)
-    - CNIODarwin (= 2.20.2)
-    - CNIOLinux (= 2.20.2)
-    - CNIOSHA1 (= 2.20.2)
-    - SwiftNIOConcurrencyHelpers (= 2.20.2)
-  - SwiftNIOConcurrencyHelpers (2.20.2):
-    - CNIOAtomics (= 2.20.2)
-  - SwiftNIOFoundationCompat (2.20.2):
-    - SwiftNIO (= 2.20.2)
-  - SwiftNIOHPACK (1.13.0):
-    - SwiftNIO (< 3, >= 2.19.0)
-    - SwiftNIOConcurrencyHelpers (< 3, >= 2.19.0)
-    - SwiftNIOHTTP1 (< 3, >= 2.19.0)
-  - SwiftNIOHTTP1 (2.20.2):
-    - CNIOHTTPParser (= 2.20.2)
-    - SwiftNIO (= 2.20.2)
-    - SwiftNIOConcurrencyHelpers (= 2.20.2)
-  - SwiftNIOHTTP2 (1.13.0):
-    - SwiftNIO (< 3, >= 2.19.0)
-    - SwiftNIOConcurrencyHelpers (< 3, >= 2.19.0)
-    - SwiftNIOHPACK (= 1.13.0)
-    - SwiftNIOHTTP1 (< 3, >= 2.19.0)
-    - SwiftNIOTLS (< 3, >= 2.19.0)
-  - SwiftNIOSSL (2.9.0):
-    - CNIOBoringSSL (= 2.9.0)
-    - CNIOBoringSSLShims (= 2.9.0)
-    - SwiftNIO (< 3, >= 2.19.0)
-    - SwiftNIOConcurrencyHelpers (< 3, >= 2.19.0)
-    - SwiftNIOTLS (< 3, >= 2.19.0)
-  - SwiftNIOTLS (2.20.2):
-    - SwiftNIO (= 2.20.2)
-  - SwiftNIOTransportServices (1.8.0):
-    - SwiftNIO (< 3, >= 2.19.0)
-    - SwiftNIOConcurrencyHelpers (< 3, >= 2.19.0)
-    - SwiftNIOFoundationCompat (< 3, >= 2.19.0)
-    - SwiftNIOTLS (< 3, >= 2.19.0)
-  - SwiftProtobuf (1.11.0)
+  - SwiftNIO (2.22.0):
+    - CNIOAtomics (= 2.22.0)
+    - CNIODarwin (= 2.22.0)
+    - CNIOLinux (= 2.22.0)
+    - CNIOSHA1 (= 2.22.0)
+    - SwiftNIOConcurrencyHelpers (= 2.22.0)
+  - SwiftNIOConcurrencyHelpers (2.22.0):
+    - CNIOAtomics (= 2.22.0)
+  - SwiftNIOFoundationCompat (2.22.0):
+    - SwiftNIO (= 2.22.0)
+  - SwiftNIOHPACK (1.14.1):
+    - SwiftNIO (< 3, >= 2.22.0)
+    - SwiftNIOConcurrencyHelpers (< 3, >= 2.22.0)
+    - SwiftNIOHTTP1 (< 3, >= 2.22.0)
+  - SwiftNIOHTTP1 (2.22.0):
+    - CNIOHTTPParser (= 2.22.0)
+    - SwiftNIO (= 2.22.0)
+    - SwiftNIOConcurrencyHelpers (= 2.22.0)
+  - SwiftNIOHTTP2 (1.14.1):
+    - SwiftNIO (< 3, >= 2.22.0)
+    - SwiftNIOConcurrencyHelpers (< 3, >= 2.22.0)
+    - SwiftNIOHPACK (= 1.14.1)
+    - SwiftNIOHTTP1 (< 3, >= 2.22.0)
+    - SwiftNIOTLS (< 3, >= 2.22.0)
+  - SwiftNIOSSL (2.9.1):
+    - CNIOBoringSSL (= 2.9.1)
+    - CNIOBoringSSLShims (= 2.9.1)
+    - SwiftNIO (< 3, >= 2.22.0)
+    - SwiftNIOConcurrencyHelpers (< 3, >= 2.22.0)
+    - SwiftNIOTLS (< 3, >= 2.22.0)
+  - SwiftNIOTLS (2.22.0):
+    - SwiftNIO (= 2.22.0)
+  - SwiftNIOTransportServices (1.9.0):
+    - SwiftNIO (< 3, >= 2.22.0)
+    - SwiftNIOConcurrencyHelpers (< 3, >= 2.22.0)
+    - SwiftNIOFoundationCompat (< 3, >= 2.22.0)
+    - SwiftNIOTLS (< 3, >= 2.22.0)
+  - SwiftProtobuf (1.12.0)
  - ZcashLightClientKit (0.6.3):
-    - gRPC-Swift (= 1.0.0-alpha.17)
+    - gRPC-Swift (= 1.0.0-alpha.19)
    - SQLite.swift (~> 0.12.2)
  - ZcashLightClientKit/Tests (0.6.3):
-    - gRPC-Swift (= 1.0.0-alpha.17)
+    - gRPC-Swift (= 1.0.0-alpha.19)
    - SQLite.swift (~> 0.12.2)

 DEPENDENCIES:
-  - gRPC-Swift (= 1.0.0-alpha.17)
+  - gRPC-Swift (= 1.0.0-alpha.19)
  - KRProgressHUD
  - MnemonicSwift
  - NotificationBubbles
@ -114,15 +114,15 @@ EXTERNAL SOURCES:
    :path: "../../"

 SPEC CHECKSUMS:
-  CGRPCZlib: 245283cd656bf0c309a48a887c27865d6f54f7ef
-  CNIOAtomics: 7daf6423d00650104436c5f8a2a341679104ae83
-  CNIOBoringSSL: fb66746214b40dded1a8ddf2e078af0eff07bfb8
-  CNIOBoringSSLShims: c7a6e1e29088739872e51f70f8305beadfa6ca61
-  CNIODarwin: 65509d8e6a65a3f3f7bf5b09455cbabd535f48f3
-  CNIOHTTPParser: ec6aa14852274b383a52bacd4d6bb3d2432a50e9
-  CNIOLinux: 380e2601f1f32f8f32a78437c5f4f5a688205e2b
-  CNIOSHA1: 5cc4fc5054beeb21c8e0017ad6bf559ce8095c10
-  gRPC-Swift: 871cf2df24d9f5424763ae5af7248ed26a1b1314
+  CGRPCZlib: befd9b92013c647f18aa9b7d9e9231d52e1ced1b
+  CNIOAtomics: fc22c21538d19cd55cce438146ce0388684601b4
+  CNIOBoringSSL: ee7722e4355434b420eb06b3ca7535a6cfb09cf2
+  CNIOBoringSSLShims: e76fde7b7972f242e250f76dafcfdbd23be26eca
+  CNIODarwin: efb83e040e8409494d0a5beeaa711fc95e7d94e9
+  CNIOHTTPParser: c5dc715ce6b8c06049b69a9337f8b6af4b2a5ffb
+  CNIOLinux: 11f69f76c12087a0752fa8a53f32f9853ef3f4f2
+  CNIOSHA1: ff4d77269adcb89f9a962abcbee55256a29b8a36
+  gRPC-Swift: 75a7a8d7cd08177165ef971159afb84e5130cfc9
  KRActivityIndicatorView: 912bc0413d98340f384b12a4e1e6aa8f42fb377d
  KRProgressHUD: df4cdc3a1baf708d4276a089ee34d133fa9a6f3e
  Logging: beeb016c9c80cf77042d62e83495816847ef108b
@ -130,18 +130,18 @@ SPEC CHECKSUMS:
  NotificationBubbles: 91ee10deee54f35b5d49a161e1cb3d788ab5d011
  PaginatedTableView: 294d9831d5ddf5c0dcfbb4a281d4fcfb8d12f55a
  SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
-  SwiftNIO: a3c1b37da3e97ce44b3cfafc61c05fe0cac540b8
-  SwiftNIOConcurrencyHelpers: cd7afc3d1f1ceaf55bbd030e7d1a469d3024db92
-  SwiftNIOFoundationCompat: 573f44d5b24f7ead54b6b111264c0a420fc6eccf
-  SwiftNIOHPACK: 0346ad2091511232c8cf19a6183b9c96ce33baf3
-  SwiftNIOHTTP1: b54fae8700b647e908597aa7ed3370389f634b87
-  SwiftNIOHTTP2: 8a0f333b99f9283f457762f58baa30acfee354cb
-  SwiftNIOSSL: 3e67b565a567c20ed38586ae0b3566f190776a95
-  SwiftNIOTLS: 9225a214c2483873406322d83c9db3731d8350e9
-  SwiftNIOTransportServices: e69704b2d41b68a531bf3aa0177fec81ba1361e6
-  SwiftProtobuf: f889fe5772f90ef7d7b8aac352d1fddf39650713
-  ZcashLightClientKit: f32087bc37a22120fc048d2ce20f8194006d8e11
+  SwiftNIO: e1995d88785db2db1ad5ee4590e4206b8c2658dc
+  SwiftNIOConcurrencyHelpers: d591e7cca9f9e61d2352a13303984b86cee2b212
+  SwiftNIOFoundationCompat: ebf639c373a7a4f074a6a727ba56dad4432a00d9
+  SwiftNIOHPACK: 25e34368f9633012479e3f9ec6c94d490c5852a9
+  SwiftNIOHTTP1: 54570af50938aa7ccae65392690401fa90a762ed
+  SwiftNIOHTTP2: 0ef3020ee88321d4932bf1a1007fa91e7800cbfd
+  SwiftNIOSSL: 2967e874b40d05904edde5c540c3157621e5ecc4
+  SwiftNIOTLS: 46bb3a0ff37d6b52ae6baf5207ec3cd411da327c
+  SwiftNIOTransportServices: 801923921fbecdcde1e1c1ff38e812167d01ead1
+  SwiftProtobuf: 4ef85479c18ca85b5482b343df9c319c62bda699
+  ZcashLightClientKit: 6a7a724d5c249bc15983327157fe5ade6600dbcb

-PODFILE CHECKSUM: 0055c060ebfda59d4243e428eedc1db06c245f19
+PODFILE CHECKSUM: 712888df93841f6c9ab12b3b6db3edf7c2cac776

 COCOAPODS: 1.9.3
--- a/Example/ZcashLightClientSample/ZcashLightClientSample/DemoAppConfig.swift
+++ b/Example/ZcashLightClientSample/ZcashLightClientSample/DemoAppConfig.swift
@ -10,7 +10,7 @@ import Foundation
 import ZcashLightClientKit
 import MnemonicSwift
 struct DemoAppConfig {
-    static var host = ZcashSDK.isMainnet ? "lightwalletd.z.cash" : "lightwalletd.testnet.z.cash"
+    static var host = ZcashSDK.isMainnet ? "localhost" : "localhost"
    static var port: Int = 9067
    static var birthdayHeight: BlockHeight = ZcashSDK.isMainnet ? 663174 : 620_000
    static var network = ZcashSDK.isMainnet ? ZcashNetwork.mainNet : ZcashNetwork.testNet
--- a/ZcashLightClientKit.podspec
+++ b/ZcashLightClientKit.podspec
@ -19,7 +19,7 @@ Pod::Spec.new do |s|
    s.module_map = 'ZcashLightClientKit.modulemap'
    s.swift_version = '5.1'
    s.ios.deployment_target = '12.0'
-    s.dependency 'gRPC-Swift', '= 1.0.0-alpha.17'
+    s.dependency 'gRPC-Swift', '= 1.0.0-alpha.19'
    s.dependency 'SQLite.swift', '~> 0.12.2' 
    s.ios.vendored_libraries = 'lib/libzcashlc.a'
    s.preserve_paths = ['Scripts', 'rust','docs','Cargo.*','ZcashLightClientKit/Stencil']
@ -40,7 +40,7 @@ Pod::Spec.new do |s|
         :script => 'sh ${PODS_TARGET_SRCROOT}/Scripts/generate_test_constants.sh && ${PODS_TARGET_SRCROOT}/Scripts/build_librustzcash_xcode.sh --testing',
         :execution_position => :before_compile
      }
-      test_spec.dependency 'gRPC-Swift', '= 1.0.0-alpha.17'
+      test_spec.dependency 'gRPC-Swift', '= 1.0.0-alpha.19'
      test_spec.dependency 'SQLite.swift', '~> 0.12.2'
  end
 end