From 9d2e2e26ada9e42d3c6cdfd822d5a77a5692ede3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 22:22:41 +0000 Subject: [PATCH 01/11] Bump lxml from 4.6.1 to 4.6.2 in /test/appium Bumps [lxml](https://github.com/lxml/lxml) from 4.6.1 to 4.6.2. - [Release notes](https://github.com/lxml/lxml/releases) - [Changelog](https://github.com/lxml/lxml/blob/master/CHANGES.txt) - [Commits](https://github.com/lxml/lxml/compare/lxml-4.6.1...lxml-4.6.2) Signed-off-by: dependabot[bot] --- test/appium/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/appium/requirements.txt b/test/appium/requirements.txt index c9999d2b0f..20f5c15ff3 100644 --- a/test/appium/requirements.txt +++ b/test/appium/requirements.txt @@ -17,7 +17,7 @@ future==0.18.2 flaky==3.7.0 idna==2.10 kiwisolver==1.3.1 -lxml==4.6.1 +lxml==4.6.2 matplotlib==3.3.3 multidict==3.1.3 namedlist==1.8 From 6410de803ea077b7728ecc1a7bc0726e7e1fac17 Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Wed, 6 Jan 2021 08:19:38 +0000 Subject: [PATCH 02/11] fix: test/appium/requirements.txt to reduce vulnerabilities The following vulnerabilities are fixed by pinning transitive dependencies: - https://snyk.io/vuln/SNYK-PYTHON-PILLOW-1055461 - https://snyk.io/vuln/SNYK-PYTHON-PILLOW-1055462 --- test/appium/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/appium/requirements.txt b/test/appium/requirements.txt index 20f5c15ff3..47317fbfba 100644 --- a/test/appium/requirements.txt +++ b/test/appium/requirements.txt @@ -23,7 +23,7 @@ multidict==3.1.3 namedlist==1.8 numpy==1.19.4 pbkdf2==1.3 -Pillow==8.0.1 +Pillow==8.1.0 py==1.9.0 py-ecc==5.1.0 pycryptodome==3.9.9 From fe6f75e1b7fe43f4cb4d9f2796820ef8b010d590 Mon Sep 17 00:00:00 2001 From: Frank Tang Date: Wed, 30 Dec 2020 23:29:12 +0800 Subject: [PATCH 03/11] fix: No "Delete" option for a group chat from the home screen if user has been removed from it Signed-off-by: andrey --- src/status_im/ui/screens/chat/sheets.cljs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/status_im/ui/screens/chat/sheets.cljs b/src/status_im/ui/screens/chat/sheets.cljs index 83ca13092d..785ab121b3 100644 --- a/src/status_im/ui/screens/chat/sheets.cljs +++ b/src/status_im/ui/screens/chat/sheets.cljs @@ -102,7 +102,8 @@ (defn group-chat-accents [] (fn [{:keys [chat-id group-chat chat-name color invitation-admin]}] - (let [{:keys [joined?]} @(re-frame/subscribe [:group-chat/inviter-info chat-id])] + (let [{:keys [joined?]} @(re-frame/subscribe [:group-chat/inviter-info chat-id]) + removed? @(re-frame/subscribe [:group-chat/removed-from-current-chat?])] (if invitation-admin [quo/list-item {:theme :accent @@ -137,7 +138,14 @@ :title (i18n/label :t/leave-chat) :accessibility-label :leave-chat-button :icon :main-icons/arrow-left - :on-press #(re-frame/dispatch [:group-chats.ui/leave-chat-pressed chat-id])}])])))) + :on-press #(re-frame/dispatch [:group-chats.ui/leave-chat-pressed chat-id])}]) + (when removed? + [quo/list-item + {:theme :accent + :title (i18n/label :t/remove) + :accessibility-label :remove-group-chat + :icon :main-icons/delete + :on-press #(hide-sheet-and-dispatch [:group-chats.ui/remove-chat-confirmed chat-id])}])])))) (defn actions [{:keys [chat-type] :as current-chat}] From 3fd36c6904ec8c75391e8386bb6c000b193598f8 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 12 Jan 2021 12:17:43 +0100 Subject: [PATCH 04/11] [#11627] Add GRT erc20 token in our default list of supported tokens in the wallet Signed-off-by: andrey --- resources/images/tokens/mainnet/GRT.png | Bin 0 -> 14472 bytes resources/images/tokens/mainnet/GRT@2x.png | Bin 0 -> 46342 bytes src/status_im/ethereum/tokens.cljs | 6 +++++- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 resources/images/tokens/mainnet/GRT.png create mode 100644 resources/images/tokens/mainnet/GRT@2x.png diff --git a/resources/images/tokens/mainnet/GRT.png b/resources/images/tokens/mainnet/GRT.png new file mode 100644 index 0000000000000000000000000000000000000000..bcefbc76658cfa8ad41482b15a3341c52db33ead GIT binary patch literal 14472 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 z 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 Date: Wed, 13 Jan 2021 10:21:33 +0100 Subject: [PATCH 05/11] Correction Removed: Auto scan for tokens of primary Ethereum account upon recovery Signed-off-by: andrey --- RELEASES.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/RELEASES.md b/RELEASES.md index d860d289d3..5937fcb5e9 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -5,7 +5,6 @@ Status version 1.10 is here and it is a perfect way to kick off 2021! Another fe #### Added - Pull to refresh on individual account view -- Auto scan for tokens of primary Ethereum account upon recovery - Save dapps as favorite - Switch between dapps in multiple tabs - Banner to find dapps to buy crypto @@ -38,7 +37,6 @@ Status version 1.10 is here and it is a perfect way to kick off 2021! Another fe #### Added - Pull to refresh on individual account view -- Auto scan for tokens of primary Ethereum account upon recovery - Save dapps as favorite - Switch between dapps in multiple tabs - Banner to find dapps to buy crypto From e4d175ef9393a747073aa4c0fa943180b56c77e9 Mon Sep 17 00:00:00 2001 From: Serhy Date: Wed, 13 Jan 2021 12:14:32 +0200 Subject: [PATCH 06/11] Revert 11624 Signed-off-by: Serhy --- test/appium/requirements.txt | 2 +- test/appium/support/testrail_report.py | 3 +- test/appium/tests/base_test_case.py | 3 +- test/appium/tests/cloudbase_test_api.py | 48 ------------------------- test/appium/tests/conftest.py | 26 +++++++++----- 5 files changed, 23 insertions(+), 59 deletions(-) delete mode 100644 test/appium/tests/cloudbase_test_api.py diff --git a/test/appium/requirements.txt b/test/appium/requirements.txt index 47317fbfba..3a811a2b27 100644 --- a/test/appium/requirements.txt +++ b/test/appium/requirements.txt @@ -39,8 +39,8 @@ PyYAML==5.3.1 repoze.lru==0.7 requests==2.25.0 rlp==1.2.0 -scrypt==0.8.17 sauceclient==1.0.0 +scrypt==0.8.17 selenium==3.14.1 six==1.10.0 urllib3==1.25.9 diff --git a/test/appium/support/testrail_report.py b/test/appium/support/testrail_report.py index f1c802ec1c..30d9fadaf4 100644 --- a/test/appium/support/testrail_report.py +++ b/test/appium/support/testrail_report.py @@ -121,6 +121,7 @@ class TestrailReport(BaseTestReport): tests = self.get_all_tests() passed_tests = self.get_passed_tests() failed_tests = self.get_failed_tests() + final_description = "Nothing to report this time..." if len(tests) > 0: description_title = "# %.0f%% of end-end tests have passed\n" % (len(passed_tests) / len(tests) * 100) description_title += "\n" @@ -129,7 +130,7 @@ class TestrailReport(BaseTestReport): description_title += "Passed tests: %d\n" % len(passed_tests) description_title += "\n" ids_failed_test = [] - description = '' + description, case_info = '', '' if failed_tests: for i, test in enumerate(failed_tests): last_testrun = test.testruns[-1] diff --git a/test/appium/tests/base_test_case.py b/test/appium/tests/base_test_case.py index 0f4581e861..fc5f1a1a4e 100644 --- a/test/appium/tests/base_test_case.py +++ b/test/appium/tests/base_test_case.py @@ -30,7 +30,7 @@ class AbstractTestCase: @property def executor_sauce_lab(self): - return 'https://%s:%s@ondemand.eu-central-1.saucelabs.com:443/wd/hub' % (self.sauce_username, self.sauce_access_key) + return 'http://%s:%s@ondemand.saucelabs.com:80/wd/hub' % (self.sauce_username, self.sauce_access_key) @property def executor_local(self): @@ -59,6 +59,7 @@ class AbstractTestCase: def capabilities_sauce_lab(self): desired_caps = dict() desired_caps['app'] = 'sauce-storage:' + test_suite_data.apk_name + desired_caps['build'] = pytest_config_global['build'] desired_caps['name'] = test_suite_data.current_test.name desired_caps['platformName'] = 'Android' diff --git a/test/appium/tests/cloudbase_test_api.py b/test/appium/tests/cloudbase_test_api.py deleted file mode 100644 index 23bef31ab4..0000000000 --- a/test/appium/tests/cloudbase_test_api.py +++ /dev/null @@ -1,48 +0,0 @@ -from os import environ -import json -import requests -from io import BytesIO - -from sauceclient import SauceClient, SauceException - -try: - import http.client as http_client - from urllib.parse import urlencode -except ImportError: - import httplib as http_client - from urllib import urlencode - - -sauce_username = environ.get('SAUCE_USERNAME') -sauce_access_key = environ.get('SAUCE_ACCESS_KEY') - -sauce = SauceClient(sauce_username, sauce_access_key) -apibase = 'eu-central-1.saucelabs.com' - - -def request(method, url, body=None, content_type='application/json'): - """This is to monkey patch further this method in order to use apibase""" - headers = sauce.make_auth_headers(content_type) - connection = http_client.HTTPSConnection(apibase) - connection.request(method, url, body, headers=headers) - response = connection.getresponse() - data = response.read() - connection.close() - if response.status not in [200, 201]: - raise SauceException('{}: {}.\nSauce Status NOT OK'.format( - response.status, response.reason), response=response) - return json.loads(data.decode('utf-8')) - -sauce.request = request - -def upload_from_url(apk_path = str()): - response = requests.get(apk_path, stream=True) - response.raise_for_status() - apk_name = apk_path.split("/")[-1] - file = BytesIO(response.content) - del response - requests.post('https://eu-central-1.saucelabs.com/rest/v1/storage/' - + sauce_username + '/' + apk_name + '?overwrite=true', - auth=(sauce_username, sauce_access_key), - data=file, - headers={'Content-Type': 'application/octet-stream'}) diff --git a/test/appium/tests/conftest.py b/test/appium/tests/conftest.py index fc97aa342b..6d3a60681c 100644 --- a/test/appium/tests/conftest.py +++ b/test/appium/tests/conftest.py @@ -8,16 +8,19 @@ from support.test_rerun import should_rerun_test from tests import test_suite_data, appium_container from datetime import datetime from os import environ -from sauceclient import SauceException -import tests.cloudbase_test_api +from io import BytesIO +from sauceclient import SauceClient, SauceException from support.api.network_api import NetworkApi from support.github_report import GithubHtmlReport from support.testrail_report import TestrailReport from tests.users import transaction_senders import tests +sauce_username = environ.get('SAUCE_USERNAME') +sauce_access_key = environ.get('SAUCE_ACCESS_KEY') github_token = environ.get('GIT_HUB_TOKEN') +sauce = SauceClient(sauce_username, sauce_access_key) github_report = GithubHtmlReport() testrail_report = TestrailReport() @@ -138,7 +141,7 @@ def is_master(config): def is_uploaded(): - stored_files = tests.cloudbase_test_api.sauce.storage.get_stored_files() + stored_files = sauce.storage.get_stored_files() for i in range(len(stored_files['files'])): if stored_files['files'][i]['name'] == test_suite_data.apk_name: return True @@ -170,11 +173,18 @@ def pytest_configure(config): description='e2e tests are running') if config.getoption('env') == 'sauce': if not is_uploaded(): - apk = config.getoption('apk') - if 'http' in apk: - tests.cloudbase_test_api.upload_from_url(apk) + if 'http' in config.getoption('apk'): + response = requests.get(config.getoption('apk'), stream=True) + response.raise_for_status() + file = BytesIO(response.content) + del response + requests.post('http://saucelabs.com/rest/v1/storage/' + + sauce_username + '/' + test_suite_data.apk_name + '?overwrite=true', + auth=(sauce_username, sauce_access_key), + data=file, + headers={'Content-Type': 'application/octet-stream'}) else: - tests.cloudbase_test_api.sauce.storage.upload_file(apk) + sauce.storage.upload_file(config.getoption('apk')) def pytest_unconfigure(config): @@ -243,7 +253,7 @@ def pytest_runtest_makereport(item, call): def update_sauce_jobs(test_name, job_ids, passed): for job_id in job_ids.keys(): try: - tests.cloudbase_test_api.sauce.jobs.update_job(job_id, name=test_name, passed=passed) + sauce.jobs.update_job(job_id, name=test_name, passed=passed) except (RemoteDisconnected, SauceException): pass From 46d430b69ce7bb0d7c2bc58abbefd163e2daa474 Mon Sep 17 00:00:00 2001 From: andrey Date: Tue, 12 Jan 2021 14:17:22 +0100 Subject: [PATCH 07/11] [#11626] Group chat subtitle shows 'no members' Signed-off-by: andrey --- src/status_im/subs.cljs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/status_im/subs.cljs b/src/status_im/subs.cljs index 3a482eccfd..02f5346f23 100644 --- a/src/status_im/subs.cljs +++ b/src/status_im/subs.cljs @@ -774,6 +774,7 @@ (fn [current-chat] (select-keys current-chat [:community-id + :contacts :public? :group-chat :chat-type From eb1f1bf587a7a6ada01ca6dc94b31ff3c1fa219e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 13 Jan 2021 14:49:55 +0100 Subject: [PATCH 08/11] nix: fix building of status-go forks with different GH owner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: https://github.com/status-im/status-react/issues/11637 Signed-off-by: Jakub Sokołowski --- nix/status-go/source.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/status-go/source.nix b/nix/status-go/source.nix index 9d72ba858f..63052563aa 100644 --- a/nix/status-go/source.nix +++ b/nix/status-go/source.nix @@ -44,7 +44,8 @@ let shortRev = strings.substring 0 7 rev; rawVersion = versionJSON.version; cleanVersion = utils.sanitizeVersion versionJSON.version; - goPackagePath = "github.com/${owner}/${repo}"; + # Need to pretend this is from status-im to let Go build it. + goPackagePath = "github.com/status-im/${repo}"; src = fetchFromGitHub { inherit rev owner repo sha256; name = "${repo}-${shortRev}-source"; From 939ce8bef55992ac700783c70c51fcabedbbd50e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 27 Aug 2020 14:20:39 +0200 Subject: [PATCH 09/11] nix: Upgrade Android SDK, use nixpkgs master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes use of the refactoring of Android SDK done in: https://github.com/NixOS/nixpkgs/pull/89775 Which allows us to drop the use of our own fork of `nixpkgs`. Android Upgrades: * Build Tools - `29.0.2` to `30.0.3` * Platform Tools - `29.0.6` to `30.0.5` * NDK Bundle - `21.0.6113669` to `21.3.6528147` Other Upgrades: * Git - `2.28.0` to `2.29.2` * Go - `1.14.7` to `1.14.13` * Clojure - `1.10.1.645` to `1.10.1.763` * NodeJS - `12.18.3` to `12.20.1` * Yarn - `1.22.4` to `1.22.10` * OpenJDK - `8u265-ga` to `8u272-b10` * PatchElf - `0.11` to `0.12` * CoreUtils - `8.31` to `8.32` Signed-off-by: Jakub Sokołowski --- android/gradle.properties | 2 +- nix/deps/gradle/deps.json | 78 ++++++++++++++++++++------ nix/deps/gradle/deps.urls | 11 ++-- nix/overlay.nix | 2 +- nix/pkgs.nix | 8 +-- nix/pkgs/android-sdk/compose.nix | 29 ++++++++++ nix/pkgs/android-sdk/default.nix | 10 ++-- nix/pkgs/android-sdk/licensed.nix | 26 --------- nix/pkgs/android-sdk/pkgs.nix | 41 +++++--------- nix/pkgs/android-sdk/shell.nix | 34 ++++++----- nix/pkgs/go-maven-resolver/default.nix | 4 +- 11 files changed, 140 insertions(+), 105 deletions(-) create mode 100644 nix/pkgs/android-sdk/compose.nix delete mode 100644 nix/pkgs/android-sdk/licensed.nix diff --git a/android/gradle.properties b/android/gradle.properties index 0be4dc61b0..b48218288e 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -25,7 +25,7 @@ kotlinVersion=1.3.50 minSdkVersion=23 compileSdkVersion=29 targetSdkVersion=29 -buildToolsVersion=29.0.2 +buildToolsVersion=30.0.3 supportLibVersion=28.0.0 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix gradlePluginVersion=3.5.3 diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index 5df0de8157..7c3340497c 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -6195,6 +6195,20 @@ } }, + { + "path": "com/squareup/okio/okio/3.0.0-alpha.1/okio-3.0.0-alpha.1", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "ede5499134cc85b31b26bb11fd92f37956ffdd03", + "sha256": "1sb0pjwdj8lkq3k7fjwyxhsr22vbv8kzkp82dc4w6mmyxg8nlc91" + }, + "jar": { + "sha1": "8eb3bf1d692377b986f15c80de567d3440aba6ff", + "sha256": "0i3xf2scrzvszmfzxdsbspxqni2dr8yizdws4islxwyn9i9vfn0x" + } + }, + { "path": "com/sun/activation/all/1.2.0/all-1.2.0", "host": "https://repo.maven.apache.org/maven2", @@ -6424,16 +6438,16 @@ }, { - "path": "com/tunnelvisionlabs/antlr4-annotations/4.7.4/antlr4-annotations-4.7.4", + "path": "com/tunnelvisionlabs/antlr4-annotations/4.9.0/antlr4-annotations-4.9.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "899946ae1e442ce96717ba29324bb1e1cfabbd75", - "sha256": "08v9xp1jnfbiwxmi9yzngfd8c1hd8k3jwxlw145blvmsaa277hjf" + "sha1": "a14e662f4a9928d9242c9bc9fbbe512bb561121e", + "sha256": "0kdimdpbyw06jzzfqirib0zinl7bf3vi2xjid0aqlid866vln4gx" }, "jar": { - "sha1": "ef4fd3e3b21391e450cb770646a63342b7a3731b", - "sha256": "115m5xmn23n41pi0chxa6sqn4crc3b35daw2df8yvs6gkdmrhj6r" + "sha1": "ef4a4a6528a74cc24b6f7f0f1711876e32ab54b7", + "sha256": "0y6bicws9kmihq0zhjz8cqv4fcgjbbzbya3jnw3b92qpqga57l07" } }, @@ -6448,12 +6462,12 @@ }, { - "path": "com/tunnelvisionlabs/antlr4-master/4.7.4/antlr4-master-4.7.4", + "path": "com/tunnelvisionlabs/antlr4-master/4.9.0/antlr4-master-4.9.0", "host": "https://repo.maven.apache.org/maven2", "type": "pom", "pom": { - "sha1": "c43e8aaf8dfcdb32214659b0eafe3c637ca027f6", - "sha256": "1jgg3fjvi4gjjax3y5m3cwkx1ls3pyfgv2hsiwawji4x686v7ni2" + "sha1": "97a80ecc34d75a66b47753108406a0a1ef00a192", + "sha256": "108c4hbihlwvc8i18xznn72kr49xh8ibnl162rqiv7q5bgixcq1w" } }, @@ -6472,16 +6486,16 @@ }, { - "path": "com/tunnelvisionlabs/antlr4-runtime/4.7.4/antlr4-runtime-4.7.4", + "path": "com/tunnelvisionlabs/antlr4-runtime/4.9.0/antlr4-runtime-4.9.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "cf99a72f48caad2a9a738ba9d510ab169f8d60e5", - "sha256": "0s4ix238162i7z8zy84k5pl1cdb33sydvcnsdd68lw480d33i9vm" + "sha1": "97e6da6d8bc827b5d9f6590fbfa8565511a8da5e", + "sha256": "07vgcbrfplqg50zsn206ri39bzlpfv0arbdab77np24zp57svddf" }, "jar": { - "sha1": "ef96595a5467782f16a8cc638d73007325e92cca", - "sha256": "1vh2hhgp0xl1gazna2wbyxww5jjhim2yl153x56npampncg6wqf0" + "sha1": "17e19535a875a2a1014197d2bb35faeecf4e50f4", + "sha256": "1azzydlxx622galppy4rz5kxg5shia5k3nsvj0hgkvac0fl3n6g4" } }, @@ -7798,16 +7812,16 @@ }, { - "path": "org/checkerframework/checker-qual/3.8.0/checker-qual-3.8.0", + "path": "org/checkerframework/checker-qual/3.9.0/checker-qual-3.9.0", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "3436c1d07252b6eefe053d8ef380ab251813f359", - "sha256": "19rr49hgfsz3m2km7fjgn6ch25ylls9p2rm39zqb20dwsgi5jvby" + "sha1": "94ab20b57c0499eff800599a1f01255951fe053d", + "sha256": "0f21dv7qphlw2n0zc9x8gc6xcdnr8yijpsk6g1lc9ywxmnf27dj9" }, "jar": { - "sha1": "6b83e4a33220272c3a08991498ba9dc09519f190", - "sha256": "19nx8kxbrapy71w4gqknsglrx2ny8902cygqzhk9zsysbxm2x368" + "sha1": "1ec919767a94db1572d2f2077b693a4275fa711a", + "sha256": "1rrsp84mrybzm2a7i01xlfrd4vqpab0nbnwhlphbjzxpqdg44j1i" } }, @@ -8731,6 +8745,20 @@ } }, + { + "path": "org/jetbrains/kotlin/kotlin-stdlib-common/1.4.20/kotlin-stdlib-common-1.4.20", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "ae20e1aa54cb2713d1c43f227c8c290a136be427", + "sha256": "0agl1xsrlw5mqaa35h4n17m6nf2978qqjhh2r7149m2ppbmhcmvw" + }, + "jar": { + "sha1": "c6761d7805b5312302f2bbd78cda68c976ce0c70", + "sha256": "0843xkdkdjv05zar21h3dqgbv4prg8pkgjf9hs143vpg7jdjq4d7" + } + }, + { "path": "org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71", "host": "https://repo.maven.apache.org/maven2", @@ -8983,6 +9011,20 @@ } }, + { + "path": "org/jetbrains/kotlin/kotlin-stdlib/1.4.20/kotlin-stdlib-1.4.20", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "4009b36445a3299714e6401489b04f467ad77f90", + "sha256": "0ji3pjccr662xcv32pahw47jwx164vdwxjff8cm5i3c2j8gyz19r" + }, + "jar": { + "sha1": "9be77b243a362b745e365f286627b8724337009c", + "sha256": "0mp6lczsxgrbqm0mfak470al7ga21br2h7qysj2b1768rnjivaxq" + } + }, + { "path": "org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50", "host": "https://repo.maven.apache.org/maven2", diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index da5c30f113..c4356df43f 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -448,6 +448,7 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom +https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.0.0-alpha.1/okio-3.0.0-alpha.1.pom https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom https://repo.maven.apache.org/maven2/com/sun/activation/all/2.0.0/all-2.0.0.pom https://repo.maven.apache.org/maven2/com/sun/activation/jakarta.activation/2.0.0/jakarta.activation-2.0.0.pom @@ -468,11 +469,11 @@ https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/FastInfoset/2.0.0/F https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/1.2.13/fastinfoset-project-1.2.13.pom https://repo.maven.apache.org/maven2/com/sun/xml/fastinfoset/fastinfoset-project/2.0.0/fastinfoset-project-2.0.0.pom https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.5/antlr4-annotations-4.5.pom -https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.7.4/antlr4-annotations-4.7.4.pom +https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-annotations/4.9.0/antlr4-annotations-4.9.0.pom https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.5/antlr4-master-4.5.pom -https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.7.4/antlr4-master-4.7.4.pom +https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-master/4.9.0/antlr4-master-4.9.0.pom https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-runtime/4.5/antlr4-runtime-4.5.pom -https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-runtime/4.7.4/antlr4-runtime-4.7.4.pom +https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4-runtime/4.9.0/antlr4-runtime-4.9.0.pom https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4/4.5/antlr4-4.5.pom https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/3.4.3/gradle-download-task-3.4.3.pom https://repo.maven.apache.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom @@ -581,7 +582,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.48/bcprov https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.pom https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom -https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.8.0/checker-qual-3.8.0.pom +https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.9.0/checker-qual-3.9.0.pom https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom @@ -652,6 +653,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.50/kotlin-stdlib-common-1.3.50.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.10/kotlin-stdlib-common-1.4.10.pom +https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.20/kotlin-stdlib-common-1.4.20.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.21/kotlin-stdlib-jdk7-1.3.21.pom @@ -670,6 +672,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.21/k https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.50/kotlin-stdlib-1.3.50.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotlin-stdlib-1.4.10.pom +https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.20/kotlin-stdlib-1.4.20.pom https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50.pom https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-api/5.5.2/junit-jupiter-api-5.5.2.pom https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-commons/1.5.2/junit-platform-commons-1.5.2.pom diff --git a/nix/overlay.nix b/nix/overlay.nix index 6293534b9c..abea519aca 100644 --- a/nix/overlay.nix +++ b/nix/overlay.nix @@ -43,7 +43,7 @@ in { # Android environement androidEnvCustom = callPackage ./pkgs/android-sdk { }; - androidPkgs = self.androidEnvCustom.licensedPkgs; + androidPkgs = self.androidEnvCustom.pkgs; androidShell = self.androidEnvCustom.shell; # Custom packages diff --git a/nix/pkgs.nix b/nix/pkgs.nix index 63f3425113..b7c9163eda 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -8,13 +8,13 @@ let # For testing local version of nixpkgs #nixpkgsSrc = (import { }).lib.cleanSource "/home/jakubgs/work/nixpkgs"; - # Our own nixpkgs fork with custom fixes + # We follow the master branch of official nixpkgs. nixpkgsSrc = fetchFromGitHub { name = "nixpkgs-source"; - owner = "status-im"; + owner = "NixOS"; repo = "nixpkgs"; - rev = "3355743cfd8d89cfa8d3b8e6d40c48e62e72d36a"; - sha256 = "1l7559m3xkzwkm202rkjq3a8cz52k7z9vxn9y2adc30cp197wc82"; + rev = "51894963cbdc41f0cd8f571b7bcf79437d940355"; + sha256 = "13nfghpnhnr5hbbibsrq172g1rdibd8lycis7ncvf9yxd4rdlf7b"; # To get the compressed Nix sha256, use: # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz }; diff --git a/nix/pkgs/android-sdk/compose.nix b/nix/pkgs/android-sdk/compose.nix new file mode 100644 index 0000000000..8207bd0b61 --- /dev/null +++ b/nix/pkgs/android-sdk/compose.nix @@ -0,0 +1,29 @@ +# +# This Nix expression centralizes the configuration +# for the Android development environment. +# + +{ stdenv, config, callPackage, androidenv, openjdk, mkShell }: + +androidenv.composeAndroidPackages { + toolsVersion = "26.1.1"; + platformToolsVersion = "30.0.5"; + buildToolsVersions = [ "30.0.3" ]; + includeEmulator = false; + includeSources = false; + platformVersions = [ "29" ]; + includeSystemImages = false; + systemImageTypes = [ "default" ]; + cmakeVersions = [ "3.10.2" ]; + includeNDK = true; + ndkVersion = "21.3.6528147"; + useGoogleAPIs = false; + useGoogleTVAddOns = false; + includeExtras = [ + "extras;android;m2repository" + "extras;google;m2repository" + ]; + # The "android-sdk-license" license is accepted + # by setting android_sdk.accept_license = true. + extraLicenses = []; +} diff --git a/nix/pkgs/android-sdk/default.nix b/nix/pkgs/android-sdk/default.nix index a20ef64293..7c7233d658 100644 --- a/nix/pkgs/android-sdk/default.nix +++ b/nix/pkgs/android-sdk/default.nix @@ -3,12 +3,12 @@ # for the Android development environment. # -{ callPackage }: +{ callPackage, stdenv, writeScript }: let - pkgs = callPackage ./pkgs.nix { }; - shell = callPackage ./shell.nix { }; - licensedPkgs = callPackage ./licensed.nix { }; + compose = callPackage ./compose.nix { }; + pkgs = callPackage ./pkgs.nix { inherit compose; }; + shell = callPackage ./shell.nix { androidPkgs = pkgs; }; in { - inherit pkgs licensedPkgs shell; + inherit compose pkgs shell; } diff --git a/nix/pkgs/android-sdk/licensed.nix b/nix/pkgs/android-sdk/licensed.nix deleted file mode 100644 index 0c01f8da58..0000000000 --- a/nix/pkgs/android-sdk/licensed.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config, stdenv, callPackage }: - -let - androidPkgs = callPackage ./pkgs.nix { }; -in - # Licensed Android Environment as a separate derivation - stdenv.mkDerivation rec { - name = "licensed-android-sdk"; - version = "licensed"; - phases = [ "installPhase" "licensePhase" ]; - installPhase = '' - mkdir -p $out/libexec/android-sdk - ln -s "${androidPkgs.androidsdk}/bin" $out/bin - for d in ${androidPkgs.androidsdk}/libexec/android-sdk/*; do - ln -s $d $out/$(basename $d) - done - ''; - licensePhase = stdenv.lib.optionalString config.android_sdk.accept_license '' - mkdir -p $out/licenses - echo -e "\n601085b94cd77f0b54ff86406957099ebe79c4d6" > "$out/licenses/android-googletv-license" - echo -e "\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$out/licenses/android-sdk-license" - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$out/licenses/android-sdk-preview-license" - echo -e "\nd975f751698a77b662f1254ddbeed3901e976f5a" > "$out/licenses/intel-android-extra-license" - echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5c47d97a" > "$out/licenses/google-gdk-license" - ''; - } diff --git a/nix/pkgs/android-sdk/pkgs.nix b/nix/pkgs/android-sdk/pkgs.nix index d51a4ffcc4..78dfdd7ce5 100644 --- a/nix/pkgs/android-sdk/pkgs.nix +++ b/nix/pkgs/android-sdk/pkgs.nix @@ -1,28 +1,17 @@ -# -# This Nix expression centralizes the configuration -# for the Android development environment. -# +{ stdenv, compose }: -{ stdenv, config, callPackage, androidenv, openjdk, mkShell }: - -androidenv.composeAndroidPackages { - toolsVersion = "26.1.1"; - platformToolsVersion = "29.0.6"; - buildToolsVersions = [ "29.0.2" ]; - includeEmulator = false; - platformVersions = [ "29" ]; - includeSources = false; - includeDocs = false; - includeSystemImages = false; - systemImageTypes = [ "default" ]; - lldbVersions = [ "3.1.4508709" ]; - cmakeVersions = [ "3.10.2" ]; - includeNDK = true; - ndkVersion = "21.0.6113669"; - useGoogleAPIs = false; - useGoogleTVAddOns = false; - includeExtras = [ - "extras;android;m2repository" - "extras;google;m2repository" - ]; +# +# This derivation simply symlinks some stuff to get +# shorter paths as libexec/android-sdk is quite the mouthful. +# +stdenv.mkDerivation { + name = "${compose.androidsdk.name}-mod"; + phases = [ "symlinkPhase" ]; + symlinkPhase = '' + mkdir -p $out + ln -s "${compose.androidsdk}/bin" $out/bin + for d in ${compose.androidsdk}/libexec/android-sdk/*; do + ln -s $d $out/$(basename $d) + done + ''; } diff --git a/nix/pkgs/android-sdk/shell.nix b/nix/pkgs/android-sdk/shell.nix index 76129a2867..b204623a78 100644 --- a/nix/pkgs/android-sdk/shell.nix +++ b/nix/pkgs/android-sdk/shell.nix @@ -1,21 +1,19 @@ -{ mkShell, callPackage, openjdk }: +{ mkShell, openjdk, androidPkgs }: -let - licensedPkgs = callPackage ./licensed.nix { }; -in - mkShell { - shellHook = '' - export JAVA_HOME="${openjdk}" +mkShell { + name = "android-env-shell"; + shellHook = '' + export JAVA_HOME="${openjdk}" - export ANDROID_HOME="${licensedPkgs}" - export ANDROID_SDK_ROOT="${licensedPkgs}" - export ANDROID_NDK_ROOT="${licensedPkgs}/ndk-bundle" + export ANDROID_HOME="${androidPkgs}" + export ANDROID_SDK_ROOT="${androidPkgs}" + export ANDROID_NDK_ROOT="${androidPkgs}/ndk-bundle" - export PATH="$ANDROID_HOME/bin:$PATH" - export PATH="$ANDROID_NDK_ROOT:$PATH" - export PATH="$ANDROID_SDK_ROOT/tools:$PATH" - export PATH="$ANDROID_SDK_ROOT/tools/bin:$PATH" - export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH" - export PATH="$ANDROID_SDK_ROOT/build-tools:$PATH" - ''; - } + export PATH="$ANDROID_HOME/bin:$PATH" + export PATH="$ANDROID_NDK_ROOT:$PATH" + export PATH="$ANDROID_SDK_ROOT/tools:$PATH" + export PATH="$ANDROID_SDK_ROOT/tools/bin:$PATH" + export PATH="$ANDROID_SDK_ROOT/platform-tools:$PATH" + export PATH="$ANDROID_SDK_ROOT/build-tools:$PATH" + ''; +} diff --git a/nix/pkgs/go-maven-resolver/default.nix b/nix/pkgs/go-maven-resolver/default.nix index 4eb790b01a..c8922d920f 100644 --- a/nix/pkgs/go-maven-resolver/default.nix +++ b/nix/pkgs/go-maven-resolver/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGo114Package, fetchFromGitHub }: let inherit (lib) strings; -in buildGoPackage rec { +in buildGo114Package rec { pname = "go-maven-resolver"; version = strings.substring 0 7 rev; owner = "status-im"; From abac5247bf0bfb2688efbf4082a28f1d21b969cd Mon Sep 17 00:00:00 2001 From: andrey Date: Thu, 7 Jan 2021 13:59:57 +0100 Subject: [PATCH 10/11] RN 63 and xcode12 Signed-off-by: andrey --- .flowconfig | 2 +- android/gradle.properties | 2 +- ci/Jenkinsfile.ios | 2 +- ios/Podfile | 82 +-- ios/Podfile.lock | 521 ++++++++--------- ios/StatusIm.xcodeproj/project.pbxproj | 91 ++- ios/StatusIm/AppDelegate.m | 16 - ios/StatusIm/Base.lproj/LaunchScreen.xib | 42 -- ios/StatusIm/LaunchScreen.storyboard | 58 ++ .../RCTStatus.xcodeproj/project.pbxproj | 6 +- nix/deps/gradle/README.md | 3 +- nix/deps/gradle/deps.json | 340 ++++++++++-- nix/deps/gradle/deps.list | 35 +- nix/deps/gradle/deps.urls | 31 +- package.json | 6 +- yarn.lock | 525 +++++++++--------- 16 files changed, 976 insertions(+), 786 deletions(-) delete mode 100644 ios/StatusIm/Base.lproj/LaunchScreen.xib create mode 100644 ios/StatusIm/LaunchScreen.storyboard diff --git a/.flowconfig b/.flowconfig index 46679f2b3f..9beb474135 100644 --- a/.flowconfig +++ b/.flowconfig @@ -94,4 +94,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(\\)? *\\(site=[a-z,_]* suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy [version] -^0.105.0 +^0.122.0 diff --git a/android/gradle.properties b/android/gradle.properties index b48218288e..c7914744fe 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -50,4 +50,4 @@ org.gradle.jvmargs=-Xmx8704M versionCode=9999 # Flipper -FLIPPER_VERSION=0.35.0 +FLIPPER_VERSION=0.54.0 diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index e2b6ddcd11..6c7dfadac7 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,7 +1,7 @@ library 'status-react-jenkins@v1.2.9' pipeline { - agent { label 'macos-xcode-11.5' } + agent { label 'macos-xcode-12.3' } parameters { string( diff --git a/ios/Podfile b/ios/Podfile index 312878c51b..83654164cb 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,81 +1,13 @@ -platform :ios, '9.0' +platform :ios, '10.0' + +require_relative '../node_modules/react-native/scripts/react_native_pods' require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules' -def add_flipper_pods!(versions = {}) - versions['Flipper'] ||= '~> 0.37.0' - versions['DoubleConversion'] ||= '1.1.7' - versions['Flipper-Folly'] ||= '~> 2.1' - versions['Flipper-Glog'] ||= '0.3.6' - versions['Flipper-PeerTalk'] ||= '~> 0.0.4' - versions['Flipper-RSocket'] ||= '~> 1.0' - - pod 'FlipperKit', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/SKIOSNetworkPlugin', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitUserDefaultsPlugin', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitReactPlugin', versions['Flipper'], :configuration => 'Debug' - - # List all transitive dependencies for FlipperKit pods - # to avoid them being linked in Release builds - pod 'Flipper', versions['Flipper'], :configuration => 'Debug' - pod 'Flipper-DoubleConversion', versions['DoubleConversion'], :configuration => 'Debug' - pod 'Flipper-Folly', versions['Flipper-Folly'], :configuration => 'Debug' - pod 'Flipper-Glog', versions['Flipper-Glog'], :configuration => 'Debug' - pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configuration => 'Debug' - pod 'Flipper-RSocket', versions['Flipper-RSocket'], :configuration => 'Debug' - pod 'FlipperKit/Core', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/CppBridge', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FBCxxFollyDynamicConvert', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FBDefines', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FKPortForwarding', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitHighlightOverlay', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitLayoutTextSearchable', versions['Flipper'], :configuration => 'Debug' - pod 'FlipperKit/FlipperKitNetworkPlugin', versions['Flipper'], :configuration => 'Debug' -end - -# Post Install processing for Flipper -def flipper_post_install(installer) - installer.pods_project.targets.each do |target| - if target.name == 'YogaKit' - target.build_configurations.each do |config| - config.build_settings['SWIFT_VERSION'] = '4.1' - end - end - end -end - abstract_target 'Status' do # Pods for StatusQuo - pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector" - pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec" - pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired" - pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety" - pod 'React', :path => '../node_modules/react-native/' - pod 'React-Core', :path => '../node_modules/react-native/' - pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules' - pod 'React-Core/DevSupport', :path => '../node_modules/react-native/' - pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS' - pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation' - pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob' - pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image' - pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS' - pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network' - pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings' - pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text' - pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration' - pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/' + config = use_native_modules! - pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact' - pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi' - pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor' - pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector' - pod 'ReactCommon/callinvoker', :path => "../node_modules/react-native/ReactCommon" - pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon" - pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga', :modular_headers => true - - pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec' - pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec' - pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec' + use_react_native!(:path => config["reactNativePath"]) pod 'react-native-image-resizer', :path => '../node_modules/react-native-image-resizer' pod 'SQLCipher', '~>3.0' @@ -95,11 +27,11 @@ abstract_target 'Status' do target 'StatusImPR' do end - add_flipper_pods! + use_flipper! post_install do |installer| flipper_post_install(installer) end use_native_modules! -end +end \ No newline at end of file diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 340eb5e359..bd1f913672 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -5,66 +5,66 @@ PODS: - CocoaAsyncSocket (7.6.4) - CocoaLibEvent (1.0.0) - DoubleConversion (1.1.6) - - FBLazyVector (0.62.2) - - FBReactNativeSpec (0.62.2): - - Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.2) - - RCTTypeSafety (= 0.62.2) - - React-Core (= 0.62.2) - - React-jsi (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - Flipper (0.37.0): + - FBLazyVector (0.63.4) + - FBReactNativeSpec (0.63.4): + - Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.4) + - RCTTypeSafety (= 0.63.4) + - React-Core (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - Flipper (0.54.0): - Flipper-Folly (~> 2.2) - Flipper-RSocket (~> 1.1) - Flipper-DoubleConversion (1.1.7) - - Flipper-Folly (2.2.0): + - Flipper-Folly (2.3.0): - boost-for-react-native - CocoaLibEvent (~> 1.0) - Flipper-DoubleConversion - Flipper-Glog - - OpenSSL-Universal (= 1.0.2.19) + - OpenSSL-Universal (= 1.0.2.20) - Flipper-Glog (0.3.6) - Flipper-PeerTalk (0.0.4) - Flipper-RSocket (1.1.0): - Flipper-Folly (~> 2.2) - - FlipperKit (0.37.0): - - FlipperKit/Core (= 0.37.0) - - FlipperKit/Core (0.37.0): - - Flipper (~> 0.37.0) + - FlipperKit (0.54.0): + - FlipperKit/Core (= 0.54.0) + - FlipperKit/Core (0.54.0): + - Flipper (~> 0.54.0) - FlipperKit/CppBridge - FlipperKit/FBCxxFollyDynamicConvert - FlipperKit/FBDefines - FlipperKit/FKPortForwarding - - FlipperKit/CppBridge (0.37.0): - - Flipper (~> 0.37.0) - - FlipperKit/FBCxxFollyDynamicConvert (0.37.0): + - FlipperKit/CppBridge (0.54.0): + - Flipper (~> 0.54.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.54.0): - Flipper-Folly (~> 2.2) - - FlipperKit/FBDefines (0.37.0) - - FlipperKit/FKPortForwarding (0.37.0): + - FlipperKit/FBDefines (0.54.0) + - FlipperKit/FKPortForwarding (0.54.0): - CocoaAsyncSocket (~> 7.6) - Flipper-PeerTalk (~> 0.0.4) - - FlipperKit/FlipperKitHighlightOverlay (0.37.0) - - FlipperKit/FlipperKitLayoutPlugin (0.37.0): + - FlipperKit/FlipperKitHighlightOverlay (0.54.0) + - FlipperKit/FlipperKitLayoutPlugin (0.54.0): - FlipperKit/Core - FlipperKit/FlipperKitHighlightOverlay - FlipperKit/FlipperKitLayoutTextSearchable - YogaKit (~> 1.18) - - FlipperKit/FlipperKitLayoutTextSearchable (0.37.0) - - FlipperKit/FlipperKitNetworkPlugin (0.37.0): + - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0) + - FlipperKit/FlipperKitNetworkPlugin (0.54.0): - FlipperKit/Core - - FlipperKit/FlipperKitReactPlugin (0.37.0): + - FlipperKit/FlipperKitReactPlugin (0.54.0): - FlipperKit/Core - - FlipperKit/FlipperKitUserDefaultsPlugin (0.37.0): + - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0): - FlipperKit/Core - - FlipperKit/SKIOSNetworkPlugin (0.37.0): + - FlipperKit/SKIOSNetworkPlugin (0.54.0): - FlipperKit/Core - FlipperKit/FlipperKitNetworkPlugin - - Folly (2018.10.22.00): + - Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion - - Folly/Default (= 2018.10.22.00) + - Folly/Default (= 2020.01.13.00) - glog - - Folly/Default (2018.10.22.00): + - Folly/Default (2020.01.13.00): - boost-for-react-native - DoubleConversion - glog @@ -78,176 +78,179 @@ PODS: - libwebp/mux (1.1.0): - libwebp/demux - libwebp/webp (1.1.0) - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) + - OpenSSL-Universal (1.0.2.20): + - OpenSSL-Universal/Static (= 1.0.2.20) + - OpenSSL-Universal/Static (1.0.2.20) - Permission-Camera (2.1.5): - RNPermissions - Permission-Microphone (2.1.5): - RNPermissions - - RCTRequired (0.62.2) - - RCTTypeSafety (0.62.2): - - FBLazyVector (= 0.62.2) - - Folly (= 2018.10.22.00) - - RCTRequired (= 0.62.2) - - React-Core (= 0.62.2) - - React (0.62.2): - - React-Core (= 0.62.2) - - React-Core/DevSupport (= 0.62.2) - - React-Core/RCTWebSocket (= 0.62.2) - - React-RCTActionSheet (= 0.62.2) - - React-RCTAnimation (= 0.62.2) - - React-RCTBlob (= 0.62.2) - - React-RCTImage (= 0.62.2) - - React-RCTLinking (= 0.62.2) - - React-RCTNetwork (= 0.62.2) - - React-RCTSettings (= 0.62.2) - - React-RCTText (= 0.62.2) - - React-RCTVibration (= 0.62.2) - - React-Core (0.62.2): - - Folly (= 2018.10.22.00) + - RCTRequired (0.63.4) + - RCTTypeSafety (0.63.4): + - FBLazyVector (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.4) + - React-Core (= 0.63.4) + - React (0.63.4): + - React-Core (= 0.63.4) + - React-Core/DevSupport (= 0.63.4) + - React-Core/RCTWebSocket (= 0.63.4) + - React-RCTActionSheet (= 0.63.4) + - React-RCTAnimation (= 0.63.4) + - React-RCTBlob (= 0.63.4) + - React-RCTImage (= 0.63.4) + - React-RCTLinking (= 0.63.4) + - React-RCTNetwork (= 0.63.4) + - React-RCTSettings (= 0.63.4) + - React-RCTText (= 0.63.4) + - React-RCTVibration (= 0.63.4) + - React-callinvoker (0.63.4) + - React-Core (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-Core/Default (= 0.62.2) - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-Core/Default (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/CoreModulesHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/CoreModulesHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/Default (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/Default (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/DevSupport (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/DevSupport (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-Core/Default (= 0.62.2) - - React-Core/RCTWebSocket (= 0.62.2) - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) - - React-jsinspector (= 0.62.2) + - React-Core/Default (= 0.63.4) + - React-Core/RCTWebSocket (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) + - React-jsinspector (= 0.63.4) - Yoga - - React-Core/RCTActionSheetHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTActionSheetHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTAnimationHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTAnimationHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTBlobHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTBlobHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTImageHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTImageHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTLinkingHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTLinkingHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTNetworkHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTNetworkHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTSettingsHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTSettingsHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTTextHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTTextHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTVibrationHeaders (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTVibrationHeaders (0.63.4): + - Folly (= 2020.01.13.00) - glog - React-Core/Default - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-Core/RCTWebSocket (0.62.2): - - Folly (= 2018.10.22.00) + - React-Core/RCTWebSocket (0.63.4): + - Folly (= 2020.01.13.00) - glog - - React-Core/Default (= 0.62.2) - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsiexecutor (= 0.62.2) + - React-Core/Default (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsiexecutor (= 0.63.4) - Yoga - - React-CoreModules (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.2) - - React-Core/CoreModulesHeaders (= 0.62.2) - - React-RCTImage (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - React-cxxreact (0.62.2): + - React-CoreModules (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/CoreModulesHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - React-RCTImage (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-cxxreact (0.63.4): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-jsinspector (= 0.62.2) - - React-jsi (0.62.2): + - React-callinvoker (= 0.63.4) + - React-jsinspector (= 0.63.4) + - React-jsi (0.63.4): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-jsi/Default (= 0.62.2) - - React-jsi/Default (0.62.2): + - React-jsi/Default (= 0.63.4) + - React-jsi/Default (0.63.4): - boost-for-react-native (= 1.63.0) - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-jsiexecutor (0.62.2): + - React-jsiexecutor (0.63.4): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - React-jsinspector (0.62.2) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) + - React-jsinspector (0.63.4) - react-native-background-timer (2.2.0): - React - react-native-camera-kit (8.0.4): @@ -270,65 +273,66 @@ PODS: - React - react-native-webview (10.9.2): - React-Core - - React-RCTActionSheet (0.62.2): - - React-Core/RCTActionSheetHeaders (= 0.62.2) - - React-RCTAnimation (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.2) - - React-Core/RCTAnimationHeaders (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - React-RCTBlob (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - Folly (= 2018.10.22.00) - - React-Core/RCTBlobHeaders (= 0.62.2) - - React-Core/RCTWebSocket (= 0.62.2) - - React-jsi (= 0.62.2) - - React-RCTNetwork (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - React-RCTImage (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.2) - - React-Core/RCTImageHeaders (= 0.62.2) - - React-RCTNetwork (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - React-RCTLinking (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - React-Core/RCTLinkingHeaders (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - React-RCTNetwork (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.2) - - React-Core/RCTNetworkHeaders (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - React-RCTSettings (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - Folly (= 2018.10.22.00) - - RCTTypeSafety (= 0.62.2) - - React-Core/RCTSettingsHeaders (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - React-RCTText (0.62.2): - - React-Core/RCTTextHeaders (= 0.62.2) - - React-RCTVibration (0.62.2): - - FBReactNativeSpec (= 0.62.2) - - Folly (= 2018.10.22.00) - - React-Core/RCTVibrationHeaders (= 0.62.2) - - ReactCommon/turbomodule/core (= 0.62.2) - - ReactCommon/callinvoker (0.62.2): + - React-RCTActionSheet (0.63.4): + - React-Core/RCTActionSheetHeaders (= 0.63.4) + - React-RCTAnimation (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTAnimationHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTBlob (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - React-Core/RCTBlobHeaders (= 0.63.4) + - React-Core/RCTWebSocket (= 0.63.4) + - React-jsi (= 0.63.4) + - React-RCTNetwork (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTImage (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTImageHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - React-RCTNetwork (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTLinking (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - React-Core/RCTLinkingHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTNetwork (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTNetworkHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTSettings (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.4) + - React-Core/RCTSettingsHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - React-RCTText (0.63.4): + - React-Core/RCTTextHeaders (= 0.63.4) + - React-RCTVibration (0.63.4): + - FBReactNativeSpec (= 0.63.4) + - Folly (= 2020.01.13.00) + - React-Core/RCTVibrationHeaders (= 0.63.4) + - React-jsi (= 0.63.4) + - ReactCommon/turbomodule/core (= 0.63.4) + - ReactCommon/turbomodule/core (0.63.4): - DoubleConversion - - Folly (= 2018.10.22.00) + - Folly (= 2020.01.13.00) - glog - - React-cxxreact (= 0.62.2) - - ReactCommon/turbomodule/core (0.62.2): - - DoubleConversion - - Folly (= 2018.10.22.00) - - glog - - React-Core (= 0.62.2) - - React-cxxreact (= 0.62.2) - - React-jsi (= 0.62.2) - - ReactCommon/callinvoker (= 0.62.2) + - React-callinvoker (= 0.63.4) + - React-Core (= 0.63.4) + - React-cxxreact (= 0.63.4) + - React-jsi (= 0.63.4) - ReactNativeAudioToolkit (2.0.3): - React - ReactNativeDarkMode (0.2.2): @@ -374,9 +378,9 @@ PODS: - React - RNSVG (9.13.6): - React - - SDWebImage (5.9.3): - - SDWebImage/Core (= 5.9.3) - - SDWebImage/Core (5.9.3) + - SDWebImage (5.10.0): + - SDWebImage/Core (= 5.10.0) + - SDWebImage/Core (5.10.0) - SDWebImageWebPCoder (0.6.1): - libwebp (~> 1.0) - SDWebImage/Core (~> 5.7) @@ -386,7 +390,7 @@ PODS: - SQLCipher/standard (3.4.2): - SQLCipher/common - SSZipArchive (2.2.3) - - TOCropViewController (2.5.4) + - TOCropViewController (2.5.5) - TouchID (4.4.1): - React - Yoga (1.14.0) @@ -398,25 +402,25 @@ DEPENDENCIES: - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) - FBReactNativeSpec (from `../node_modules/react-native/Libraries/FBReactNativeSpec`) - - Flipper (~> 0.37.0) + - Flipper (~> 0.54.0) - Flipper-DoubleConversion (= 1.1.7) - - Flipper-Folly (~> 2.1) + - Flipper-Folly (~> 2.2) - Flipper-Glog (= 0.3.6) - Flipper-PeerTalk (~> 0.0.4) - - Flipper-RSocket (~> 1.0) - - FlipperKit (~> 0.37.0) - - FlipperKit/Core (~> 0.37.0) - - FlipperKit/CppBridge (~> 0.37.0) - - FlipperKit/FBCxxFollyDynamicConvert (~> 0.37.0) - - FlipperKit/FBDefines (~> 0.37.0) - - FlipperKit/FKPortForwarding (~> 0.37.0) - - FlipperKit/FlipperKitHighlightOverlay (~> 0.37.0) - - FlipperKit/FlipperKitLayoutPlugin (~> 0.37.0) - - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.37.0) - - FlipperKit/FlipperKitNetworkPlugin (~> 0.37.0) - - FlipperKit/FlipperKitReactPlugin (~> 0.37.0) - - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.37.0) - - FlipperKit/SKIOSNetworkPlugin (~> 0.37.0) + - Flipper-RSocket (~> 1.1) + - FlipperKit (~> 0.54.0) + - FlipperKit/Core (~> 0.54.0) + - FlipperKit/CppBridge (~> 0.54.0) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0) + - FlipperKit/FBDefines (~> 0.54.0) + - FlipperKit/FKPortForwarding (~> 0.54.0) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0) + - FlipperKit/FlipperKitReactPlugin (~> 0.54.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0) + - FlipperKit/SKIOSNetworkPlugin (~> 0.54.0) - Folly (from `../node_modules/react-native/third-party-podspecs/Folly.podspec`) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - Permission-Camera (from `../node_modules/react-native-permissions/ios/Camera.podspec`) @@ -424,6 +428,7 @@ DEPENDENCIES: - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) - React (from `../node_modules/react-native/`) + - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) - React-Core (from `../node_modules/react-native/`) - React-Core/DevSupport (from `../node_modules/react-native/`) - React-Core/RCTWebSocket (from `../node_modules/react-native/`) @@ -452,7 +457,6 @@ DEPENDENCIES: - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) - React-RCTText (from `../node_modules/react-native/Libraries/Text`) - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) - - ReactCommon/callinvoker (from `../node_modules/react-native/ReactCommon`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - "ReactNativeAudioToolkit (from `../node_modules/@react-native-community/audio-toolkit`)" - ReactNativeDarkMode (from `../node_modules/react-native-dark-mode`) @@ -521,6 +525,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/Libraries/TypeSafety" React: :path: "../node_modules/react-native/" + React-callinvoker: + :path: "../node_modules/react-native/ReactCommon/callinvoker" React-Core: :path: "../node_modules/react-native/" React-CoreModules: @@ -621,31 +627,32 @@ SPEC CHECKSUMS: BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872 CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845 CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f - DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2 - FBLazyVector: 4aab18c93cd9546e4bfed752b4084585eca8b245 - FBReactNativeSpec: 5465d51ccfeecb7faa12f9ae0024f2044ce4044e - Flipper: 1670db365568191bd123a0c905b834e77ba9e3d3 + DoubleConversion: cde416483dac037923206447da6e1454df403714 + FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e + FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e + Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365 Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 - Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3 + Flipper-Folly: e4493b013c02d9347d5e0cb4d128680239f6c78a Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7 - FlipperKit: afd4259ef9eadeeb2d30250b37d95cb3b6b97a69 - Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51 - glog: d6cca0516fb0ca3697a5b2e199ea83dfc7133411 + FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d + Folly: b73c3869541e86821df3c387eb0af5f65addfab4 + glog: ce8f843ca00c0ef98518f064bdf5d160d88182c7 libwebp: 946cb3063cea9236285f7e9a8505d806d30e07f3 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 + OpenSSL-Universal: ff34003318d5e1163e9529b08470708e389ffcdd Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b Permission-Microphone: 0ffabc3fe1c75cfb260525ee3f529383c9f4368c - RCTRequired: cec6a34b3ac8a9915c37e7e4ad3aa74726ce4035 - RCTTypeSafety: 93006131180074cffa227a1075802c89a49dd4ce - React: 29a8b1a02bd764fb7644ef04019270849b9a7ac3 - React-Core: b12bffb3f567fdf99510acb716ef1abd426e0e05 - React-CoreModules: 4a9b87bbe669d6c3173c0132c3328e3b000783d0 - React-cxxreact: e65f9c2ba0ac5be946f53548c1aaaee5873a8103 - React-jsi: b6dc94a6a12ff98e8877287a0b7620d365201161 - React-jsiexecutor: 1540d1c01bb493ae3124ed83351b1b6a155db7da - React-jsinspector: 512e560d0e985d0e8c479a54a4e5c147a9c83493 + RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e + RCTTypeSafety: 8c9c544ecbf20337d069e4ae7fd9a377aadf504b + React: b0a957a2c44da4113b0c4c9853d8387f8e64e615 + React-callinvoker: c3f44dd3cb195b6aa46621fff95ded79d59043fe + React-Core: d3b2a1ac9a2c13c3bcde712d9281fc1c8a5b315b + React-CoreModules: 0581ff36cb797da0943d424f69e7098e43e9be60 + React-cxxreact: c1480d4fda5720086c90df537ee7d285d4c57ac3 + React-jsi: a0418934cf48f25b485631deb27c64dc40fb4c31 + React-jsiexecutor: 93bd528844ad21dc07aab1c67cb10abae6df6949 + React-jsinspector: 58aef7155bc9a9683f5b60b35eccea8722a4f53a react-native-background-timer: 1f7d560647b40e6a60b01c452ba29c54bf581fc4 react-native-camera-kit: 498a6d111a904834e0824e9073cfadef7303235f react-native-cameraroll: ac69828fc43b9dbf92149714fd739577d38e4448 @@ -657,16 +664,16 @@ SPEC CHECKSUMS: react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4 react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865 react-native-webview: 4e96d493f9f90ba4f03b28933f30b2964df07e39 - React-RCTActionSheet: f41ea8a811aac770e0cc6e0ad6b270c644ea8b7c - React-RCTAnimation: 49ab98b1c1ff4445148b72a3d61554138565bad0 - React-RCTBlob: a332773f0ebc413a0ce85942a55b064471587a71 - React-RCTImage: e70be9b9c74fe4e42d0005f42cace7981c994ac3 - React-RCTLinking: c1b9739a88d56ecbec23b7f63650e44672ab2ad2 - React-RCTNetwork: 73138b6f45e5a2768ad93f3d57873c2a18d14b44 - React-RCTSettings: 6e3738a87e21b39a8cb08d627e68c44acf1e325a - React-RCTText: fae545b10cfdb3d247c36c56f61a94cfd6dba41d - React-RCTVibration: 4356114dbcba4ce66991096e51a66e61eda51256 - ReactCommon: ed4e11d27609d571e7eee8b65548efc191116eb3 + React-RCTActionSheet: 89a0ca9f4a06c1f93c26067af074ccdce0f40336 + React-RCTAnimation: 1bde3ecc0c104c55df246eda516e0deb03c4e49b + React-RCTBlob: a97d378b527740cc667e03ebfa183a75231ab0f0 + React-RCTImage: c1b1f2d3f43a4a528c8946d6092384b5c880d2f0 + React-RCTLinking: 35ae4ab9dc0410d1fcbdce4d7623194a27214fb2 + React-RCTNetwork: 29ec2696f8d8cfff7331fac83d3e893c95ef43ae + React-RCTSettings: 60f0691bba2074ef394f95d4c2265ec284e0a46a + React-RCTText: 5c51df3f08cb9dedc6e790161195d12bac06101c + React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d + ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06 ReactNativeDarkMode: 0178ffca3b10f6a7c9f49d6f9810232b328fa949 RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36 @@ -685,15 +692,15 @@ SPEC CHECKSUMS: RNReanimated: 89f5e0a04d1dd52fbf27e7e7030d8f80a646a3fc RNScreens: b748efec66e095134c7166ca333b628cd7e6f3e2 RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f - SDWebImage: a31ee8e90a97303529e03fb0c333eae0eacb88e9 + SDWebImage: 9169792e9eec3e45bba2a0c02f74bf8bd922d1ee SDWebImageWebPCoder: d0dac55073088d24b2ac1b191a71a8f8d0adac21 SQLCipher: f9fcf29b2e59ced7defc2a2bdd0ebe79b40d4990 SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9 - TOCropViewController: 2a1ae1242600b1f2d996fd91a5268b2309a33b5c + TOCropViewController: da59f531f8ac8a94ef6d6c0fc34009350f9e8bfe TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4 - Yoga: 3ebccbdd559724312790e7742142d062476b698e + Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 5faa578ff5cb7a30abc18b9d620df288750a72fe +PODFILE CHECKSUM: 0a4939c1b21326c5a4b5af072c86c5518c449023 COCOAPODS: 1.9.3 diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index aed6db560b..a6856c9045 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -25,7 +25,6 @@ 3AAD2AC324A3A60E0075D594 /* libRCTStatus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 201067C41D4789F700FA83B6 /* libRCTStatus.a */; }; 3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; }; 3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; }; - 3AAD2AC824A3A60E0075D594 /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */; }; 3AAD2ACA24A3A60E0075D594 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; }; 3AAD2ACB24A3A60E0075D594 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; }; 3AAD2ACC24A3A60E0075D594 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; }; @@ -39,21 +38,20 @@ 3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; }; 3ABC7AF8245FF85900612C45 /* InterStatus-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */; }; 57C854A7993C47A3B1AECD32 /* Inter-MediumItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */; }; + 68E19BBDF749E72ED1F9DEF5 /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */; }; + 6C137817D5298C82BC79177C /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D4CB5416994C913628B8754 /* libPods-Status-StatusImPR.a */; }; 70ADBB5ECF934DCF8A0E4919 /* Inter-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1426DF592BA248FC81D955CB /* Inter-Regular.otf */; }; 74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; }; 8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; }; - 899B05F2F45193B7098B604A /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B00E6B2D94C4B463D8EFF8B8 /* libPods-Status-StatusIm-StatusImTests.a */; }; - 9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */; }; + 8770D567D65A8F938D95C371 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */; }; B24FC7FD1DE7195700D694FF /* Social.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FC1DE7195700D694FF /* Social.framework */; }; B24FC7FF1DE7195F00D694FF /* MessageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B24FC7FE1DE7195F00D694FF /* MessageUI.framework */; }; B2F2D1BC1D9D531B00B7B453 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B2F2D1BB1D9D531B00B7B453 /* Images.xcassets */; }; BA68A2377A20496EA737000D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */; }; - C8F62CB13C1F732A6ABDB977 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B9F8F780F889F228546DF60 /* libPods-Status-StatusImPR.a */; }; CE4E31B31D8695250033ED64 /* Statusgo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.framework */; }; D1786306E0184916B11F4C37 /* Inter-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = B2A38FC3D3954DE7B2B171F8 /* Inter-Medium.otf */; }; D84616FB563A48EBB1678699 /* Inter-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */; }; D99C50E5E18942A39C8DDF61 /* Inter-BoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B321D25F4493470980039457 /* Inter-BoldItalic.otf */; }; - DBE02ADA80FE465743702EFB /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EA4C352EDC255945D9357D4 /* libPods-Status-StatusIm.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -78,13 +76,6 @@ remoteGlobalIDString = 0974579A1D2A440A000D9368; remoteInfo = RCTWKWebView; }; - 9EF083601F3B538B00876A8F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = EB2648DF1C7BE17A00B8F155; - remoteInfo = ReactNativeConfig; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -115,16 +106,14 @@ 00E356EE1AD99517003FC87E /* StatusImTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StatusImTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = ""; }; - 064351D2FD901F8B6C9AE2A5 /* Pods-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusImTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-StatusImTests/Pods-StatusImTests.debug.xcconfig"; sourceTree = ""; }; + 132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07F961A680F5B00A75B9A /* StatusIm.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = StatusIm.app; sourceTree = BUILT_PRODUCTS_DIR; }; 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = StatusIm/AppDelegate.h; sourceTree = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = StatusIm/AppDelegate.m; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = ""; }; 1426DF592BA248FC81D955CB /* Inter-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.otf"; path = "../resources/fonts/Inter-Regular.otf"; sourceTree = ""; }; - 1EA4C352EDC255945D9357D4 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 3887F5B027AC2EC4E7B8BC02 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = ""; }; - 38A44830EC5708E89387F641 /* Pods-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm.release.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm/Pods-StatusIm.release.xcconfig"; sourceTree = ""; }; 3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = ""; }; 3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; }; @@ -134,7 +123,7 @@ 439B6B4B407A4E2AACAFE5BE /* RCTStatus.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTStatus.xcodeproj; path = "../modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj"; sourceTree = ""; }; 4C16DE0B1F89508700AA10DB /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; - 5E9C2936B3890356C5BE1078 /* Pods-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm-StatusImTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm-StatusImTests/Pods-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = ""; }; + 5D4CB5416994C913628B8754 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 69291A6222A63434694EA2A6 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = ""; }; 693A62DB37BC4CD5A30E5C96 /* Inter-SemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBold.otf"; path = "../resources/fonts/Inter-SemiBold.otf"; sourceTree = ""; }; 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = ""; }; @@ -143,14 +132,9 @@ 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; }; 922C4CA61F4D5F8B0033C753 /* StatusIm.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = StatusIm.entitlements; path = StatusIm/StatusIm.entitlements; sourceTree = ""; }; 977B1E37198B72A48870BFE5 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = ""; }; - 9B9F8F780F889F228546DF60 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 9C76AF5A418D4D65A4CAD1D9 /* InterStatus-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "InterStatus-Regular.otf"; path = "../resources/fonts/InterStatus-Regular.otf"; sourceTree = ""; }; 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = ""; }; - 9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ReactNativeConfig.xcodeproj; path = "../node_modules/react-native-config/ios/ReactNativeConfig.xcodeproj"; sourceTree = ""; }; - A08FD367B3239F901A12B5F4 /* Pods-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm-StatusImTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm-StatusImTests/Pods-StatusIm-StatusImTests.release.xcconfig"; sourceTree = ""; }; A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-SemiBoldItalic.otf"; path = "../resources/fonts/Inter-SemiBoldItalic.otf"; sourceTree = ""; }; - ACA66A8F16CD2FE21F38738B /* Pods-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusIm.debug.xcconfig"; path = "Pods/Target Support Files/Pods-StatusIm/Pods-StatusIm.debug.xcconfig"; sourceTree = ""; }; - B00E6B2D94C4B463D8EFF8B8 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B07176ACDAA1422E8F0A3D6B /* Inter-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Italic.otf"; path = "../resources/fonts/Inter-Italic.otf"; sourceTree = ""; }; B24FC7FC1DE7195700D694FF /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; }; B24FC7FE1DE7195F00D694FF /* MessageUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MessageUI.framework; path = System/Library/Frameworks/MessageUI.framework; sourceTree = SDKROOT; }; @@ -160,7 +144,7 @@ C6B1215047604CD59A4C74D6 /* Inter-MediumItalic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-MediumItalic.otf"; path = "../resources/fonts/Inter-MediumItalic.otf"; sourceTree = ""; }; CD4A2C27D6D5473184DC1F7E /* Inter-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Bold.otf"; path = "../resources/fonts/Inter-Bold.otf"; sourceTree = ""; }; CE4E31B21D8695250033ED64 /* Statusgo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Statusgo.framework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.framework"; sourceTree = ""; }; - D489EE8D5F52DA10AC715727 /* Pods-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-StatusImTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-StatusImTests/Pods-StatusImTests.release.xcconfig"; sourceTree = ""; }; + DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -168,7 +152,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 899B05F2F45193B7098B604A /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */, + 8770D567D65A8F938D95C371 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -182,8 +166,7 @@ 20AB9EC61D47CC0300E7FD9C /* libRCTStatus.a in Frameworks */, 25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */, BA68A2377A20496EA737000D /* libz.tbd in Frameworks */, - 9EF0836B1F3B53AB00876A8F /* libReactNativeConfig.a in Frameworks */, - DBE02ADA80FE465743702EFB /* libPods-Status-StatusIm.a in Frameworks */, + 68E19BBDF749E72ED1F9DEF5 /* libPods-Status-StatusIm.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -198,8 +181,7 @@ 3AAD2AC324A3A60E0075D594 /* libRCTStatus.a in Frameworks */, 3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */, 3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */, - 3AAD2AC824A3A60E0075D594 /* libReactNativeConfig.a in Frameworks */, - C8F62CB13C1F732A6ABDB977 /* libPods-Status-StatusImPR.a in Frameworks */, + 6C137817D5298C82BC79177C /* libPods-Status-StatusImPR.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -275,12 +257,6 @@ 5C1C8762251D6EF495FB2384 /* Pods */ = { isa = PBXGroup; children = ( - ACA66A8F16CD2FE21F38738B /* Pods-StatusIm.debug.xcconfig */, - 38A44830EC5708E89387F641 /* Pods-StatusIm.release.xcconfig */, - 064351D2FD901F8B6C9AE2A5 /* Pods-StatusImTests.debug.xcconfig */, - D489EE8D5F52DA10AC715727 /* Pods-StatusImTests.release.xcconfig */, - 5E9C2936B3890356C5BE1078 /* Pods-StatusIm-StatusImTests.debug.xcconfig */, - A08FD367B3239F901A12B5F4 /* Pods-StatusIm-StatusImTests.release.xcconfig */, 3887F5B027AC2EC4E7B8BC02 /* Pods-Status-StatusIm.debug.xcconfig */, 784390E981501E6517651C4E /* Pods-Status-StatusIm.release.xcconfig */, 977B1E37198B72A48870BFE5 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */, @@ -294,7 +270,6 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( - 9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */, 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */, 439B6B4B407A4E2AACAFE5BE /* RCTStatus.xcodeproj */, ); @@ -336,14 +311,6 @@ name = Products; sourceTree = ""; }; - 9EF083391F3B538A00876A8F /* Products */ = { - isa = PBXGroup; - children = ( - 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */, - ); - name = Products; - sourceTree = ""; - }; A97BA941B2FB44B4B66EE6D3 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -354,9 +321,9 @@ CE4E31B21D8695250033ED64 /* Statusgo.framework */, 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */, 4E586E1B0E544F64AA9F5BD1 /* libz.tbd */, - 1EA4C352EDC255945D9357D4 /* libPods-Status-StatusIm.a */, - B00E6B2D94C4B463D8EFF8B8 /* libPods-Status-StatusIm-StatusImTests.a */, - 9B9F8F780F889F228546DF60 /* libPods-Status-StatusImPR.a */, + 132CE3B093884B0FB239A0AB /* libPods-Status-StatusIm.a */, + DB52D45D10528E6992A83A71 /* libPods-Status-StatusIm-StatusImTests.a */, + 5D4CB5416994C913628B8754 /* libPods-Status-StatusImPR.a */, ); name = Frameworks; sourceTree = ""; @@ -488,10 +455,6 @@ ProductGroup = 9EC0135D1E06FB1900155B5C /* Products */; ProjectRef = 9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */; }, - { - ProductGroup = 9EF083391F3B538A00876A8F /* Products */; - ProjectRef = 9EF083381F3B538A00876A8F /* ReactNativeConfig.xcodeproj */; - }, ); projectRoot = ""; targets = ( @@ -517,13 +480,6 @@ remoteRef = 9EC013781E06FB1900155B5C /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 9EF083611F3B538B00876A8F /* libReactNativeConfig.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = libReactNativeConfig.a; - remoteRef = 9EF083601F3B538B00876A8F /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -564,7 +520,6 @@ 3AAD2ACF24A3A60E0075D594 /* Inter-Italic.otf in Resources */, 3AAD2AD024A3A60E0075D594 /* Inter-Medium.otf in Resources */, 3AAD2AD124A3A60E0075D594 /* Inter-MediumItalic.otf in Resources */, - 3A6406FF24A3ADF90046ED37 /* Info.plist in Resources */, 3AAD2AD224A3A60E0075D594 /* Inter-Regular.otf in Resources */, 3AAD2AD324A3A60E0075D594 /* Inter-SemiBold.otf in Resources */, 3AAD2AD424A3A60E0075D594 /* Inter-SemiBoldItalic.otf in Resources */, @@ -596,11 +551,13 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -688,11 +645,13 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -730,11 +689,13 @@ inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh", "${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle", ); runOnlyForDeploymentPostprocessing = 0; @@ -867,6 +828,9 @@ CUSTOM_PRODUCT_NAME = "Status Debug"; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = DTX7Z4U3YA; + EXCLUDED_ARCHS = ""; + "EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus", "$(inherited)", @@ -915,7 +879,8 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; - VALID_ARCHS = "arm64 armv7 armv7s"; + VALID_ARCHS = "x86_64 armv7 armv7s arm64"; + "VALID_ARCHS[sdk=iphonesimulator*]" = "armv7 armv7s x86_64 "; }; name = Debug; }; @@ -933,6 +898,7 @@ CUSTOM_PRODUCT_NAME = Status; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = DTX7Z4U3YA; + EXCLUDED_ARCHS = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(PROJECT_DIR)/../modules/react-native-status/ios/RCTStatus", "$(inherited)", @@ -1138,6 +1104,9 @@ ENABLE_BITCODE = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + EXCLUDED_ARCHS = ""; + "EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -1175,8 +1144,10 @@ "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = YES; - ONLY_ACTIVE_ARCH = YES; + ONLY_ACTIVE_ARCH = NO; SDKROOT = iphoneos; + VALID_ARCHS = "armv7 armv7s arm64"; + "VALID_ARCHS[sdk=iphonesimulator*]" = "armv7 armv7s x86_64"; }; name = Debug; }; @@ -1217,6 +1188,7 @@ ENABLE_BITCODE = NO; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_ARCHS = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_PRECOMPILE_PREFIX_HEADER = NO; @@ -1246,6 +1218,7 @@ "\"$(inherited)\"", ); MTL_ENABLE_DEBUG_INFO = NO; + ONLY_ACTIVE_ARCH = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv7s arm64"; diff --git a/ios/StatusIm/AppDelegate.m b/ios/StatusIm/AppDelegate.m index f5e8b7b919..4e2bf44fab 100644 --- a/ios/StatusIm/AppDelegate.m +++ b/ios/StatusIm/AppDelegate.m @@ -10,7 +10,6 @@ #import "AppDelegate.h" #import -#import "ReactNativeConfig.h" #import "React/RCTLog.h" #import "RCTBundleURLProvider.h" #import "RNSplashScreen.h" @@ -55,21 +54,6 @@ static void InitializeFlipper(UIApplication *application) { signal(SIGPIPE, SIG_IGN); NSURL *jsCodeLocation; - /* Set logging level from React Native */ - NSString *logLevel = [ReactNativeConfig envFor:@"LOG_LEVEL"]; - if([logLevel isEqualToString:@"error"]){ - RCTSetLogThreshold(RCTLogLevelError); - } - else if([logLevel isEqualToString:@"warn"]){ - RCTSetLogThreshold(RCTLogLevelWarning); - } - else if([logLevel isEqualToString:@"info"]){ - RCTSetLogThreshold(RCTLogLevelInfo); - } - else if([logLevel isEqualToString:@"debug"]){ - RCTSetLogThreshold(RCTLogLevelTrace); - } - NSDictionary *appDefaults = [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO] forKey:@"BLANK_PREVIEW"]; [[NSUserDefaults standardUserDefaults] registerDefaults:appDefaults]; diff --git a/ios/StatusIm/Base.lproj/LaunchScreen.xib b/ios/StatusIm/Base.lproj/LaunchScreen.xib deleted file mode 100644 index 99ee1ebed3..0000000000 --- a/ios/StatusIm/Base.lproj/LaunchScreen.xib +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ios/StatusIm/LaunchScreen.storyboard b/ios/StatusIm/LaunchScreen.storyboard new file mode 100644 index 0000000000..e117d8bb6e --- /dev/null +++ b/ios/StatusIm/LaunchScreen.storyboard @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj b/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj index 8f8f624bda..60191811e6 100644 --- a/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj +++ b/modules/react-native-status/ios/RCTStatus/RCTStatus.xcodeproj/project.pbxproj @@ -235,6 +235,7 @@ HEADER_SEARCH_PATHS = "$(SRCROOT)/../../../../ios/Pods/Headers/Public/SSZipArchive"; IPHONEOS_DEPLOYMENT_TARGET = 9.3; MTL_ENABLE_DEBUG_INFO = NO; + ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; VALID_ARCHS = "armv7 armv7s arm64"; @@ -266,7 +267,8 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; - VALID_ARCHS = "armv7 armv7s arm64"; + VALID_ARCHS = "armv7 armv7s arm64 "; + "VALID_ARCHS[sdk=iphonesimulator14.3]" = "armv7 armv7s x86_64"; }; name = Debug; }; @@ -287,7 +289,7 @@ "$(SRCROOT)/../../../../node_modules/react-native-config/ios/ReactNativeConfig", ); IPHONEOS_DEPLOYMENT_TARGET = 8.0; - ONLY_ACTIVE_ARCH = NO; + ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-ObjC", "$(inherited)", diff --git a/nix/deps/gradle/README.md b/nix/deps/gradle/README.md index 92f3bc9e8c..1ac3e6d5ee 100644 --- a/nix/deps/gradle/README.md +++ b/nix/deps/gradle/README.md @@ -67,9 +67,10 @@ echo com.android.tools.build:gradle:3.4.0 | go-maven-resolver >> nix/deps/gradle ``` Then you'll need to remove duplicates and sort `deps.urls`: ``` -sort -o nix/deps/gradle/deps.urls nix/deps/gradle/deps.urls +sort -uo nix/deps/gradle/deps.urls nix/deps/gradle/deps.urls ``` And finally generate the `deps.json` for Nix using: ``` nix/deps/gradle/generate.sh gen_deps_json ``` +After run `make nix-update-gradle` and it should work just fine. diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index 7c3340497c..3919fada81 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -3850,30 +3850,156 @@ }, { - "path": "com/facebook/flipper/flipper-fresco-plugin/0.35.0/flipper-fresco-plugin-0.35.0", + "path": "com/facebook/flipper/flipper-fresco-plugin/0.54.0/flipper-fresco-plugin-0.54.0", "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", "type": "aar", "pom": { - "sha1": "083cf496f951d8647bdbbda62d2f89ccecc7d09c", - "sha256": "19v1xi3ahqswxj7n8bjnxmn6hzv5i5fw6bjvdax1pl40zbvrn9dl" + "sha1": "78b6dd76ca355a13262d1b6fe97ea225d5b8c445", + "sha256": "0p5j7nix6q86xa3fiq0i2bnnb6qaszdl2yyq0w5c8yva86drvfrw" }, "jar": { - "sha1": "7add6696db2c4f61106a8ac084210e9c69b8a52c", - "sha256": "10azzfy88czry1ivk288rb40g5klqkpy0v7n5k1j2bhkg7pac2w6" + "sha1": "36a4f4a3f4173cd4bdfe9a7f078e56fc93b63e64", + "sha256": "0kbv37kcj3lr3bikjfyfk48a0cq06n8jadbcyl7i6w7pr9lh7hlc" } }, { - "path": "com/facebook/flipper/flipper/0.35.0/flipper-0.35.0", + "path": "com/facebook/flipper/flipper/0.54.0/flipper-0.54.0", "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", "type": "aar", "pom": { - "sha1": "b28f4d6d612d71b8e2245c03d9aa071a5846f007", - "sha256": "1izvhfm11nvkzn592ws9sh16fmzgz2b5nzykrk6aqq4ajsk8j2nw" + "sha1": "f1e963be185c5c5d5a8416faf16af29fddeaf1ab", + "sha256": "023hmlkczyswy2bdl559rasw7w3fi8210qkspl2wdh70axq8qvjq" }, "jar": { - "sha1": "fd83813856440750c1fbce73f673f7769247357d", - "sha256": "0ib1rwhs4xmyd6h99lwpjvkbxnqhgzy85kynfv15rsyw6wkv45fw" + "sha1": "55d7417b5db25a08ac19048a6d03a44770ef1f68", + "sha256": "0aifn1d43f9b2xvww0r3xn59hv4np3s84m737xd2rkhvl38hcr5p" + } + }, + + { + "path": "com/facebook/fresco/drawee/2.2.0/drawee-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "e8748b720366d85dcd58ceb0c698c1b7a36674a2", + "sha256": "0rk86yr5i9qm4qrjkas6ncl6c9ra4cqfijkv0ws8xglcbyw7a9sl" + }, + "jar": { + "sha1": "07d461727cf24956ca7e579e266d5ac88762c0a0", + "sha256": "1qnavxnh4xgybw8v9g344v3vzzmy1q7f8wn3i89icd44gmiba6wr" + } + }, + + { + "path": "com/facebook/fresco/fbcore/2.2.0/fbcore-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "d9e14f467d0b22d767a20bef4f6fd721987ce367", + "sha256": "1j68icbcf9pqpja4baw8k39mk4a93i11qwnpswv0kkq3pb1czgib" + }, + "jar": { + "sha1": "c827447f13d268ee8c67035cf197cec04d49cfe3", + "sha256": "0rrlkgwg3zmhzkrlycq85bmn7w3f6c5lfgabcvy2hfmi08s5zfsp" + } + }, + + { + "path": "com/facebook/fresco/fresco/2.2.0/fresco-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "5026c7cd65322f9e1a426c3aaa14d46280239dbe", + "sha256": "13hbk3nv6djzl49429in59j8pjw4g9a8dcrpw3b07qvvh0qhg1kf" + }, + "jar": { + "sha1": "a7504c680c2582757ca5eb01cf98cbb8503e73b1", + "sha256": "1554s3z3bfglb34kaj2pmmsni2c8mmdziplgpcl5mb59kxnlnjzg" + } + }, + + { + "path": "com/facebook/fresco/imagepipeline-native/2.2.0/imagepipeline-native-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "720451ef7183730cc6e41e90fc2aebf082c2cd19", + "sha256": "0w64rgap40sbdz8nvrmgv37szh5ac9sq76cp0s40iy2pqiz2i064" + }, + "jar": { + "sha1": "d67236389cdf4ac92b4bb754641b7aa854f5ba7a", + "sha256": "0b9hjbxzy73arvmzx8kfgzp9wpvxznvar5ikxibbzfmf2zzrrw31" + } + }, + + { + "path": "com/facebook/fresco/imagepipeline/2.2.0/imagepipeline-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "626e49897e7b63b9ccc0f94ae4c244029aa82aec", + "sha256": "0ya5qc8y00w41nxdc7s8sx8rfx94jv44yfyfzgk984pnc780kg91" + }, + "jar": { + "sha1": "d48b1ff6e6c4ebb8f0cfeb12db702dfad10ba04f", + "sha256": "10gavf6db3y8i2a1nhjq5apd6940hqz6dmg7rad882j17h6az91f" + } + }, + + { + "path": "com/facebook/fresco/memory-type-java/2.2.0/memory-type-java-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "309f508be8421f790d2109bfa870f275048e4b9f", + "sha256": "04y6bnxq7qzzp7v65mbyx83al6sl3g8xfnq4y75rrpmzpmd1jhd2" + }, + "jar": { + "sha1": "af16daca2b0af42730eca0ed02b85dfa6b100602", + "sha256": "1w7x5v79abxkcznj9qb11fb036qii4yyp0vp8ivg3n14b7xws83i" + } + }, + + { + "path": "com/facebook/fresco/memory-type-native/2.2.0/memory-type-native-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "a4ca6c3169ccf3db11121b806c571c779c596d19", + "sha256": "0jbhgwqlf83fhyd2rf4w29aw72z20pwpiwab79i4qv9qn3bqmzz7" + }, + "jar": { + "sha1": "63e9739053ada471f72af7bf2bc642f4a9a7d43b", + "sha256": "16qsxh2zi1vylnj3waz743zm5kvbwzrb61qngcincjzysz3jzn6x" + } + }, + + { + "path": "com/facebook/fresco/nativeimagefilters/2.2.0/nativeimagefilters-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "79bb9b688df382eeb4f76b878f960eb7ee806275", + "sha256": "0c535nxpakg86yhf91ysppnnmjfcwrhf88jgqzn0g7nyz3fwvmv7" + }, + "jar": { + "sha1": "6a0b2c43c7a757f23b0c670b2a3995bdc3e5b713", + "sha256": "0jm4jk6gb5j6b94ilkla5jpamjwxjv7pljnka337yh0b0hbq34ba" + } + }, + + { + "path": "com/facebook/fresco/stetho/2.2.0/stetho-2.2.0", + "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", + "type": "aar", + "pom": { + "sha1": "c98731a6a9b6d7ae4f4516c3515c817931f95c46", + "sha256": "1jm22xa58vgrgl4pzy4bcbz9bm1nkhg7xf6x0dz915asqfcpgzsg" + }, + "jar": { + "sha1": "4c4ee688f80216c4dca4c67afa130b283a8bf5a5", + "sha256": "06k888gr75z9lbx4dwjfr8fpbjwcjh9ikff9nv3yar8r24f8fszb" } }, @@ -4984,16 +5110,16 @@ }, { - "path": "com/facebook/fresco/flipper/2.0.0/flipper-2.0.0", + "path": "com/facebook/fresco/flipper/2.2.0/flipper-2.2.0", "host": "https://repo.maven.apache.org/maven2", "type": "aar", "pom": { - "sha1": "708122c079b9ffd542ddb4f8f490cf7bedc1d8b3", - "sha256": "0jdz059r9fs0i4b753awlpafcpij5glp9zkd8wc4iw9sx4j8mhha" + "sha1": "ab86f244b9a4aa60328cc079e0450f7194020b78", + "sha256": "0iy8b0p4q30l1b0bnfpxmaqdhp8zfqxgbij2chnbyzralyxfa453" }, "jar": { - "sha1": "1ee13ccd1b95acf72a1a71b8fa14bc2069a5ac36", - "sha256": "01jhwsyjv6hv85i5jkwm4hjmnmazixb8z5a9fvvapc94mxhxl25x" + "sha1": "f231a02b695bae83f7a985d3b16a160245e40e62", + "sha256": "1crvr3nmrn3xz7qb4srp88plzixcv050542qlihkbzp5w13my51p" } }, @@ -5025,6 +5151,20 @@ } }, + { + "path": "com/facebook/fresco/imagepipeline-base/2.2.0/imagepipeline-base-2.2.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "aar", + "pom": { + "sha1": "e37d0acfeea73cbac29477c79b24d667e260eb18", + "sha256": "0z8nsdi191cc96xh5khspdqfr9rmpf2bd5hdylq1winndkmjqqx6" + }, + "jar": { + "sha1": "9f9be2d9ccf4d96fb341f0fedcb47b9c800653a6", + "sha256": "13xmlnblbrax12q18l4dvhsal3rmfj7sigmkgk6ixry5k6xisr9g" + } + }, + { "path": "com/facebook/fresco/imagepipeline-okhttp3/2.0.0/imagepipeline-okhttp3-2.0.0", "host": "https://repo.maven.apache.org/maven2", @@ -5053,6 +5193,20 @@ } }, + { + "path": "com/facebook/fresco/memory-type-ashmem/2.2.0/memory-type-ashmem-2.2.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "aar", + "pom": { + "sha1": "5e1b2193074370248aeb1bdff1b5cc80072d5fa9", + "sha256": "0lh5hnbp9irq277drmzv06cb74fbaqf47zlap5nybqcmygdm58dp" + }, + "jar": { + "sha1": "7ae95af772c88b0e112fc7dc3b80b26fa42ed3c2", + "sha256": "0lahv1sr176hpfiq3ilyg5nhmr8myjkbwi01x3715b2zd111xplv" + } + }, + { "path": "com/facebook/fresco/nativeimagefilters/2.0.0/nativeimagefilters-2.0.0", "host": "https://repo.maven.apache.org/maven2", @@ -5082,16 +5236,44 @@ }, { - "path": "com/facebook/fresco/stetho/2.0.0/stetho-2.0.0", + "path": "com/facebook/fresco/nativeimagetranscoder/2.2.0/nativeimagetranscoder-2.2.0", "host": "https://repo.maven.apache.org/maven2", "type": "aar", "pom": { - "sha1": "9dbad55dc263ce32b382aaecf97ecda4211bc5ca", - "sha256": "1rzly0d8hhzwzmph7iqqna52fgydljz9l6nd995s5d63db0xwk8q" + "sha1": "58f11fa92efadc1c59bbdc8cf9e9234f8f8a3ac1", + "sha256": "0ppwqs3ii232zfj5iisg1pkzr7qdz41xf75xjqrp6hxcbmnld3zm" }, "jar": { - "sha1": "6973b9cfa7c65ec010960e64048707ff97ce9770", - "sha256": "1jd3a8jbxz7vz12l4yxrvsmrzlh6aa607af6qsvsgn65bj0crs50" + "sha1": "47f9472de0b3eda631d95cd927ff4bd0dd98816b", + "sha256": "0p7awfkagb15iqv37g5fdhjhnn22dqahqhav0ypcvwikvn30fs26" + } + }, + + { + "path": "com/facebook/fresco/soloader/2.2.0/soloader-2.2.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "aar", + "pom": { + "sha1": "300e6a8991ac9f84c5195faf80f61ce8ef63e27f", + "sha256": "0qcs2k95k19w4drff5cw109s3bz8mwghv4ydbp1r99d0gv5dsn0w" + }, + "jar": { + "sha1": "b67d3ff3c1da2858a075286c6c458c36ccf295b7", + "sha256": "00dv4dm037xlirrq6rqfvplgbn467mkwpsgwia38yngj31jvjp9p" + } + }, + + { + "path": "com/facebook/fresco/ui-common/2.2.0/ui-common-2.2.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "aar", + "pom": { + "sha1": "1f5e47e876212694aebcc24e1389ddce54258381", + "sha256": "1iqfzl9l2wkbhyh8km9yzldny6j52y059v6vyxywjpp5gk1gigzs" + }, + "jar": { + "sha1": "d053182f7cdce15a81861d665abca337708bc660", + "sha256": "0zdi3wnj142bidhnz5yl1rm6zprd4x1hz0514yq54q2yyb22mwfy" } }, @@ -5109,20 +5291,6 @@ } }, - { - "path": "com/facebook/soloader/annotation/0.8.0/annotation-0.8.0", - "host": "https://repo.maven.apache.org/maven2", - "type": "aar", - "pom": { - "sha1": "d63489687ff2981304050ca7a758392d0cdf8247", - "sha256": "18scnygf28y9zph0vfcpgh18hh5mdwqf4gcmyxpzxbcgjbydai94" - }, - "jar": { - "sha1": "ae6d46195467467fae746c6225f79ac41e7039e8", - "sha256": "0sbzgvkmx351gavaxw4ij27cghhvhhdjxpcsqlbmca2q8qcwwa3s" - } - }, - { "path": "com/facebook/soloader/annotation/0.8.2/annotation-0.8.2", "host": "https://repo.maven.apache.org/maven2", @@ -5137,6 +5305,20 @@ } }, + { + "path": "com/facebook/soloader/annotation/0.9.0/annotation-0.9.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "f108cf734bd827489b73a8c271aba1a7fdb0ba8b", + "sha256": "0a03digp52kh7rqjh6rchk0skbma1n39b9rv5h7xmxzs3wqpawa7" + }, + "jar": { + "sha1": "dc58463712cb3e5f03d8ee5ac9743b9ced9afa77", + "sha256": "1syln51ijdd207wb4lwlyh2msb9v2i5r1l3zyk4n96q2yyp8f35d" + } + }, + { "path": "com/facebook/soloader/nativeloader/0.8.0/nativeloader-0.8.0", "host": "https://repo.maven.apache.org/maven2", @@ -5165,6 +5347,20 @@ } }, + { + "path": "com/facebook/soloader/nativeloader/0.9.0/nativeloader-0.9.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "47c3f55508d9611da3cc1a5e21950851f88e5fcc", + "sha256": "0can8r0sa8f868fsx85h9a9khyfgx7bnb8hinm76ix1fsl74lq0p" + }, + "jar": { + "sha1": "677c7fbfcc847d7eb6082048d07b10afd4cff898", + "sha256": "1a0vc40xvw08phmnhbb517frfqnn9i42ncbjsrbrp6v40a4c5gqq" + } + }, + { "path": "com/facebook/soloader/soloader/0.6.0/soloader-0.6.0", "host": "https://repo.maven.apache.org/maven2", @@ -5179,20 +5375,6 @@ } }, - { - "path": "com/facebook/soloader/soloader/0.8.0/soloader-0.8.0", - "host": "https://repo.maven.apache.org/maven2", - "type": "aar", - "pom": { - "sha1": "d5246c18791ac2f5a8ab5928a1dcbe42ab6b9b38", - "sha256": "1fwkidr0gj1b8g1yxlq0n74049f7qaw0gqbbzcpa2hn0kim0x5s6" - }, - "jar": { - "sha1": "71378622ece36680b9bab7863c3d0259b442305e", - "sha256": "101vnhmhgrvdfnhiahsbp1yq96y2c7v2hck0kpglgxy35iq1q1ia" - } - }, - { "path": "com/facebook/soloader/soloader/0.8.2/soloader-0.8.2", "host": "https://repo.maven.apache.org/maven2", @@ -5207,6 +5389,20 @@ } }, + { + "path": "com/facebook/soloader/soloader/0.9.0/soloader-0.9.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "aar", + "pom": { + "sha1": "322607b4987e70c7fe76e12af15765f469369d65", + "sha256": "0xrdp6axm9lxc6nskgcmclf1c0ylfngd0l3bp0ngn8a7qwqakamq" + }, + "jar": { + "sha1": "6e138af1dd29ceabf5bace2d24dc4333f304d104", + "sha256": "0sdpgjfnfa5gxbbx4ak8rml0f5d623gx8jknzkkj03iaj0c7b9ig" + } + }, + { "path": "com/facebook/stetho/stetho/1.3.1/stetho-1.3.1", "host": "https://repo.maven.apache.org/maven2", @@ -6039,6 +6235,20 @@ } }, + { + "path": "com/parse/bolts/bolts-applinks/1.4.0/bolts-applinks-1.4.0", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "9a7b6fa518be36c41eeb71e9ccb960da962a161f", + "sha256": "0i5wx80zk3wf9bh5myl7853dny286gjw6six4bwyfv66i07d5cg5" + }, + "jar": { + "sha1": "8ad21bf21784dacce5f2043afb97218cc377e835", + "sha256": "19al8dpq7qqwbkmhi76axwd0vml6m65rh5cpj37vdpzfgkv40mxy" + } + }, + { "path": "com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0", "host": "https://repo.maven.apache.org/maven2", @@ -6082,16 +6292,16 @@ }, { - "path": "com/squareup/okhttp3/okhttp-urlconnection/3.12.1/okhttp-urlconnection-3.12.1", + "path": "com/squareup/okhttp3/okhttp-urlconnection/3.12.12/okhttp-urlconnection-3.12.12", "host": "https://repo.maven.apache.org/maven2", "type": "jar", "pom": { - "sha1": "3f28e0830ddf8977e67961c8993313c257e91a32", - "sha256": "025ysyw0cj3sn1nfhrpaf06n38g7yv9j3z12p307ahfi28j7q79r" + "sha1": "ed7d83320e8f070b8c475467e068173cd72afcf6", + "sha256": "0fjr38zbpskwmv756bc6fzbbgpybkrr7n18qwb10zxih0k8xvxp6" }, "jar": { - "sha1": "f689d3657c3f1fdbde4877bcddc668491a4ad46f", - "sha256": "0np5vmg40961mwk0664yy64m4rhrwcs4fxayc0biz7fs2s5i7rrs" + "sha1": "3cfbe11fb8c48d30600a70f90b3283fc858aea72", + "sha256": "0w19spy3cy08vk9wwfzkcbj0dfycybnpfllmj22w0agdyj2c400x" } }, @@ -6123,6 +6333,20 @@ } }, + { + "path": "com/squareup/okhttp3/okhttp/3.12.12/okhttp-3.12.12", + "host": "https://repo.maven.apache.org/maven2", + "type": "jar", + "pom": { + "sha1": "90c81c59b2eb943ddbe58bc717e3e75bccd518c2", + "sha256": "174vp3isgdpj3nsd5ky921i7y3zn2rfdz7k5ks57w9nfqym1iflq" + }, + "jar": { + "sha1": "d3e1ce1d2b3119adf270b2d00d947beb03fe3321", + "sha256": "0jsyw4g3v9rhr8c5ggl263vpjn2dcgibzl49w5diw8zvk03wvw9n" + } + }, + { "path": "com/squareup/okhttp3/okhttp/4.10.0-RC1/okhttp-4.10.0-RC1", "host": "https://repo.maven.apache.org/maven2", @@ -6157,6 +6381,16 @@ } }, + { + "path": "com/squareup/okhttp3/parent/3.12.12/parent-3.12.12", + "host": "https://repo.maven.apache.org/maven2", + "type": "pom", + "pom": { + "sha1": "75e6add0d5bac7736ef7ae70c1d992270ec6c28f", + "sha256": "18apmj22hw58fcd0912f5x52yxq48wfkm22j3nw3pf7va5val0k7" + } + }, + { "path": "com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0", "host": "https://repo.maven.apache.org/maven2", diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index 8c7ffb549c..3bb46d64e9 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -300,28 +300,38 @@ com.android.tools:sdk-common:26.5.3 com.drewnoakes:metadata-extractor:2.9.1 com.facebook.conceal:conceal:1.1.3 com.facebook.fbjni:fbjni-java-only:0.0.3 -com.facebook.flipper:flipper-fresco-plugin:0.35.0 -com.facebook.flipper:flipper:0.35.0 +com.facebook.flipper:flipper-fresco-plugin:0.54.0 +com.facebook.flipper:flipper:0.54.0 com.facebook.fresco:animated-base:2.0.0 com.facebook.fresco:animated-drawable:2.0.0 com.facebook.fresco:animated-gif:2.0.0 com.facebook.fresco:drawee:2.0.0 +com.facebook.fresco:drawee:2.2.0 com.facebook.fresco:fbcore:2.0.0 -com.facebook.fresco:flipper:2.0.0 +com.facebook.fresco:fbcore:2.2.0 +com.facebook.fresco:flipper:2.2.0 com.facebook.fresco:fresco:2.0.0 +com.facebook.fresco:fresco:2.2.0 com.facebook.fresco:imagepipeline-base:2.0.0 +com.facebook.fresco:imagepipeline-base:2.2.0 +com.facebook.fresco:imagepipeline-native:2.2.0 com.facebook.fresco:imagepipeline-okhttp3:2.0.0 com.facebook.fresco:imagepipeline:2.0.0 +com.facebook.fresco:imagepipeline:2.2.0 +com.facebook.fresco:memory-type-ashmem:2.2.0 +com.facebook.fresco:memory-type-java:2.2.0 +com.facebook.fresco:memory-type-native:2.2.0 com.facebook.fresco:nativeimagefilters:2.0.0 +com.facebook.fresco:nativeimagefilters:2.2.0 com.facebook.fresco:nativeimagetranscoder:2.0.0 -com.facebook.fresco:stetho:2.0.0 +com.facebook.fresco:nativeimagetranscoder:2.2.0 +com.facebook.fresco:soloader:2.2.0 +com.facebook.fresco:stetho:2.2.0 +com.facebook.fresco:ui-common:2.2.0 com.facebook.infer.annotation:infer-annotation:0.11.2 -com.facebook.soloader:annotation:0.8.0 -com.facebook.soloader:annotation:0.8.2 -com.facebook.soloader:nativeloader:0.8.0 -com.facebook.soloader:nativeloader:0.8.2 -com.facebook.soloader:soloader:0.8.0 -com.facebook.soloader:soloader:0.8.2 +com.facebook.soloader:annotation:0.9.0 +com.facebook.soloader:nativeloader:0.9.0 +com.facebook.soloader:soloader:0.9.0 com.facebook.yoga:proguard-annotations:1.14.1 com.github.bumptech.glide:annotations:4.11.0 com.github.bumptech.glide:compiler:4.11.0 @@ -365,9 +375,10 @@ com.google.protobuf:protobuf-java:3.0.0 com.google.protobuf:protobuf-java:3.4.0 com.google.zxing:core:3.3.0 com.intellij:annotations:12.0 +com.parse.bolts:bolts-applinks:1.4.0 com.parse.bolts:bolts-tasks:1.4.0 -com.squareup.okhttp3:okhttp-urlconnection:3.12.1 -com.squareup.okhttp3:okhttp:3.12.1 +com.squareup.okhttp3:okhttp-urlconnection:3.12.12 +com.squareup.okhttp3:okhttp:3.12.12 com.squareup.okio:okio:1.15.0 com.squareup:javapoet:1.8.0 com.squareup:javawriter:2.5.0 diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index c4356df43f..7a36d7ee1e 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -273,8 +273,17 @@ https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.1 https://repository.sonatype.org/content/groups/sonatype-public-grid/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fbjni/fbjni-java-only/0.0.3/fbjni-java-only-0.0.3.pom -https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper-fresco-plugin/0.35.0/flipper-fresco-plugin-0.35.0.pom -https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper/0.35.0/flipper-0.35.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper-fresco-plugin/0.54.0/flipper-fresco-plugin-0.54.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper/0.54.0/flipper-0.54.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/drawee/2.2.0/drawee-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/fbcore/2.2.0/fbcore-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/fresco/2.2.0/fresco-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/imagepipeline-native/2.2.0/imagepipeline-native-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/imagepipeline/2.2.0/imagepipeline-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/memory-type-java/2.2.0/memory-type-java-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/memory-type-native/2.2.0/memory-type-native-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/nativeimagefilters/2.2.0/nativeimagefilters-2.2.0.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/fresco/stetho/2.2.0/stetho-2.2.0.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/function/0.0.1/function-0.0.1.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/status-keycard-java/android/3.0.4/android-3.0.4.pom @@ -354,22 +363,27 @@ https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-drawable/2.0.0 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-gif/2.0.0/animated-gif-2.0.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/drawee/2.0.0/drawee-2.0.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/fbcore/2.0.0/fbcore-2.0.0.pom -https://repo.maven.apache.org/maven2/com/facebook/fresco/flipper/2.0.0/flipper-2.0.0.pom +https://repo.maven.apache.org/maven2/com/facebook/fresco/flipper/2.2.0/flipper-2.2.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/fresco/2.0.0/fresco-2.0.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-base/2.0.0/imagepipeline-base-2.0.0.pom +https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-base/2.2.0/imagepipeline-base-2.2.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline-okhttp3/2.0.0/imagepipeline-okhttp3-2.0.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/imagepipeline/2.0.0/imagepipeline-2.0.0.pom +https://repo.maven.apache.org/maven2/com/facebook/fresco/memory-type-ashmem/2.2.0/memory-type-ashmem-2.2.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagefilters/2.0.0/nativeimagefilters-2.0.0.pom https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagetranscoder/2.0.0/nativeimagetranscoder-2.0.0.pom -https://repo.maven.apache.org/maven2/com/facebook/fresco/stetho/2.0.0/stetho-2.0.0.pom +https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagetranscoder/2.2.0/nativeimagetranscoder-2.2.0.pom +https://repo.maven.apache.org/maven2/com/facebook/fresco/soloader/2.2.0/soloader-2.2.0.pom +https://repo.maven.apache.org/maven2/com/facebook/fresco/ui-common/2.2.0/ui-common-2.2.0.pom https://repo.maven.apache.org/maven2/com/facebook/infer/annotation/infer-annotation/0.11.2/infer-annotation-0.11.2.pom -https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.8.0/annotation-0.8.0.pom https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.8.2/annotation-0.8.2.pom +https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.9.0/annotation-0.9.0.pom https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.8.0/nativeloader-0.8.0.pom https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.8.2/nativeloader-0.8.2.pom +https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.9.0/nativeloader-0.9.0.pom https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.6.0/soloader-0.6.0.pom -https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.8.0/soloader-0.8.0.pom https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.8.2/soloader-0.8.2.pom +https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.9.0/soloader-0.9.0.pom https://repo.maven.apache.org/maven2/com/facebook/stetho/stetho/1.3.1/stetho-1.3.1.pom https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.11.0/annotations-4.11.0.pom https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.11.0/compiler-4.11.0.pom @@ -436,15 +450,18 @@ https://repo.maven.apache.org/maven2/com/google/truth/truth/1.1/truth-1.1.pom https://repo.maven.apache.org/maven2/com/google/zxing/core/3.3.0/core-3.3.0.pom https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.3.0/zxing-parent-3.3.0.pom https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom +https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-applinks/1.4.0/bolts-applinks-1.4.0.pom https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.pom https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom -https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.12.1/okhttp-urlconnection-3.12.1.pom +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3.12.12/okhttp-urlconnection-3.12.12.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.12/okhttp-3.12.12.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.10.0-RC1/okhttp-4.10.0-RC1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom +https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.12/parent-3.12.12.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.pom https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.9.0/okio-2.9.0.pom diff --git a/package.json b/package.json index 3cfb15e9ab..60668c9436 100644 --- a/package.json +++ b/package.json @@ -32,12 +32,12 @@ "hi-base32": "^0.5.0", "i18n-js": "^3.3.0", "qrcode": "^1.4.1", - "react": "16.13.0", + "react": "16.13.1", "react-dom": "^16.4.2", - "react-native": "0.62.2", + "react-native": "0.63.4", "react-native-background-timer": "^2.1.1", "react-native-camera-kit": "^8.0.4", - "react-native-config": "git+https://github.com/status-im/react-native-config.git#v0.11.2-3-status", + "react-native-config": "git+https://github.com/status-im/react-native-config.git#v0.11.2-4-status", "react-native-dark-mode": "^0.2.2", "react-native-device-info": "^5.6.1", "react-native-dialogs": "^1.0.4", diff --git a/yarn.lock b/yarn.lock index 816e2184ef..7bfe364319 100644 --- a/yarn.lock +++ b/yarn.lock @@ -214,6 +214,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670" integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ== +"@babel/helper-plugin-utils@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375" + integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg== + "@babel/helper-regex@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965" @@ -454,7 +459,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": +"@babel/plugin-syntax-nullish-coalescing-operator@^7.0.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ== @@ -482,7 +487,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": +"@babel/plugin-syntax-optional-chaining@^7.0.0", "@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg== @@ -704,6 +709,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-transform-react-jsx-self@^7.0.0": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28" + integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/plugin-transform-react-jsx-source@^7.0.0": version "7.9.0" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz#89ef93025240dd5d17d3122294a093e5e0183de0" @@ -1227,35 +1239,46 @@ resolved "https://registry.yarnpkg.com/@react-native-community/cameraroll/-/cameraroll-1.6.2.tgz#a4dedcf8ba7bc938f805dd07dd43a275edb1f411" integrity sha512-5R/2Tpi7APoNBDmRV23OcRIN9YiaRMJAHrXkGDpj7jVo2yQpJCCrARnZ9qhJ9dYEMybdP/XhXI1vVjuad5xqNQ== -"@react-native-community/cli-debugger-ui@^4.8.0": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.8.0.tgz#9a6419b29be69422e0056bbb1874775750351d22" - integrity sha512-Eq9lHINDXiBAwmFRCMN8jeKk6FTDnTxAfITkjPUNNTj7q3K+fH/oyOMJjxbIZbryIJY6g+g/ln6vsS2WzISNYQ== +"@react-native-community/cli-debugger-ui@^4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.13.1.tgz#07de6d4dab80ec49231de1f1fbf658b4ad39b32c" + integrity sha512-UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg== dependencies: serve-static "^1.13.1" -"@react-native-community/cli-platform-android@^4.5.1": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.8.0.tgz#f495b227e82c75c676dfa53c0dac33bf438b50b8" - integrity sha512-sYa4K0t0VL99j+bloHTL2BwXFJpHCdPN4SRTm9/wfxuWDkiPFvo9TaX0adh7GbUoKalLq2k0z+iEpHMN3HtZiw== +"@react-native-community/cli-hermes@^4.13.0": + version "4.13.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-4.13.0.tgz#6243ed9c709dad5e523f1ccd7d21066b32f2899d" + integrity sha512-oG+w0Uby6rSGsUkJGLvMQctZ5eVRLLfhf84lLyz942OEDxFRa9U19YJxOe9FmgCKtotbYiM3P/XhK+SVCuerPQ== dependencies: - "@react-native-community/cli-tools" "^4.8.0" + "@react-native-community/cli-platform-android" "^4.13.0" + "@react-native-community/cli-tools" "^4.13.0" + chalk "^3.0.0" + hermes-profile-transformer "^0.0.6" + ip "^1.1.5" + +"@react-native-community/cli-platform-android@^4.10.0", "@react-native-community/cli-platform-android@^4.13.0": + version "4.13.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.13.0.tgz#922681ec82ee1aadd993598b814df1152118be02" + integrity sha512-3i8sX8GklEytUZwPnojuoFbCjIRzMugCdzDIdZ9UNmi/OhD4/8mLGO0dgXfT4sMWjZwu3qjy45sFfk2zOAgHbA== + dependencies: + "@react-native-community/cli-tools" "^4.13.0" chalk "^3.0.0" execa "^1.0.0" fs-extra "^8.1.0" glob "^7.1.3" jetifier "^1.6.2" lodash "^4.17.15" - logkitty "^0.6.0" + logkitty "^0.7.1" slash "^3.0.0" xmldoc "^1.1.2" -"@react-native-community/cli-platform-ios@^4.5.0": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.8.0.tgz#bfa20f398837256ee943192930d1f94fa92f521d" - integrity sha512-UZyc/bwG23HKsvHVmDrlZulIRMK8Jl7njN9oCO0pohOYxRJIwueRP7A8IPCwVVohmSEuNmhCWpMIIxTAo7zzwg== +"@react-native-community/cli-platform-ios@^4.10.0": + version "4.13.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.13.0.tgz#a738915c68cac86df54e578b59a1311ea62b1aef" + integrity sha512-6THlTu8zp62efkzimfGr3VIuQJ2514o+vScZERJCV1xgEi8XtV7mb/ZKt9o6Y9WGxKKkc0E0b/aVAtgy+L27CA== dependencies: - "@react-native-community/cli-tools" "^4.8.0" + "@react-native-community/cli-tools" "^4.13.0" chalk "^3.0.0" glob "^7.1.3" js-yaml "^3.13.1" @@ -1263,10 +1286,25 @@ plist "^3.0.1" xcode "^2.0.0" -"@react-native-community/cli-tools@^4.8.0": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.8.0.tgz#144a029c741c2cf40a7f9c059819ce9a69e7f1e3" - integrity sha512-voXGruhYyyhCbEYM2uZ54dMZcBgXFFcQxVK3nLwJDG9nSQGObZInj9Zf76ix5qGnvKKGWIGUcbmRhyLpAzTXuQ== +"@react-native-community/cli-server-api@^4.13.1": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.13.1.tgz#bee7ee9702afce848e9d6ca3dcd5669b99b125bd" + integrity sha512-vQzsFKD9CjHthA2ehTQX8c7uIzlI9A7ejaIow1I9RlEnLraPH2QqVDmzIdbdh5Od47UPbRzamCgAP8Bnqv3qwQ== + dependencies: + "@react-native-community/cli-debugger-ui" "^4.13.1" + "@react-native-community/cli-tools" "^4.13.0" + compression "^1.7.1" + connect "^3.6.5" + errorhandler "^1.5.0" + nocache "^2.1.0" + pretty-format "^25.1.0" + serve-static "^1.13.1" + ws "^1.1.0" + +"@react-native-community/cli-tools@^4.13.0": + version "4.13.0" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.13.0.tgz#b406463d33af16cedc4305a9a9257ed32845cf1b" + integrity sha512-s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg== dependencies: chalk "^3.0.0" lodash "^4.17.15" @@ -1275,29 +1313,28 @@ open "^6.2.0" shell-quote "1.6.1" -"@react-native-community/cli-types@^4.8.0": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-4.8.0.tgz#d929f0d47ecdc69027de02a89d17f0ece9ee3ca2" - integrity sha512-gkjQdmzskQJdddVNRBATa7rWMbamD2j4B7w9shbg20tIBYoh/tgHdkgiLqZQSfBKa8HqrAkeCJTYaT1oV4oReQ== +"@react-native-community/cli-types@^4.10.1": + version "4.10.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-4.10.1.tgz#d68a2dcd1649d3b3774823c64e5e9ce55bfbe1c9" + integrity sha512-ael2f1onoPF3vF7YqHGWy7NnafzGu+yp88BbFbP0ydoCP2xGSUzmZVw0zakPTC040Id+JQ9WeFczujMkDy6jYQ== -"@react-native-community/cli@^4.5.1": - version "4.8.0" - resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.8.0.tgz#b9e3916ceb0fe6bcbc2943fea2caa0ca3739d080" - integrity sha512-z4qHfxtoTxKhQ0V9B02a82IxBkEBH5FfKnaJn9WL5Tf4SmE91ER8ZNVEWNr97S4TCFVYDrpM7iKnrYpNi/ciYQ== +"@react-native-community/cli@^4.10.0": + version "4.13.1" + resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.13.1.tgz#60148723e77cafe3ae260317d6bffe91853a2d20" + integrity sha512-+/TeRVToADpQPSprsPkwi9KY8x64YcuJpjzMBVISwWP+aWzsIDuWJmyMXTADlCg2EBMJqJR7bn1W/IkfzVRCWA== dependencies: "@hapi/joi" "^15.0.3" - "@react-native-community/cli-debugger-ui" "^4.8.0" - "@react-native-community/cli-tools" "^4.8.0" - "@react-native-community/cli-types" "^4.8.0" + "@react-native-community/cli-debugger-ui" "^4.13.1" + "@react-native-community/cli-hermes" "^4.13.0" + "@react-native-community/cli-server-api" "^4.13.1" + "@react-native-community/cli-tools" "^4.13.0" + "@react-native-community/cli-types" "^4.10.1" chalk "^3.0.0" command-exists "^1.2.8" commander "^2.19.0" - compression "^1.7.1" - connect "^3.6.5" cosmiconfig "^5.1.0" deepmerge "^3.2.0" - envinfo "^7.1.0" - errorhandler "^1.5.0" + envinfo "^7.7.2" execa "^1.0.0" find-up "^4.1.0" fs-extra "^8.1.0" @@ -1310,19 +1347,17 @@ metro-config "^0.58.0" metro-core "^0.58.0" metro-react-native-babel-transformer "^0.58.0" + metro-resolver "^0.58.0" minimist "^1.2.0" mkdirp "^0.5.1" node-stream-zip "^1.9.1" - open "^6.2.0" ora "^3.4.0" pretty-format "^25.2.0" semver "^6.3.0" serve-static "^1.13.1" - shell-quote "1.6.1" strip-ansi "^5.2.0" sudo-prompt "^9.0.0" wcwidth "^1.0.1" - ws "^1.1.0" "@react-native-community/clipboard@^1.2.2": version "1.2.2" @@ -1645,11 +1680,6 @@ ansi-red@^0.1.1: dependencies: ansi-wrap "0.1.0" -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= - ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" @@ -1795,7 +1825,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -asap@~2.0.3: +asap@~2.0.3, asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= @@ -2449,15 +2479,6 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - integrity sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ== - dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" - cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -2494,11 +2515,6 @@ co@^4.6.0: resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= - collect-v8-coverage@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" @@ -2739,7 +2755,7 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" -create-react-class@^15.6.2, create-react-class@^15.6.3: +create-react-class@^15.6.2: version "15.6.3" resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" integrity sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg== @@ -3152,10 +3168,10 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4" integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw== -envinfo@^7.1.0: - version "7.5.0" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.5.0.tgz#91410bb6db262fb4f1409bd506e9ff57e91023f4" - integrity sha512-jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ== +envinfo@^7.7.2: + version "7.7.3" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc" + integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA== error-ex@^1.3.1: version "1.3.2" @@ -3248,13 +3264,6 @@ eslint-plugin-jsx-a11y@5.1.1: emoji-regex "^6.1.0" jsx-ast-utils "^1.4.0" -eslint-plugin-relay@1.4.1: - version "1.4.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-relay/-/eslint-plugin-relay-1.4.1.tgz#5af2ac13e24bd01ad17b6a4014204918d65021cd" - integrity sha512-yb+p+4AxZTi2gXN7cZRfXMBFlRa5j6TtiVeq3yHXyy+tlgYNpxi/dDrP1+tcUTNP9vdaJovnfGZ5jp6kMiH9eg== - dependencies: - graphql "^14.0.0" - esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -3717,11 +3726,6 @@ gensync@^1.0.0-beta.1: resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg== -get-caller-file@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w== - get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -3788,13 +3792,6 @@ graceful-fs@^4.2.0: resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb" integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw== -graphql@^14.0.0: - version "14.6.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.6.0.tgz#57822297111e874ea12f5cd4419616930cd83e49" - integrity sha512-VKzfvHEKybTKjQVpTFrA5yUq2S9ihcZvfJAtsDBBCuV6wauPu1xl/f9ehgVf0FcEJJs4vz6ysb/ZMkGigQZseg== - dependencies: - iterall "^1.2.2" - growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -3890,10 +3887,17 @@ hasha@^3.0.0: dependencies: is-stream "^1.0.1" -hermes-engine@~0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.4.1.tgz#2d02b295596298643c4d24b86687eb554db9e950" - integrity sha512-Y3JFC8PD7eN3KpnrzrmvMAqp0IwnZrmP/oGOptvaSu33d7Zq/8b/2lHlZZkNvRl7/I1Q0umTX8TByK7zzLfTXA== +hermes-engine@~0.5.0: + version "0.5.1" + resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.5.1.tgz#601115e4b1e0a17d9aa91243b96277de4e926e09" + integrity sha512-hLwqh8dejHayjlpvZY40e1aDCDvyP98cWx/L5DhAjSJLH8g4z9Tp08D7y4+3vErDsncPOdf1bxm+zUWpx0/Fxg== + +hermes-profile-transformer@^0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz#bd0f5ecceda80dd0ddaae443469ab26fb38fc27b" + integrity sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ== + dependencies: + source-map "^0.7.3" hi-base32@^0.5.0: version "0.5.0" @@ -4061,16 +4065,16 @@ invariant@2.2.4, invariant@^2.2.2, invariant@^2.2.4, invariant@^2.2.x: dependencies: loose-envify "^1.0.0" -invert-kv@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" - integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA== - ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= +ip@^1.1.5: + version "1.1.5" + resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" + integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -4166,13 +4170,6 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -4412,11 +4409,6 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -iterall@^1.2.2: - version "1.3.0" - resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" - integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== - jest-changed-files@^25.4.0: version "25.4.0" resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-25.4.0.tgz#e573db32c2fd47d2b90357ea2eda0622c5c5cbd6" @@ -5048,13 +5040,6 @@ kleur@^3.0.3: resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w== -lcid@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" - integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA== - dependencies: - invert-kv "^2.0.0" - lcov-parse@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0" @@ -5153,14 +5138,14 @@ log-symbols@^2.2.0: dependencies: chalk "^2.0.1" -logkitty@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/logkitty/-/logkitty-0.6.1.tgz#fe29209669d261539cbd6bb998a136fc92a1a05c" - integrity sha512-cHuXN8qUZuzX/7kB6VyS7kB4xyD24e8gyHXIFNhIv+fjW3P+jEXNUhj0o/7qWJtv7UZpbnPgUqzu/AZQ8RAqxQ== +logkitty@^0.7.1: + version "0.7.1" + resolved "https://registry.yarnpkg.com/logkitty/-/logkitty-0.7.1.tgz#8e8d62f4085a826e8d38987722570234e33c6aa7" + integrity sha512-/3ER20CTTbahrCrpYfPn7Xavv9diBROZpoXGVZDWMw4b/X4uuUwAC0ki85tgsdMRONURyIJbcOvS94QsUBYPbQ== dependencies: ansi-fragments "^0.2.1" dayjs "^1.8.15" - yargs "^12.0.5" + yargs "^15.1.0" lolex@^5.0.0: version "5.1.2" @@ -5213,13 +5198,6 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" -map-age-cleaner@^0.1.1: - version "0.1.3" - resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" - integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w== - dependencies: - p-defer "^1.0.0" - map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -5246,15 +5224,6 @@ mdn-data@2.0.6: resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz#852dc60fcaa5daa2e8cf6c9189c440ed3e042978" integrity sha512-rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA== -mem@^4.0.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" - integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w== - dependencies: - map-age-cleaner "^0.1.1" - mimic-fn "^2.0.0" - p-is-promise "^2.0.0" - merge-source-map@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" @@ -5292,6 +5261,20 @@ metro-babel-register@0.58.0: core-js "^2.2.2" escape-string-regexp "^1.0.5" +metro-babel-register@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/metro-babel-register/-/metro-babel-register-0.59.0.tgz#2bcff65641b36794cf083ba732fbc46cf870fb43" + integrity sha512-JtWc29erdsXO/V3loenXKw+aHUXgj7lt0QPaZKPpctLLy8kcEpI/8pfXXgVK9weXICCpCnYtYncIosAyzh0xjg== + dependencies: + "@babel/core" "^7.0.0" + "@babel/plugin-proposal-class-properties" "^7.0.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-proposal-optional-chaining" "^7.0.0" + "@babel/plugin-transform-flow-strip-types" "^7.0.0" + "@babel/plugin-transform-modules-commonjs" "^7.0.0" + "@babel/register" "^7.0.0" + escape-string-regexp "^1.0.5" + metro-babel-transformer@0.58.0: version "0.58.0" resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.58.0.tgz#317c83b863cceb0573943815f1711fbcbe69b106" @@ -5300,6 +5283,14 @@ metro-babel-transformer@0.58.0: "@babel/core" "^7.0.0" metro-source-map "0.58.0" +metro-babel-transformer@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/metro-babel-transformer/-/metro-babel-transformer-0.59.0.tgz#dda99c75d831b00142c42c020c51c103b29f199d" + integrity sha512-fdZJl8rs54GVFXokxRdD7ZrQ1TJjxWzOi/xSP25VR3E8tbm3nBZqS+/ylu643qSr/IueABR+jrlqAyACwGEf6w== + dependencies: + "@babel/core" "^7.0.0" + metro-source-map "0.59.0" + metro-cache@0.58.0: version "0.58.0" resolved "https://registry.yarnpkg.com/metro-cache/-/metro-cache-0.58.0.tgz#630ea0a4626dfb9591c71fdb85dce14b5e9a04ec" @@ -5391,7 +5382,62 @@ metro-react-native-babel-preset@0.58.0: "@babel/template" "^7.0.0" react-refresh "^0.4.0" -metro-react-native-babel-transformer@0.58.0, metro-react-native-babel-transformer@^0.58.0: +metro-react-native-babel-preset@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.59.0.tgz#20e020bc6ac9849e1477de1333d303ed42aba225" + integrity sha512-BoO6ncPfceIDReIH8pQ5tQptcGo5yRWQXJGVXfANbiKLq4tfgdZB1C1e2rMUJ6iypmeJU9dzl+EhPmIFKtgREg== + dependencies: + "@babel/plugin-proposal-class-properties" "^7.0.0" + "@babel/plugin-proposal-export-default-from" "^7.0.0" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-proposal-object-rest-spread" "^7.0.0" + "@babel/plugin-proposal-optional-catch-binding" "^7.0.0" + "@babel/plugin-proposal-optional-chaining" "^7.0.0" + "@babel/plugin-syntax-dynamic-import" "^7.0.0" + "@babel/plugin-syntax-export-default-from" "^7.0.0" + "@babel/plugin-syntax-flow" "^7.2.0" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.0.0" + "@babel/plugin-syntax-optional-chaining" "^7.0.0" + "@babel/plugin-transform-arrow-functions" "^7.0.0" + "@babel/plugin-transform-block-scoping" "^7.0.0" + "@babel/plugin-transform-classes" "^7.0.0" + "@babel/plugin-transform-computed-properties" "^7.0.0" + "@babel/plugin-transform-destructuring" "^7.0.0" + "@babel/plugin-transform-exponentiation-operator" "^7.0.0" + "@babel/plugin-transform-flow-strip-types" "^7.0.0" + "@babel/plugin-transform-for-of" "^7.0.0" + "@babel/plugin-transform-function-name" "^7.0.0" + "@babel/plugin-transform-literals" "^7.0.0" + "@babel/plugin-transform-modules-commonjs" "^7.0.0" + "@babel/plugin-transform-object-assign" "^7.0.0" + "@babel/plugin-transform-parameters" "^7.0.0" + "@babel/plugin-transform-react-display-name" "^7.0.0" + "@babel/plugin-transform-react-jsx" "^7.0.0" + "@babel/plugin-transform-react-jsx-self" "^7.0.0" + "@babel/plugin-transform-react-jsx-source" "^7.0.0" + "@babel/plugin-transform-regenerator" "^7.0.0" + "@babel/plugin-transform-runtime" "^7.0.0" + "@babel/plugin-transform-shorthand-properties" "^7.0.0" + "@babel/plugin-transform-spread" "^7.0.0" + "@babel/plugin-transform-sticky-regex" "^7.0.0" + "@babel/plugin-transform-template-literals" "^7.0.0" + "@babel/plugin-transform-typescript" "^7.5.0" + "@babel/plugin-transform-unicode-regex" "^7.0.0" + "@babel/template" "^7.0.0" + react-refresh "^0.4.0" + +metro-react-native-babel-transformer@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.59.0.tgz#9b3dfd6ad35c6ef37fc4ce4d20a2eb67fabbb4be" + integrity sha512-1O3wrnMq4NcPQ1asEcl9lRDn/t+F1Oef6S9WaYVIKEhg9m/EQRGVrrTVP+R6B5Eeaj3+zNKbzM8Dx/NWy1hUbQ== + dependencies: + "@babel/core" "^7.0.0" + babel-preset-fbjs "^3.3.0" + metro-babel-transformer "0.59.0" + metro-react-native-babel-preset "0.59.0" + metro-source-map "0.59.0" + +metro-react-native-babel-transformer@^0.58.0: version "0.58.0" resolved "https://registry.yarnpkg.com/metro-react-native-babel-transformer/-/metro-react-native-babel-transformer-0.58.0.tgz#5da0e5a1b83c01d11626905fa59f34fda53a21a5" integrity sha512-3A73+cRq1eUPQ8g+hPNGgMUMCGmtQjwqHfoG1DwinAoJ/kr4WOXWWbGZo0xHJNBe/zdHGl0uHcDCp2knPglTdQ== @@ -5402,7 +5448,7 @@ metro-react-native-babel-transformer@0.58.0, metro-react-native-babel-transforme metro-react-native-babel-preset "0.58.0" metro-source-map "0.58.0" -metro-resolver@0.58.0: +metro-resolver@0.58.0, metro-resolver@^0.58.0: version "0.58.0" resolved "https://registry.yarnpkg.com/metro-resolver/-/metro-resolver-0.58.0.tgz#4d03edc52e2e25d45f16688adf3b3f268ea60df9" integrity sha512-XFbAKvCHN2iWqKeiRARzEXn69eTDdJVJC7lu16S4dPQJ+Dy82dZBr5Es12iN+NmbJuFgrAuIHbpWrdnA9tOf6Q== @@ -5422,6 +5468,19 @@ metro-source-map@0.58.0: source-map "^0.5.6" vlq "^1.0.0" +metro-source-map@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/metro-source-map/-/metro-source-map-0.59.0.tgz#e9beb9fc51bfb4e060f95820cf1508fc122d23f7" + integrity sha512-0w5CmCM+ybSqXIjqU4RiK40t4bvANL6lafabQ2GP2XD3vSwkLY+StWzCtsb4mPuyi9R/SgoLBel+ZOXHXAH0eQ== + dependencies: + "@babel/traverse" "^7.0.0" + "@babel/types" "^7.0.0" + invariant "^2.2.4" + metro-symbolicate "0.59.0" + ob1 "0.59.0" + source-map "^0.5.6" + vlq "^1.0.0" + metro-symbolicate@0.58.0: version "0.58.0" resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.58.0.tgz#ba9fd52549c41fc1b656adaad7c8875726dd5abe" @@ -5433,6 +5492,17 @@ metro-symbolicate@0.58.0: through2 "^2.0.1" vlq "^1.0.0" +metro-symbolicate@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/metro-symbolicate/-/metro-symbolicate-0.59.0.tgz#fc7f93957a42b02c2bfc57ed1e8f393f5f636a54" + integrity sha512-asLaF2A7rndrToGFIknL13aiohwPJ95RKHf0NM3hP/nipiLDoMzXT6ZnQvBqDxkUKyP+51AI75DMtb+Wcyw4Bw== + dependencies: + invariant "^2.2.4" + metro-source-map "0.59.0" + source-map "^0.5.6" + through2 "^2.0.1" + vlq "^1.0.0" + metro@0.58.0, metro@^0.58.0: version "0.58.0" resolved "https://registry.yarnpkg.com/metro/-/metro-0.58.0.tgz#c037318c112f80dc96199780c8b401ab72cfd142" @@ -5569,7 +5639,7 @@ mimic-fn@^1.0.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ== -mimic-fn@^2.0.0, mimic-fn@^2.1.0: +mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== @@ -5710,6 +5780,11 @@ nice-try@^1.0.4: resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== +nocache@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/nocache/-/nocache-2.1.0.tgz#120c9ffec43b5729b1d5de88cd71aa75a0ba491f" + integrity sha512-0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q== + node-fetch@^1.0.1: version "1.7.3" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" @@ -5838,11 +5913,6 @@ nullthrows@^1.1.1: resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1" integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw== -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= - number-to-bn@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/number-to-bn/-/number-to-bn-1.7.0.tgz#bb3623592f7e5f9e0030b1977bd41a0c53fe1ea0" @@ -5897,6 +5967,11 @@ ob1@0.58.0: resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.58.0.tgz#484a1e9a63a8b79d9ea6f3a83b2a42110faac973" integrity sha512-uZP44cbowAfHafP1k4skpWItk5iHCoRevMfrnUvYCfyNNPPJd3rfDCyj0exklWi2gDXvjlj2ObsfiqP/bs/J7Q== +ob1@0.59.0: + version "0.59.0" + resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.59.0.tgz#ee103619ef5cb697f2866e3577da6f0ecd565a36" + integrity sha512-opXMTxyWJ9m68ZglCxwo0OPRESIC/iGmKFPXEXzMZqsVIrgoRXOHmoMDkQzz4y3irVjbyPJRAh5pI9fd0MJTFQ== + object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -6024,25 +6099,11 @@ os-homedir@^1.0.1: resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M= -os-locale@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" - integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q== - dependencies: - execa "^1.0.0" - lcid "^2.0.0" - mem "^4.0.0" - os-tmpdir@^1.0.0, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -p-defer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c" - integrity sha1-n26xgvbJqozXQwBKfU+WsZaw+ww= - p-each-series@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" @@ -6058,11 +6119,6 @@ p-finally@^2.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== -p-is-promise@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e" - integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg== - p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -6340,7 +6396,7 @@ pretty-format@^24.7.0, pretty-format@^24.9.0: ansi-styles "^3.2.0" react-is "^16.8.4" -pretty-format@^25.2.0: +pretty-format@^25.1.0, pretty-format@^25.2.0: version "25.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ== @@ -6387,6 +6443,13 @@ promise@^7.1.1: dependencies: asap "~2.0.3" +promise@^8.0.3: + version "8.1.0" + resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" + integrity sha512-W04AqnILOL/sPRXziNicCjSNRruLAuIHEOVBazepu0545DDNGYHz7ar9ZgZ1fMU8/MA4mVxp5rkBWRi6OXIy3Q== + dependencies: + asap "~2.0.6" + prompts@^2.0.1: version "2.3.2" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.3.2.tgz#480572d89ecf39566d2bd3fe2c9fccb7c4c0b068" @@ -6515,10 +6578,10 @@ range-parser@~1.2.1: resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== -react-devtools-core@^4.0.6: - version "4.6.0" - resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.6.0.tgz#2443b3c6fac78b801702af188abc6d83d56224e6" - integrity sha512-sjR3KC5VvGV7X6vzR3OTutPT5VeBcSKwoIXUwihpl1Nb4dkmweEbzCTPx2PYMVAqc+NZ5tPGhqBzXV+iGg5CNA== +react-devtools-core@^4.6.0: + version "4.10.1" + resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-4.10.1.tgz#6d57db291aeac9cc45ef9fb4636dd2ab97490daf" + integrity sha512-sXbBjGAWcf9HAblTP/zMtFhGHqxAfIR+GPxONZsSGN9FHnF4635dx1s2LdQWG9rJ+Ehr3nWg+BUAB6P78my5PA== dependencies: shell-quote "^1.6.1" ws "^7" @@ -6550,9 +6613,9 @@ react-native-camera-kit@^8.0.4: dependencies: lodash "^4.14.2" -"react-native-config@git+https://github.com/status-im/react-native-config.git#v0.11.2-3-status": +"react-native-config@git+https://github.com/status-im/react-native-config.git#v0.11.2-4-status": version "0.11.2" - resolved "git+https://github.com/status-im/react-native-config.git#248bb4454bf4c51e6e4111d0f8399d078ce79d26" + resolved "git+https://github.com/status-im/react-native-config.git#3dbe2939e79d0d19cdc55c319d5d0c7472798a35" react-native-dark-mode@^0.2.2: version "0.2.2" @@ -6717,39 +6780,35 @@ react-native-touch-id@^4.4.1: escape-string-regexp "2.0.0" invariant "2.2.4" -react-native@0.62.2: - version "0.62.2" - resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.62.2.tgz#d831e11a3178705449142df19a70ac2ca16bad10" - integrity sha512-gADZZ3jcm2WFTjh8CCBCbl5wRSbdxqZGd+8UpNwLQFgrkp/uHorwAhLNqcd4+fHmADgPBltNL0uR1Vhv47zcOw== +react-native@0.63.4: + version "0.63.4" + resolved "https://registry.yarnpkg.com/react-native/-/react-native-0.63.4.tgz#2210fdd404c94a5fa6b423c6de86f8e48810ec36" + integrity sha512-I4kM8kYO2mWEYUFITMcpRulcy4/jd+j9T6PbIzR0FuMcz/xwd+JwHoLPa1HmCesvR1RDOw9o4D+OFLwuXXfmGw== dependencies: "@babel/runtime" "^7.0.0" - "@react-native-community/cli" "^4.5.1" - "@react-native-community/cli-platform-android" "^4.5.1" - "@react-native-community/cli-platform-ios" "^4.5.0" + "@react-native-community/cli" "^4.10.0" + "@react-native-community/cli-platform-android" "^4.10.0" + "@react-native-community/cli-platform-ios" "^4.10.0" abort-controller "^3.0.0" anser "^1.4.9" base64-js "^1.1.2" - connect "^3.6.5" - create-react-class "^15.6.3" - escape-string-regexp "^1.0.5" - eslint-plugin-relay "1.4.1" event-target-shim "^5.0.1" fbjs "^1.0.0" fbjs-scripts "^1.1.0" - hermes-engine "~0.4.0" + hermes-engine "~0.5.0" invariant "^2.2.4" jsc-android "^245459.0.0" - metro-babel-register "0.58.0" - metro-react-native-babel-transformer "0.58.0" - metro-source-map "0.58.0" + metro-babel-register "0.59.0" + metro-react-native-babel-transformer "0.59.0" + metro-source-map "0.59.0" nullthrows "^1.1.1" - pretty-format "^24.7.0" - promise "^7.1.1" + pretty-format "^24.9.0" + promise "^8.0.3" prop-types "^15.7.2" - react-devtools-core "^4.0.6" + react-devtools-core "^4.6.0" react-refresh "^0.4.0" regenerator-runtime "^0.13.2" - scheduler "0.17.0" + scheduler "0.19.1" stacktrace-parser "^0.1.3" use-subscription "^1.0.0" whatwg-fetch "^3.0.0" @@ -6759,10 +6818,10 @@ react-refresh@^0.4.0: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.4.2.tgz#54a277a6caaac2803d88f1d6f13c1dcfbd81e334" integrity sha512-kv5QlFFSZWo7OlJFNYbxRtY66JImuP2LcrFgyJfQaf85gSP+byzG21UbDQEYjU7f//ny8rwiEkO6py2Y+fEgAQ== -react@16.13.0: - version "16.13.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.13.0.tgz#d046eabcdf64e457bbeed1e792e235e1b9934cf7" - integrity sha512-TSavZz2iSLkq5/oiE7gnFzmURKZMltmi193rm5HEoUDAXpzT9Kzw6oNZnGoai/4+fUnm7FqS5dwgUL34TujcWQ== +react@16.13.1: + version "16.13.1" + resolved "https://registry.yarnpkg.com/react/-/react-16.13.1.tgz#2e818822f1a9743122c063d6410d85c1e3afe48e" + integrity sha512-YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -6972,11 +7031,6 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE= - require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -7156,15 +7210,7 @@ saxes@^3.1.9: dependencies: xmlchars "^2.1.1" -scheduler@0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.17.0.tgz#7c9c673e4ec781fac853927916d1c426b6f3ddfe" - integrity sha512-7rro8Io3tnCPuY4la/NuI5F2yfESpnfZyT6TtkXnSWVkcu0BCDJ+8gk5ozUaFaxpIyNuWAPXrH0yFcSi28fnDA== - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - -scheduler@^0.19.1: +scheduler@0.19.1, scheduler@^0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== @@ -7592,16 +7638,7 @@ string-length@^3.1.0: astral-regex "^1.0.0" strip-ansi "^5.2.0" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: +string-width@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw== @@ -7675,13 +7712,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= - dependencies: - ansi-regex "^2.0.0" - strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" @@ -8341,14 +8371,6 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU= - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-5.1.0.tgz#1fd1f67235d5b6d0fee781056001bfb694c03b09" @@ -8502,7 +8524,7 @@ xtend@^4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -"y18n@^3.2.1 || ^4.0.0", y18n@^4.0.0: +y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== @@ -8517,14 +8539,6 @@ yallist@^3.0.0, yallist@^3.0.3: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== -yargs-parser@^11.1.1: - version "11.1.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz#879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4" - integrity sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ== - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - yargs-parser@^13.0.0, yargs-parser@^13.1.2: version "13.1.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" @@ -8541,7 +8555,7 @@ yargs-parser@^15.0.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^18.1.1: +yargs-parser@^18.1.1, yargs-parser@^18.1.2: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== @@ -8549,24 +8563,6 @@ yargs-parser@^18.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs@^12.0.5: - version "12.0.5" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13" - integrity sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw== - dependencies: - cliui "^4.0.0" - decamelize "^1.2.0" - find-up "^3.0.0" - get-caller-file "^1.0.1" - os-locale "^3.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1 || ^4.0.0" - yargs-parser "^11.1.1" - yargs@^13.2.2, yargs@^13.2.4: version "13.3.2" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" @@ -8600,6 +8596,23 @@ yargs@^14.2.0: y18n "^4.0.0" yargs-parser "^15.0.1" +yargs@^15.1.0: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + yargs@^15.3.1: version "15.3.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" From 2687d7ab9a99d02427fb13755a75fc8110847529 Mon Sep 17 00:00:00 2001 From: Frank Tang Date: Tue, 29 Dec 2020 14:58:52 +0800 Subject: [PATCH 11/11] added github.com to white list of link preview Signed-off-by: andrey --- src/status_im/utils/config.cljs | 2 +- status-go-version.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/status_im/utils/config.cljs b/src/status_im/utils/config.cljs index 642b874b31..afc84b8571 100644 --- a/src/status_im/utils/config.cljs +++ b/src/status_im/utils/config.cljs @@ -142,4 +142,4 @@ default-networks))) (def link-preview-enabled-site? - #{"youtube.com" "youtu.be"}) + #{"youtube.com" "youtu.be" "github.com"}) diff --git a/status-go-version.json b/status-go-version.json index 82adf7217b..81f7157ec8 100644 --- a/status-go-version.json +++ b/status-go-version.json @@ -2,7 +2,7 @@ "_comment": "DO NOT EDIT THIS FILE BY HAND. USE 'scripts/update-status-go.sh ' instead", "owner": "status-im", "repo": "status-go", - "version": "v0.67.0", - "commit-sha1": "f5482ec187b981dd77d184cc7003dcc0c6ae5d22", - "src-sha256": "18bzsf1nskvsvkxxw9v8v4zpgxfaag7q6a07fbdmz7f0y3a3mxjz" + "version": "v0.68.0", + "commit-sha1": "922e78551284a4762336962d7d34ce39ca5546b6", + "src-sha256": "1maykmanvdj0iv72lgyh6hpms0j0xbw1zhl42rb0rjj8kkidpway" }