Merge pull request #264 from vitelabs/develop

2.1.1
vitelabs · Apr 24, 2019 · 1551eff · 1551eff
2 parents 023419b + 5227b12
commit 1551eff
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 48 deletions.
diff --git a/Podfile b/Podfile
@@ -16,8 +16,8 @@ targetArray.each do |t|
         vite_wallet_git = 'https://github.com/vitelabs/vite-wallet-ios.git'
         vite_ethereum_git = 'https://github.com/vitelabs/vite-ethereum-ios.git'
 
-        vite_community_commit = '7f96afc88ee67aeb329f03881416323c52ec2548'
-        vite_business_commit = '6b5266ac17a39bb444aaa4ba00a239e65a667a12'
+        vite_community_commit = '8aaaaf2eeeb32c97c54a01280aea9ffe7ac704c0'
+        vite_business_commit = 'b72f8f856410247665291102918286e4b27582a3'
         vite_wallet_commit = 'c361cfd46f9ffeb39fd480561422784e8b726630'
 
         vite_pod 'ViteCommunity', :git => vite_community_git, :commit => vite_community_commit

diff --git a/Podfile.lock b/Podfile.lock
@@ -282,8 +282,8 @@ DEPENDENCIES:
   - Toast-Swift (~> 4.0.1)
   - Vite_GrinWallet (from `https://github.com/vitelabs/Vite_GrinWallet.git`, commit `486abe32b4ac7566ddd0d4f89ff5c67802609865`)
   - Vite_HDWalletKit (= 1.3.0)
-  - ViteBusiness (from `https://github.com/vitelabs/vite-business-ios.git`, commit `6b5266ac17a39bb444aaa4ba00a239e65a667a12`)
-  - ViteCommunity (from `https://github.com/vitelabs/vite-community-ios.git`, commit `7f96afc88ee67aeb329f03881416323c52ec2548`)
+  - ViteBusiness (from `https://github.com/vitelabs/vite-business-ios.git`, commit `b72f8f856410247665291102918286e4b27582a3`)
+  - ViteCommunity (from `https://github.com/vitelabs/vite-community-ios.git`, commit `8aaaaf2eeeb32c97c54a01280aea9ffe7ac704c0`)
   - ViteEthereum (from `https://github.com/vitelabs/vite-ethereum-ios.git`, commit `cb3d0a8fe3cbe278470e18ea57734bf8efa94d07`)
   - ViteWallet (from `https://github.com/vitelabs/vite-wallet-ios.git`, commit `c361cfd46f9ffeb39fd480561422784e8b726630`)
   - XCGLogger (~> 6.1.0)
@@ -360,10 +360,10 @@ EXTERNAL SOURCES:
     :commit: 486abe32b4ac7566ddd0d4f89ff5c67802609865
     :git: https://github.com/vitelabs/Vite_GrinWallet.git
   ViteBusiness:
-    :commit: 6b5266ac17a39bb444aaa4ba00a239e65a667a12
+    :commit: b72f8f856410247665291102918286e4b27582a3
     :git: https://github.com/vitelabs/vite-business-ios.git
   ViteCommunity:
-    :commit: 7f96afc88ee67aeb329f03881416323c52ec2548
+    :commit: 8aaaaf2eeeb32c97c54a01280aea9ffe7ac704c0
     :git: https://github.com/vitelabs/vite-community-ios.git
   ViteEthereum:
     :commit: cb3d0a8fe3cbe278470e18ea57734bf8efa94d07
@@ -377,10 +377,10 @@ CHECKOUT OPTIONS:
     :commit: 486abe32b4ac7566ddd0d4f89ff5c67802609865
     :git: https://github.com/vitelabs/Vite_GrinWallet.git
   ViteBusiness:
-    :commit: 6b5266ac17a39bb444aaa4ba00a239e65a667a12
+    :commit: b72f8f856410247665291102918286e4b27582a3
     :git: https://github.com/vitelabs/vite-business-ios.git
   ViteCommunity:
-    :commit: 7f96afc88ee67aeb329f03881416323c52ec2548
+    :commit: 8aaaaf2eeeb32c97c54a01280aea9ffe7ac704c0
     :git: https://github.com/vitelabs/vite-community-ios.git
   ViteEthereum:
     :commit: cb3d0a8fe3cbe278470e18ea57734bf8efa94d07
@@ -460,6 +460,6 @@ SPEC CHECKSUMS:
   web3swift.pod: 6e1bb8f68c6896db180725e34cc55fab60e282c8
   XCGLogger: 7f7f43f15dfe3a305fa1342b7dc29af656289abd
 
-PODFILE CHECKSUM: 1182d67651a4ff0f181889433d1f3917fca1b396
+PODFILE CHECKSUM: db49d50a997f820ded5691c68033a02bcf12c221
 
 COCOAPODS: 1.5.3
diff --git a/PushService/Info.plist b/PushService/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1286</string>
+	<string>1289</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/Vite.xcodeproj/project.pbxproj b/Vite.xcodeproj/project.pbxproj
@@ -817,7 +817,7 @@
 				CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1286;
+				CURRENT_PROJECT_VERSION = 1289;
 				DEVELOPMENT_TEAM = 5SR42372L5;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
@@ -965,7 +965,7 @@
 				CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1286;
+				CURRENT_PROJECT_VERSION = 1289;
 				DEPLOYMENT_POSTPROCESSING = NO;
 				DEVELOPMENT_TEAM = 5SR42372L5;
 				ENABLE_BITCODE = NO;
@@ -1177,7 +1177,7 @@
 				CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1286;
+				CURRENT_PROJECT_VERSION = 1289;
 				DEVELOPMENT_TEAM = 5SR42372L5;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
@@ -1207,7 +1207,7 @@
 				CODE_SIGN_ENTITLEMENTS = Vite/Vite.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1286;
+				CURRENT_PROJECT_VERSION = 1289;
 				DEVELOPMENT_TEAM = 5SR42372L5;
 				ENABLE_BITCODE = NO;
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

diff --git a/Vite/Info.plist b/Vite/Info.plist
@@ -38,20 +38,20 @@
 				<string>com.vite.grinwallet.grinslateresponse</string>
 			</array>
 		</dict>
-        <dict>
-            <key>CFBundleTypeIconFiles</key>
-            <array/>
-            <key>CFBundleTypeName</key>
-            <string>Grin Slate File</string>
-            <key>CFBundleTypeRole</key>
-            <string>Editor</string>
-            <key>LSHandlerRank</key>
-            <string>Owner</string>
-            <key>LSItemContentTypes</key>
-            <array>
-                <string>com.vite.grinwallet.grinslatejson</string>
-            </array>
-        </dict>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array/>
+			<key>CFBundleTypeName</key>
+			<string>Grin Slate File</string>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>com.vite.grinwallet.grinslatejson</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
@@ -64,13 +64,15 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.0</string>
+	<string>2.1.1</string>
 	<key>CFBundleVersion</key>
-	<string>1286</string>
+	<string>1289</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>LSSupportsOpeningDocumentsInPlace</key>
+	<true/>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
@@ -143,23 +145,21 @@
 				</array>
 			</dict>
 		</dict>
-        <dict>
-            <key>UTTypeDescription</key>
-            <string>Grin Slate File</string>
-            <key>UTTypeIconFiles</key>
-            <array/>
-            <key>UTTypeIdentifier</key>
-            <string>com.vite.grinwallet.grinslatejson</string>
-            <key>UTTypeTagSpecification</key>
-            <dict>
-                <key>public.filename-extension</key>
-                <array>
-                    <string>json</string>
-                </array>
-            </dict>
-        </dict>
+		<dict>
+			<key>UTTypeDescription</key>
+			<string>Grin Slate File</string>
+			<key>UTTypeIconFiles</key>
+			<array/>
+			<key>UTTypeIdentifier</key>
+			<string>com.vite.grinwallet.grinslatejson</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<array>
+					<string>json</string>
+				</array>
+			</dict>
+		</dict>
 	</array>
-	<key>LSSupportsOpeningDocumentsInPlace</key>
-	<true/>
 </dict>
 </plist>
diff --git a/ViteTests/Info.plist b/ViteTests/Info.plist
@@ -17,6 +17,6 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1286</string>
+	<string>1289</string>
 </dict>
 </plist>