From 497e7632594189b91dc14fb43ef6f15e3dee0ebb Mon Sep 17 00:00:00 2001 From: Stone Date: Sat, 9 May 2020 15:13:26 +0800 Subject: [PATCH] Jenkins Version Bump 1455 --- Podfile | 3 ++- Podfile.lock | 13 ++++++----- PushService/Info.plist | 2 +- Vite.xcodeproj/project.pbxproj | 40 +++++++++++++++++----------------- Vite/Info.plist | 2 +- ViteDapp/Info.plist | 2 +- ViteOfficial/Info.plist | 2 +- ViteTest/Info.plist | 2 +- ViteTests/Info.plist | 2 +- 9 files changed, 35 insertions(+), 33 deletions(-) diff --git a/Podfile b/Podfile index adb4b00f..8f73fdae 100644 --- a/Podfile +++ b/Podfile @@ -83,7 +83,7 @@ target target_name do vite_hd_git = 'https://github.com/vitelabs/vite-keystore-ios.git' vite_community_commit = '8109cffa323a77593a99928cf427a81936ca77c9' - vite_business_commit = '70b8d9d79885258390b9a4d340405556f6fa222c' + vite_business_commit = 'b9263e4a7496b7d80d945ecf9f509e9a25b06087' vite_wallet_commit = '5903125fb936f73503642ac64cf95b73fa3f112b' vite_grin_commit = '6cede733d41f7facc0285472783573df8a553661' vite_hd_commit = 'afd57479c20f6514fb20f47cb0c011db7d471457' @@ -111,6 +111,7 @@ target target_name do # pod 'Charts', :git => 'https://github.com/danielgindi/Charts.git', :tag => 'v3.4.0' pod 'Charts', '3.5.0' + pod 'HDWalletKit', '0.3.6' pod 'SnapKit', '~> 4.0.0' pod 'BigInt', '~> 4.0' pod 'R.swift', '5.0.0.alpha.3' diff --git a/Podfile.lock b/Podfile.lock index d1530af7..0c03840b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -175,7 +175,7 @@ PODS: - GoogleUtilities/UserDefaults (6.3.2): - GoogleUtilities/Logger - GTMSessionFetcher/Core (1.3.0) - - HDWalletKit (0.3.5): + - HDWalletKit (0.3.6): - CryptoSwift (~> 1.0.0) - secp256k1.swift (~> 0.1.4) - JSONRPCKit (3.0.0): @@ -372,6 +372,7 @@ DEPENDENCIES: - firebase_crashlytics (from `https://github.com/vitelabs/vite_flutter_sdk.git`, commit `9da8eb4d06401c91e71753523df04ebe01dfdb0a`) - flutter_boost (from `https://github.com/vitelabs/vite_flutter_sdk.git`, commit `9da8eb4d06401c91e71753523df04ebe01dfdb0a`) - FSPagerView + - HDWalletKit (= 0.3.6) - JSONRPCKit (~> 3.0.0) - KeychainSwift (= 13.0.0) - Kingfisher (~> 4.0) @@ -404,7 +405,7 @@ DEPENDENCIES: - Vite_GrinWallet (from `../Vite_GrinWallet/Vite_GrinWallet.podspec`) - Vite_HDWalletKit (from `https://github.com/vitelabs/vite-keystore-ios.git`, commit `afd57479c20f6514fb20f47cb0c011db7d471457`) - vite_wallet_communication (from `https://github.com/vitelabs/vite_flutter_sdk.git`, commit `9da8eb4d06401c91e71753523df04ebe01dfdb0a`) - - ViteBusiness (from `https://github.com/vitelabs/vite-business-ios.git`, commit `70b8d9d79885258390b9a4d340405556f6fa222c`) + - ViteBusiness (from `https://github.com/vitelabs/vite-business-ios.git`, commit `b9263e4a7496b7d80d945ecf9f509e9a25b06087`) - ViteCommunity (from `https://github.com/vitelabs/vite-community-ios.git`, commit `8109cffa323a77593a99928cf427a81936ca77c9`) - viteFlutterSDK (from `https://github.com/vitelabs/vite_flutter_sdk.git`, commit `9da8eb4d06401c91e71753523df04ebe01dfdb0a`) - ViteWallet (from `https://github.com/vitelabs/vite-wallet-ios.git`, commit `5903125fb936f73503642ac64cf95b73fa3f112b`) @@ -521,7 +522,7 @@ EXTERNAL SOURCES: :commit: 9da8eb4d06401c91e71753523df04ebe01dfdb0a :git: https://github.com/vitelabs/vite_flutter_sdk.git ViteBusiness: - :commit: 70b8d9d79885258390b9a4d340405556f6fa222c + :commit: b9263e4a7496b7d80d945ecf9f509e9a25b06087 :git: https://github.com/vitelabs/vite-business-ios.git ViteCommunity: :commit: 8109cffa323a77593a99928cf427a81936ca77c9 @@ -562,7 +563,7 @@ CHECKOUT OPTIONS: :commit: 9da8eb4d06401c91e71753523df04ebe01dfdb0a :git: https://github.com/vitelabs/vite_flutter_sdk.git ViteBusiness: - :commit: 70b8d9d79885258390b9a4d340405556f6fa222c + :commit: b9263e4a7496b7d80d945ecf9f509e9a25b06087 :git: https://github.com/vitelabs/vite-business-ios.git ViteCommunity: :commit: 8109cffa323a77593a99928cf427a81936ca77c9 @@ -614,7 +615,7 @@ SPEC CHECKSUMS: GoogleToolboxForMac: 800648f8b3127618c1b59c7f97684427630c5ea3 GoogleUtilities: 547a86735c6f0ee30ad17e94df4fc21f616b71cb GTMSessionFetcher: 43b8b64263023d4f32caa0b40f4c8bfa3c5f36d8 - HDWalletKit: 07e00d664bec925225418dd638bd86dc05fada6a + HDWalletKit: 6d97a15404b2edfe3418e3dc064faa967e51dac4 JSONRPCKit: 50e0dc5e7f873e87f81562feb8836b7d1974da6d KeychainSwift: 23d6c16cbc33f20fafa30c3d783241b4b87d998c Kingfisher: c148cd7b47ebde9989f6bc7c27dcaa79d81279a0 @@ -668,6 +669,6 @@ SPEC CHECKSUMS: web3.swift.pod: 66048c11416c2e7a9a4b35fe42254d0f0d9db4b1 XCGLogger: 0434f15e3909cdc450bb63faf638b8792ab782ab -PODFILE CHECKSUM: 14779f5616577bf067a1b800644c0156d43366ae +PODFILE CHECKSUM: 43844fafd2e28ac8aae1a47374b419d4728f1089 COCOAPODS: 1.7.5 diff --git a/PushService/Info.plist b/PushService/Info.plist index ed928fb2..25e7013c 100644 --- a/PushService/Info.plist +++ b/PushService/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 1454 + 1455 NSExtension NSExtensionPointIdentifier diff --git a/Vite.xcodeproj/project.pbxproj b/Vite.xcodeproj/project.pbxproj index 7ad65686..959f1469 100644 --- a/Vite.xcodeproj/project.pbxproj +++ b/Vite.xcodeproj/project.pbxproj @@ -1208,7 +1208,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; @@ -1219,7 +1219,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; OTHER_SWIFT_FLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet; PRODUCT_NAME = Vite; @@ -1239,7 +1239,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)"; @@ -1250,7 +1250,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet; PRODUCT_NAME = Vite; PROVISIONING_PROFILE = ""; @@ -1316,7 +1316,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; INFOPLIST_FILE = PushService/Info.plist; @@ -1330,7 +1330,7 @@ "$(inherited)", "$(PROJECT_DIR)/PushService", ); - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet.PushService; @@ -1350,7 +1350,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; INFOPLIST_FILE = PushService/Info.plist; @@ -1364,7 +1364,7 @@ "$(inherited)", "$(PROJECT_DIR)/PushService", ); - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet.PushService; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1384,7 +1384,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1398,7 +1398,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -debug-time-function-bodies"; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet; PRODUCT_NAME = Vite; @@ -1419,7 +1419,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1433,7 +1433,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet; PRODUCT_NAME = Vite; PROVISIONING_PROFILE = ""; @@ -1453,7 +1453,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1468,7 +1468,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -debug-time-function-bodies"; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet; PRODUCT_NAME = Vite; @@ -1488,7 +1488,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1503,7 +1503,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet; PRODUCT_NAME = Vite; PROVISIONING_PROFILE = ""; @@ -1523,7 +1523,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1537,7 +1537,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; OTHER_SWIFT_FLAGS = "$(inherited) -Xfrontend -debug-time-function-bodies"; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet.debug.dapp; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1557,7 +1557,7 @@ CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements; CODE_SIGN_IDENTITY = "iPhone Distribution"; CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1454; + CURRENT_PROJECT_VERSION = 1455; DEVELOPMENT_TEAM = 5SR42372L5; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1571,7 +1571,7 @@ "@executable_path/Frameworks", ); LIBRARY_SEARCH_PATHS = "$(inherited)"; - MARKETING_VERSION = 3.6.0; + MARKETING_VERSION = 3.6.1; PRODUCT_BUNDLE_IDENTIFIER = net.vite.wallet.debug.dapp; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; diff --git a/Vite/Info.plist b/Vite/Info.plist index 04df9963..f756c454 100644 --- a/Vite/Info.plist +++ b/Vite/Info.plist @@ -80,7 +80,7 @@ CFBundleVersion - 1454 + 1455 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ViteDapp/Info.plist b/ViteDapp/Info.plist index aa9f6abb..585185fc 100644 --- a/ViteDapp/Info.plist +++ b/ViteDapp/Info.plist @@ -66,7 +66,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 1454 + 1455 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ViteOfficial/Info.plist b/ViteOfficial/Info.plist index 55c899a5..72016812 100644 --- a/ViteOfficial/Info.plist +++ b/ViteOfficial/Info.plist @@ -79,7 +79,7 @@ CFBundleVersion - 1454 + 1455 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ViteTest/Info.plist b/ViteTest/Info.plist index 04df9963..f756c454 100644 --- a/ViteTest/Info.plist +++ b/ViteTest/Info.plist @@ -80,7 +80,7 @@ CFBundleVersion - 1454 + 1455 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ViteTests/Info.plist b/ViteTests/Info.plist index 08892414..fdf15d5e 100644 --- a/ViteTests/Info.plist +++ b/ViteTests/Info.plist @@ -17,6 +17,6 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 1454 + 1455