Bump json from 2.2.0 to 2.3.0

.circleci/config.yml

@@ -8,29 +8,25 @@ jobs:
   test_build:
     working_directory: ~/Waves/iOS
     macos:
-      xcode: "10.2.1"      
+      xcode: "11.0.0"
     environment:
       BUNDLER_VERSION: 2.0.2
       FL_OUTPUT_DIR: output
     shell: /bin/bash --login -eo pipefail
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "aa:15:14:22:f4:fe:a3:3d:5c:52:5b:20:f4:1f:3f:52"
-            # - "43:eb:59:d6:49:f1:ae:81:cb:5a:ba:b8:01:64:19:39"
+            - "aa:15:14:22:f4:fe:a3:3d:5c:52:5b:20:f4:1f:3f:52"            
       - checkout
+      - run:
+          name: Install Submodules
+          command: git submodule sync && git submodule update --init
       - restore_cache:
           key: 1-gems-{{ checksum "Gemfile.lock" }}
           name: "Restore Gemfile"
       - restore_cache:
           key: 1-gems-{{ checksum "Podfile.lock" }}
-          name: "Restore Podfile"     
-      - run:
-          name: Configure Bundler
-          command: |
-            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            source $BASH_ENV
-            sudo gem install bundler      
+          name: "Restore Podfile"           
       - run:
           name: Bundle install or check
           command: bundle check || bundle install --path vendor/bundle
@@ -75,7 +71,7 @@ jobs:
   prod_build:
     working_directory: ~/Waves/iOS
     macos:
-      xcode: "10.2.1"     
+      xcode: "11.0.0"
     environment:
       BUNDLER_VERSION: 2.0.2
       FL_OUTPUT_DIR: output
@@ -84,21 +80,17 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "aa:15:14:22:f4:fe:a3:3d:5c:52:5b:20:f4:1f:3f:52"
-            # - "43:eb:59:d6:49:f1:ae:81:cb:5a:ba:b8:01:64:19:39"
+            - "aa:15:14:22:f4:fe:a3:3d:5c:52:5b:20:f4:1f:3f:52"            
       - checkout
+      - run:
+          name: Install Submodules
+          command: git submodule sync && git submodule update --init
       - restore_cache:
           key: gems-{{ checksum "Gemfile.lock" }}
           name: "Restore Gemfile"
       - restore_cache:
           key: pods-{{ checksum "Podfile.lock" }}
           name: "Restore Podfile"     
-      - run:
-          name: Configure Bundler
-          command: |
-            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            source $BASH_ENV
-            sudo gem install bundler      
       - run:
           name: Bundle install or check
           command: bundle check || bundle install --path vendor/bundle
@@ -147,7 +139,7 @@ jobs:
   update_build:
     working_directory: ~/Waves/iOS
     macos:
-      xcode: "10.2.1"     
+      xcode: "11.0.0"
     environment:
       BUNDLER_VERSION: 2.0.2
       FL_OUTPUT_DIR: output
@@ -158,15 +150,12 @@ jobs:
           fingerprints:
             - "aa:15:14:22:f4:fe:a3:3d:5c:52:5b:20:f4:1f:3f:52"            
       - checkout
+      - run:
+          name: Install Submodules
+          command: git submodule sync && git submodule update --init
       - restore_cache:
           key: gems-{{ checksum "Gemfile.lock" }}
-          name: "Restore Gemfile"     
-      - run:
-          name: Configure Bundler
-          command: |
-            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            source $BASH_ENV
-            sudo gem install bundler      
+          name: "Restore Gemfile"   
       - run:
           name: Bundle install or check
           command: bundle check || bundle install --path vendor/bundle
@@ -189,7 +178,7 @@ jobs:
   dev_build:
     working_directory: ~/Waves/iOS
     macos:
-      xcode: "10.2.1"    
+      xcode: "11.0.0"
     environment:
       BUNDLER_VERSION: 2.0.2
       FL_OUTPUT_DIR: output
@@ -200,18 +189,15 @@ jobs:
             - "aa:15:14:22:f4:fe:a3:3d:5c:52:5b:20:f4:1f:3f:52"
             - "43:eb:59:d6:49:f1:ae:81:cb:5a:ba:b8:01:64:19:39"
       - checkout
+      - run:
+          name: Install Submodules
+          command: git submodule sync && git submodule update --init
       - restore_cache:
           key: gems-{{ checksum "Gemfile.lock" }}
           name: "Restore Gemfile"
       - restore_cache:
           key: pods-{{ checksum "Podfile.lock" }}
-          name: "Restore Podfile"     
-      - run:
-          name: Configure Bundler
-          command: |
-            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            source $BASH_ENV
-            sudo gem install bundler      
+          name: "Restore Podfile"           
       - run:
           name: Bundle install or check
           command: bundle check || bundle install --path vendor/bundle
@@ -247,7 +233,7 @@ jobs:
           command: bundle exec fastlane download_bundle_enviroments --verbose 
       - run:
           name: Fastlane Build
-          command: bundle exec fastlane prod_build_projet --verbose
+          command: bundle exec fastlane dev_build_projet --verbose
           no_output_timeout: 60m      
       - store_artifacts:
           path: ~/Waves/iOS/Output
@@ -256,7 +242,7 @@ jobs:
   dev_log:
     working_directory: ~/Waves/iOS
     macos:
-      xcode: "10.1.0"      
+      xcode: "11.0.0"
     environment:
       BUNDLER_VERSION: 2.0.2
       FL_OUTPUT_DIR: output
@@ -266,18 +252,15 @@ jobs:
           fingerprints:
             - "43:eb:59:d6:49:f1:ae:81:cb:5a:ba:b8:01:64:19:39"
       - checkout
+      - run:
+          name: Install Submodules
+          command: git submodule sync && git submodule update --init
       - restore_cache:
           key: gems-{{ checksum "Gemfile.lock" }}
           name: "Restore Gemfile"
       - restore_cache:
           key: pods-{{ checksum "Podfile.lock" }}
           name: "Restore Podfile"     
-      - run:
-          name: Configure Bundler
-          command: |
-            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
-            source $BASH_ENV
-            sudo gem install bundler      
       - run:
           name: Bundle install or check
           command: bundle check || bundle install --path vendor/bundle
@@ -325,4 +308,4 @@ workflows:
       - dev_build:          
           filters:
             branches:
-              only: develop
+              only: feature/CI

.gitignore

@@ -73,3 +73,19 @@ WavesWallet-iOS/Resources/Amplitude-Info.plist
 Output/
 
 \.idea/
+
+CommonResources/GoogleService-Info\.plist
+
+CommonResources/Amplitude-Info\.plist
+
+CommonResources/Appsflyer-Info\.plist
+
+CommonResources/Sentry-io-Info\.plist
+
+CommonResources/Fabric-Info\.plist
+
+CommonResources/AppSpector-Info\.plist
+
+Output/
+
+\.idea/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Vendors/WavesSDK"]
+	path = Vendors/WavesSDK
+	url = git@github.com:wavesplatform/WavesSDK-iOS.git

CommonResources/Languages.json

@@ -0,0 +1,88 @@
+[
+  {
+    "title": "English",
+    "icon": "flag18Britain",
+    "code": "en"
+  },
+  {
+    "title": "Русский",
+    "icon": "flag18Rus",
+    "code": "ru"
+  },
+  {
+      "title": "한국어",
+      "icon": "flag18Korea",
+      "code": "ko"
+  },
+  {
+      "title": "中文(简体)",
+      "icon": "flag18China",
+      "code": "zh-Hans-CN",
+      "titleCode": "ZH"
+  },
+  {
+      "title": "Türkçe",
+      "icon": "flag18Turkey",
+      "code": "tr"
+  },
+  {
+      "title": "Nederlands",
+      "icon": "flag18Nederland",
+      "code": "nl-NL",
+      "titleCode": "NL"
+  },
+  {
+      "title": "हिन्दी",
+      "icon": "flag18Hindi",
+      "code": "hi-IN",
+      "titleCode": "HI"
+  },
+  {
+      "title": "Español",
+      "icon": "flag18Spain",
+      "code": "es"
+  },
+  {
+      "title": "Français",
+      "icon": "flag18France",
+      "code": "fr-FR",
+      "titleCode": "FR"
+  },
+  {
+      "title": "Português",
+      "icon": "flag18Portugal",
+      "code": "pt-PT",
+      "titleCode": "PT"
+  },
+  {
+      "title": "Português do Brasil",
+      "icon": "flag18Brazil",
+      "code": "pt-BR",
+      "titleCode": "BR"
+  },
+  {
+      "title": "Polszczyzna",
+      "icon": "flag18Polszczyzna",
+      "code": "pl"
+  },
+  {
+      "title": "Italiano",
+      "icon": "flag18Italiano",
+      "code": "it"
+  },
+  {
+      "title": "Deutsch",
+      "icon": "flag18Germany",
+      "code": "de"
+  },
+  {
+      "title": "Indonesia",
+      "icon": "flag18Indonesia",
+      "code": "id"
+  },
+  {
+      "title": "日本語",
+      "icon": "flag18Japan",
+      "code": "ja"
+  }
+]