Merge pull request #262 from vitelabs/develop

Merge develop

.swiftlint.yml

@@ -1,4 +1,4 @@
-swiftlint_version: 0.29.1
+swiftlint_version: 0.31.0
 disabled_rules:
   - cyclomatic_complexity
   - force_cast

.travis.yml

@@ -6,6 +6,7 @@ before_install:
 - brew install imagemagick
 - bundle install
 - pod install --repo-update --verbose
+- pod cache list --verbose
 script:
 - fastlane vite_test
 env:
@@ -14,12 +15,7 @@ env:
   - secure: FsOAiHxTQXUyjhJEP/Ngz5LTDUjZnYFuCiQhU7yZkm9JmmulXSttc1aL7XZm66IZhltwEw89Hg+gBf9jpgl8l+vrSH+WZEIwF/VlTeYKE3HcIsZFpr1Cf6xtbbFWJ5t5LxN0M30SASUIujlIcuLsmdPsTmZ0gRSS7JSJTWZpbM16rChqE4oJzHZAuEz93fJjtM8YlTD150dy9PZylms9Btimeo7HVmv/6pJdWSt1qRKgMsrM8/rAkZ6pVmf4o9DlrRmj2P4Y6scJeaBNQu2Lk9gMZKZntSfruYnq4wivDAGWHAYn1u9PIGgI2a1tXh9f6HgQ92KBgxEpGJc8nKdSGBjsw6uRmwlna40DURWDXhdvd849Zs8rHL0xFwzqY2lv9IRw3lGVM5O4ECYySo+VmkpCtMmItFgR4lLZF7HaPQUGn/fzyLCcaMw/fQBS/PXWVono8mxPdB7/fQuqFwe5R0CRDWOwT8VUnKq2Xldyz41YlZ+qEWcOlqbgcSLLTENyG0RGruPJjFQLmj0kM24xi4PrVl8K8i6w8FThO4DILVjTiP9tm70I2w7SeFwkBCEv7D8IFxOjem0F31Syyer4QBEFQuGsA1/+Ju9dRC2FJh31Gr3xcW9imTm60y+zSfuFiNX4cTrvKOj+eSPMSuePGMW0mhSIbZh9AW4aQ/WNm38=
   - secure: y4lDeq3dVsHNTommtnCroWuUKwWCnMY7+Ca0FaK5feAnnH3c0KfsJSvEe5J44VTVqytQApxeEMduEOWd/XOBdJVh1hRnVzkNay9bBGZVi61n7V6cxv83AOQ5grhQNA29zrYqA+xYzbjxQeNooM9V5wprJ3a+h+wkIQYnGsZArnpZtJwYk1JwxQJ/4+GUK0/tptojvxjFpaws22HbKVeblwqemW2D5JreD4zVel4qwbP1eajyMk7gzewL2nJprD/P4l7FtgngPk/0BDawQwW3gUucoTzdJtArLEn0rXeEhQO8v3/R3kV9pWQ3pebt3O5YuBZcS2FUWqRs0hI5QzIzTrRsqVFzqsR3gej18+flgWLY87FSa3P6gYCvsUaFLdehHIFr3UBD8Uuwj7CA2Q6lmowXOyM18Ykxwaj7G9VHrFFuxSa11QTqfVjoGVeXO3GpFGKoOmRAh4rHGE4RqeFHMRdV/isTK9JJIPhXomtSbvjYtP2O6jrM7F8jPKqeD9qzZVy81WV7KcOVZWuGOAaPU6P3iZHhVH/D90xRZITUO19yinwTkbAExSfl6CEb5DKaYUmzht6lUpAWfVDlcLwXja9kF4Fwa3ZQLqgjIMklQdQApPWFLHnvQ/OtP+skvlYWSErNj8xuzWKCWWHi1fy7nGzXgMI0mhRB7aUfVvLk8Po=
 cache:
-- bundler
-branches:
-  only:
-  - develop
-  - release
-  - travis
+  - bundler
 addons:
   ssh_known_hosts:
   - github.com

Podfile

@@ -3,7 +3,7 @@ inhibit_all_warnings!
 source 'https://github.com/CocoaPods/Specs.git'
 require './vite_pod'
 
-targetArray = ['Vite', 'Vite-official', 'Vite-test', 'Vite-enterprise']
+targetArray = ['Vite']
 
 targetArray.each do |t|
     target t do
@@ -13,31 +13,21 @@ targetArray.each do |t|
 
         vite_community_git = 'https://github.com/vitelabs/vite-community-ios.git'
         vite_business_git = 'https://github.com/vitelabs/vite-business-ios.git'
-        vite_utils_git = 'https://github.com/vitelabs/vite-utils-ios.git'
         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 = '1fb74697c05ecf0fe620bd35c89bd22412685322'
-        vite_business_commit = 'e4a9a4ef576b9d7f9db30a6beea580ac2488cd1b'
-        vite_utils_commit = 'b8680ffc327a1f64b84c3e4b7ff056fac5b2c7bb'
-        vite_wallet_commit = 'd0628f5cba380396fcf8289b65555a6ca7949b58'
-
-        if t == 'Vite-official'
-            vite_pod 'ViteCommunity', :git => vite_community_git, :commit => vite_community_commit, :subspecs => ['Official']
-            vite_pod 'ViteBusiness', :git => vite_business_git, :commit => vite_business_commit, :subspecs => ['Official']
-        elsif t == 'Vite-test'
-            vite_pod 'ViteCommunity', :git => vite_community_git, :commit => vite_community_commit, :subspecs => ['Test']
-            vite_pod 'ViteBusiness', :git => vite_business_git, :commit => vite_business_commit, :subspecs => ['Test']
-        elsif t == 'Vite-enterprise'
-            vite_pod 'ViteCommunity', :git => vite_community_git, :commit => vite_community_commit, :subspecs => ['Enterprise']
-            vite_pod 'ViteBusiness', :git => vite_business_git, :commit => vite_business_commit, :subspecs => ['Enterprise']
-        else
-            vite_pod 'ViteBusiness', :git => vite_business_git, :commit => vite_business_commit
-        end
+        vite_community_commit = '7f96afc88ee67aeb329f03881416323c52ec2548'
+        vite_business_commit = '6b5266ac17a39bb444aaa4ba00a239e65a667a12'
+        vite_wallet_commit = 'c361cfd46f9ffeb39fd480561422784e8b726630'
+
+        vite_pod 'ViteCommunity', :git => vite_community_git, :commit => vite_community_commit
+        vite_pod 'ViteBusiness', :git => vite_business_git, :commit => vite_business_commit
 
-        vite_pod 'ViteUtils', :git => vite_utils_git, :commit => vite_utils_commit
+        vite_pod 'ViteEthereum', :git => 'https://github.com/vitelabs/vite-ethereum-ios.git', :commit => 'cb3d0a8fe3cbe278470e18ea57734bf8efa94d07'
         vite_pod 'ViteWallet', :git => vite_wallet_git, :commit => vite_wallet_commit
-        # vite_pod 'Vite_HDWalletKit', '1.2.1'
-        vite_pod 'Vite_HDWalletKit', :git => 'https://github.com/vitelabs/vite-keystore-ios.git', :tag => '1.2.1'
+        vite_pod 'Vite_HDWalletKit', '1.3.0'
+
+        vite_pod 'Vite_GrinWallet', :git => 'https://github.com/vitelabs/Vite_GrinWallet.git', :commit => '486abe32b4ac7566ddd0d4f89ff5c67802609865'
 
         pod 'SnapKit', '~> 4.0.0'
         pod 'BigInt', '~> 3.0'
@@ -107,8 +97,44 @@ targetArray.each do |t|
     end
 end
 
+
 post_install do |installer|
     installer.pods_project.targets.each do |target|
+
+        target.build_configurations.each do |config|
+
+            config.build_settings['ENABLE_BITCODE'] = 'NO'
+
+            #debug
+            if config.name.include?("Debug")
+
+                config.build_settings['ONLY_ACTIVE_ARCH'] = 'YES'
+                config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)','DEBUG=1','OFFICIAL=1']
+                config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = ['DEBUG','OFFICIAL']
+            end
+
+            #Internal
+            if config.name.include?("Internal")
+
+                config.build_settings['ONLY_ACTIVE_ARCH'] = 'YES'
+                config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)']
+            end
+            #test
+            if config.name.include?("Test")
+
+                config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
+                config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)','TEST=1']
+                config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = 'TEST'
+            end
+            #Release
+            if config.name.include?("Release")
+
+                config.build_settings['ONLY_ACTIVE_ARCH'] = 'NO'
+                config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= ['$(inherited)','OFFICIAL=1']
+                config.build_settings['SWIFT_ACTIVE_COMPILATION_CONDITIONS'] = 'OFFICIAL'
+            end
+        end
+
         if ['RazzleDazzle', 'JSONRPCKit', 'APIKit'].include? target.name
             target.build_configurations.each do |config|
                 config.build_settings['SWIFT_VERSION'] = '4.0'