local pair: check netIPs if empty before find server cert

(cherry picked from commit 7153e4da48)

.carve_ignore

@@ -1,55 +1,55 @@
-legacy.status-im.utils.build/warning-handler
-legacy.status-im.utils.build/get-current-sha
-status-im.constants/spacing-char
-status-im.constants/arg-wrapping-char
-legacy.status-im.ios.core/init
-legacy.status-im.ui.components.camera/aspects
-legacy.status-im.ui.components.camera/capture-targets
-legacy.status-im.ui.components.camera/set-torch
-legacy.status-im.ui.components.camera/request-access-ios
-legacy.status-im.chat.models.message-content/stylings
-legacy.status-im.chat.models.message-content/actions
-legacy.status-im.chat.models.message-content/blank-string
-legacy.status-im.chat.models.message-content/sorted-ranges
-legacy.status-im.ethereum.mnemonic/words->passphrase
+status-im.utils.build/warning-handler
+status-im.utils.build/get-current-sha
+status-im2.constants/spacing-char
+status-im2.constants/arg-wrapping-char
+status-im.ios.core/init
+status-im.ui.components.camera/aspects
+status-im.ui.components.camera/capture-targets
+status-im.ui.components.camera/set-torch
+status-im.ui.components.camera/request-access-ios
+status-im.chat.models.message-content/stylings
+status-im.chat.models.message-content/actions
+status-im.chat.models.message-content/blank-string
+status-im.chat.models.message-content/sorted-ranges
+status-im.ethereum.mnemonic/words->passphrase
 native-module.core/listener
 native-module.core/multiaccount-reset
 native-module.core/extract-group-membership-signatures
 native-module.core/sign-group-membership
 native-module.core/update-mailservers
-legacy.status-im.ethereum.abi-spec/bytes-to-hex
-legacy.status-im.android.core/init
-legacy.status-im.chat.models.message/transport-keys
-legacy.status-im.utils.datetime/week
-legacy.status-im.utils.datetime/time-ago
-legacy.status-im.utils.datetime/format-date
-legacy.status-im.utils.datetime/get-ordinal-date
+status-im.ethereum.abi-spec/bytes-to-hex
+status-im.android.core/init
+status-im.chat.models.message/transport-keys
+status-im.utils.datetime/week
+status-im.utils.datetime/time-ago
+status-im.utils.datetime/format-date
+status-im.utils.datetime/get-ordinal-date
 reagent.dom/render
 reagent.dom/unmount-component-at-node
 reagent.dom/dom-node
 reagent.dom/force-update-all
-legacy.status-im.multiaccounts.create.core/get-new-key-code
-legacy.status-im.ethereum.decode/string
-legacy.status-im.ui.screens.network.views/mainnet?
-legacy.status-im.data-store.chats/event->string
-legacy.status-im.mailserver.constants/seven-days
-legacy.status-im.mailserver.constants/connection-timeout
-legacy.status-im.hardwallet.card/install-applet
-legacy.status-im.hardwallet.card/install-cash-applet
-legacy.status-im.multiaccount.login.data-test/all-contacts
-legacy.status-im.multiaccount.login.data-test/multiaccounts
-legacy.status-im.multiaccount.login.data-test/get-chats
-legacy.status-im.multiaccount.login.data-test/transport
-legacy.status-im.multiaccount.login.data-test/topics
-legacy.status-im.utils.utils/clear-timeout
-legacy.status-im.utils.handlers/logged-in
-legacy.status-im.multiaccounts.model/credentials
-legacy.status-im.multiaccounts.login.core/contract-fleet?
-legacy.status-im.multiaccounts.login.core/fetch-nodes
-status-im.config/rpc-networks-only?
-status-im.config/waku-enabled?
-legacy.status-im.utils.pairing/has-paired-installations?
-legacy.status-im.tribute-to-talk.core-test/user-cofx
+status-im.multiaccounts.create.core/get-new-key-code
+status-im.ethereum.decode/string
+status-im.ui.screens.network.views/mainnet?
+status-im.data-store.chats/event->string
+status-im.mailserver.constants/seven-days
+status-im.mailserver.constants/connection-timeout
+status-im.hardwallet.card/install-applet
+status-im.hardwallet.card/install-cash-applet
+status-im.multiaccount.login.data-test/all-contacts
+status-im.multiaccount.login.data-test/multiaccounts
+status-im.multiaccount.login.data-test/get-chats
+status-im.multiaccount.login.data-test/transport
+status-im.multiaccount.login.data-test/topics
+status-im.utils.utils/clear-timeout
+status-im.utils.handlers/logged-in
+status-im.multiaccounts.model/credentials
+status-im.multiaccounts.login.core/contract-fleet?
+status-im.multiaccounts.login.core/fetch-nodes
+status-im2.config/rpc-networks-only?
+status-im2.config/waku-enabled?
+status-im.utils.pairing/has-paired-installations?
+status-im.tribute-to-talk.core-test/user-cofx
 mocks.js-dependencies/action-button
 mocks.js-dependencies/camera
 mocks.js-dependencies/dismiss-keyboard
@@ -78,108 +78,109 @@ mocks.js-dependencies/react-navigation-bottom-tabs
 mocks.js-dependencies/react-native-haptic-feedback
 mocks.js-dependencies/mock
 quo.previews.main/init
-legacy.status-im.chat.models.message-list-test/descending-range
-legacy.status-im.chat.models.message-list-test/random-range
-legacy.status-im.ethereum.eip165/supports?
-legacy.status-im.utils.hex/valid-hex?
-legacy.status-im.multiaccounts.core/chat-send?
-legacy.status-im.hardwallet.simulated-keycard/install-cash-applet
-legacy.status-im.hardwallet.simulated-keycard/sign-typed-data
-legacy.status-im.utils.core/safe-read-message-content
-legacy.status-im.ui.components.react/native-modules
-legacy.status-im.ui.components.react/progress-bar
+status-im.chat.models.message-list-test/descending-range
+status-im.chat.models.message-list-test/random-range
+status-im.ethereum.eip165/supports?
+status-im.utils.hex/valid-hex?
+status-im.multiaccounts.core/chat-send?
+status-im.hardwallet.simulated-keycard/install-cash-applet
+status-im.hardwallet.simulated-keycard/sign-typed-data
+status-im.utils.core/safe-read-message-content
+status-im.ui.components.react/native-modules
+status-im.ui.components.react/progress-bar
 react-native.fs/move-file
 react-native.fs/read-dir
 react-native.fs/mkdir
 react-native.fs/unlink
 react-native.fs/file-exists?
-legacy.status-im.ui.components.colors/white
-legacy.status-im.ui.components.colors/black
-legacy.status-im.ui.components.core/animated-header
-legacy.status-im.ui.components.core/safe-area-provider
-legacy.status-im.ui.components.core/safe-area-consumer
-legacy.status-im.ui.components.core/safe-area-view
-legacy.status-im.utils.universal-links.core/open!
-legacy.status-im.transport.filters.core-test/member-2
-legacy.status-im.ui.screens.chat.ttt/one-to-one-chat-description-container
-legacy.status-im.ethereum.ens/ttl
-legacy.status-im.ethereum.ens/addr-hash
-legacy.status-im.ethereum.ens/name-hash
-legacy.status-im.ethereum.ens/ABI-hash
-legacy.status-im.ethereum.ens/pubkey-hash
-legacy.status-im.network.core/get-network
-status-im.constants/desktop-content-types
-status-im.constants/blocks-per-hour
-status-im.constants/one-earth-day
-status-im.constants/left-pane-min-width
-status-im.constants/system
-status-im.constants/contact-discovery
-status-im.constants/send-transaction-failed-parse-response
-status-im.constants/send-transaction-failed-parse-params
-status-im.constants/send-transaction-no-account-selected
-status-im.constants/send-transaction-invalid-tx-sender
-status-im.constants/web3-get-logs
-status-im.constants/web3-transaction-receipt
-status-im.constants/web3-new-filter
-status-im.constants/web3-new-pending-transaction-filter
-status-im.constants/web3-new-block-filter
-status-im.constants/web3-uninstall-filter
-status-im.constants/web3-get-filter-changes
-status-im.constants/web3-shh-post
-status-im.constants/web3-shh-new-identity
-status-im.constants/web3-shh-has-identity
-status-im.constants/web3-shh-new-group
-status-im.constants/web3-shh-add-to-group
-status-im.constants/web3-shh-new-filter
-status-im.constants/web3-shh-uninstall-filter
-status-im.constants/web3-shh-get-filter-changes
-status-im.constants/web3-shh-get-messages
-status-im.constants/status-create-address
-status-im.constants/event-transfer-hash
-status-im.constants/regx-rtl-characters
-status-im.constants/desktop-msg-chars-hard-limit
-status-im.constants/debug-metrics
-status-im.constants/scan-qr-code
-status-im.constants/ipfs-proto-code
-status-im.constants/swarm-proto-code
-legacy.status-im.multiaccounts.update.publisher/publish-update!
-legacy.status-im.utils.async/task-queue
-legacy.status-im.utils.async/async-periodic-run!
-legacy.status-im.desktop.core/app-root
-legacy.status-im.desktop.core/init
-legacy.status-im.chat.models-test/test-db
-legacy.status-im.ui.components.spacing/padding-vertical
-legacy.status-im.utils.money/percent-change
+status-im.ui.components.colors/white
+status-im.ui.components.colors/black
+status-im.transport.core-test/messages
+status-im.ui.components.core/animated-header
+status-im.ui.components.core/safe-area-provider
+status-im.ui.components.core/safe-area-consumer
+status-im.ui.components.core/safe-area-view
+status-im.utils.universal-links.core/open!
+status-im.transport.filters.core-test/member-2
+status-im.ui.screens.chat.ttt/one-to-one-chat-description-container
+status-im.ethereum.ens/ttl
+status-im.ethereum.ens/addr-hash
+status-im.ethereum.ens/name-hash
+status-im.ethereum.ens/ABI-hash
+status-im.ethereum.ens/pubkey-hash
+status-im.network.core/get-network
+status-im2.constants/desktop-content-types
+status-im2.constants/blocks-per-hour
+status-im2.constants/one-earth-day
+status-im2.constants/left-pane-min-width
+status-im2.constants/system
+status-im2.constants/contact-discovery
+status-im2.constants/send-transaction-failed-parse-response
+status-im2.constants/send-transaction-failed-parse-params
+status-im2.constants/send-transaction-no-account-selected
+status-im2.constants/send-transaction-invalid-tx-sender
+status-im2.constants/web3-get-logs
+status-im2.constants/web3-transaction-receipt
+status-im2.constants/web3-new-filter
+status-im2.constants/web3-new-pending-transaction-filter
+status-im2.constants/web3-new-block-filter
+status-im2.constants/web3-uninstall-filter
+status-im2.constants/web3-get-filter-changes
+status-im2.constants/web3-shh-post
+status-im2.constants/web3-shh-new-identity
+status-im2.constants/web3-shh-has-identity
+status-im2.constants/web3-shh-new-group
+status-im2.constants/web3-shh-add-to-group
+status-im2.constants/web3-shh-new-filter
+status-im2.constants/web3-shh-uninstall-filter
+status-im2.constants/web3-shh-get-filter-changes
+status-im2.constants/web3-shh-get-messages
+status-im2.constants/status-create-address
+status-im2.constants/event-transfer-hash
+status-im2.constants/regx-rtl-characters
+status-im2.constants/desktop-msg-chars-hard-limit
+status-im2.constants/debug-metrics
+status-im2.constants/scan-qr-code
+status-im2.constants/ipfs-proto-code
+status-im2.constants/swarm-proto-code
+status-im.multiaccounts.update.publisher/publish-update!
+status-im.utils.async/task-queue
+status-im.utils.async/async-periodic-run!
+status-im.desktop.core/app-root
+status-im.desktop.core/init
+status-im.chat.models-test/test-db
+status-im.ui.components.spacing/padding-vertical
+status-im.utils.money/percent-change
 utils.debounce/clear-all
-legacy.status-im.transport.db/create-chat
-legacy.status-im.utils.priority-map/priority-map
-legacy.status-im.utils.priority-map/priority-map-by
-legacy.status-im.utils.priority-map/priority-map-keyfn
-legacy.status-im.utils.priority-map/empty-message-map
-legacy.status-im.wallet.choose-recipient.core/use-default-eth-gas
-legacy.status-im.ui.components.animation/decay
-legacy.status-im.ui.components.animation/remove-all-listeners
-legacy.status-im.ui.components.animation/stop-animation
-legacy.status-im.ui.components.animation/animated
-legacy.status-im.ui.components.animation/add
-legacy.status-im.ui.components.animation/subtract
-legacy.status-im.ui.components.animation/get-layout
-legacy.status-im.wallet.transactions-test/uri-query-data
-legacy.status-im.utils.name/shortened-name
-legacy.status-im.ui.components.button.haptic/trigger
-legacy.status-im.contact.db/filter-dapps
-legacy.status-im.contact.db/filter-group-contacts
-legacy.status-im.contact.db/legacy-pending?
-legacy.status-im.utils.transducers-test/preview-call-1
-legacy.status-im.utils.transducers-test/preview-call-2
-legacy.status-im.utils.types/to-string
-legacy.status-im.chat.db/datemark?
-legacy.status-im.chat.db/gap?
-legacy.status-im.chat.db/map->sorted-seq
-legacy.status-im.utils.snoopy/status-module-filter
-legacy.status-im.utils.snoopy/websocket-filter
-legacy.status-im.utils.snoopy/touches-filter
-legacy.status-im.utils.snoopy/native-animation-filter
-legacy.status-im.utils.snoopy/keyboard-observer-filter
-legacy.status-im.utils.multihash/hex
-legacy.status-im.utils.multihash/decode-array
+status-im.transport.db/create-chat
+status-im.utils.priority-map/priority-map
+status-im.utils.priority-map/priority-map-by
+status-im.utils.priority-map/priority-map-keyfn
+status-im.utils.priority-map/empty-message-map
+status-im.wallet.choose-recipient.core/use-default-eth-gas
+status-im.ui.components.animation/decay
+status-im.ui.components.animation/remove-all-listeners
+status-im.ui.components.animation/stop-animation
+status-im.ui.components.animation/animated
+status-im.ui.components.animation/add
+status-im.ui.components.animation/subtract
+status-im.ui.components.animation/get-layout
+status-im.wallet.transactions-test/uri-query-data
+status-im.utils.name/shortened-name
+status-im.ui.components.button.haptic/trigger
+status-im.contact.db/filter-dapps
+status-im.contact.db/filter-group-contacts
+status-im.contact.db/legacy-pending?
+status-im.utils.transducers-test/preview-call-1
+status-im.utils.transducers-test/preview-call-2
+status-im.utils.types/to-string
+status-im.chat.db/datemark?
+status-im.chat.db/gap?
+status-im.chat.db/map->sorted-seq
+status-im.utils.snoopy/status-module-filter
+status-im.utils.snoopy/websocket-filter
+status-im.utils.snoopy/touches-filter
+status-im.utils.snoopy/native-animation-filter
+status-im.utils.snoopy/keyboard-observer-filter
+status-im.utils.multihash/hex
+status-im.utils.multihash/decode-array

.clj-kondo/config.edn

@@ -1,39 +1,30 @@
 {:config-paths ["status-im"]
- :lint-as      {legacy.status-im.utils.views/defview clojure.core/defn
-                legacy.status-im.utils.views/letsubs clojure.core/let
-                reagent.core/with-let                clojure.core/let
-                legacy.status-im.utils.fx/defn       clj-kondo.lint-as/def-catch-all
-                utils.re-frame/defn                  clj-kondo.lint-as/def-catch-all
-                quo.react/with-deps-check            clojure.core/fn
-                quo.previews.preview/list-comp       clojure.core/for
-                legacy.status-im.utils.styles/def    clojure.core/def
-                legacy.status-im.utils.styles/defn   clojure.core/defn
-                test-helpers.unit/deftest-sub        clojure.core/defn
-                taoensso.tufte/defnp                 clojure.core/defn}
+ :lint-as      {status-im.utils.views/defview  clojure.core/defn
+                status-im.utils.views/letsubs  clojure.core/let
+                reagent.core/with-let          clojure.core/let
+                status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
+                utils.re-frame/defn            clj-kondo.lint-as/def-catch-all
+                quo.react/with-deps-check      clojure.core/fn
+                quo.previews.preview/list-comp clojure.core/for
+                status-im.utils.styles/def     clojure.core/def
+                status-im.utils.styles/defn    clojure.core/defn
+                test-helpers.unit/deftest-sub  clojure.core/defn
+                taoensso.tufte/defnp           clojure.core/defn}
  :linters      {:case-duplicate-test           {:level :error}
                 :case-quoted-test              {:level :error}
                 :case-symbol-test              {:level :error}
                 :clj-kondo-config              {:level :error}
                 :cond-else                     {:level :error}
                 :consistent-alias              {:level   :error
-                                                :aliases {clojure.set      set
-                                                          clojure.string   string
-                                                          clojure.walk     walk
-                                                          malli.core       malli
-                                                          malli.dev.pretty malli.pretty
-                                                          malli.dev.virhe  malli.virhe
-                                                          malli.error      malli.error
-                                                          malli.generator  malli.generator
-                                                          malli.transform  malli.transform
-                                                          malli.util       malli.util
-                                                          schema.core      schema
-                                                          taoensso.timbre  log}}
+                                                :aliases {clojure.string  string
+                                                          clojure.set     set
+                                                          clojure.walk    walk
+                                                          taoensso.timbre log}}
                 :deprecated-namespace          {:level :warning}
                 :docstring-blank               {:level :error}
                 :equals-true                   {:level :error}
                 :inline-def                    {:level :error}
-                :invalid-arity                 {:skip-args [legacy.status-im.utils.fx/defn
-                                                            utils.re-frame/defn]}
+                :invalid-arity                 {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
                 :loop-without-recur            {:level :error}
                 :minus-one                     {:level :error}
                 :misplaced-docstring           {:level :error}
@@ -63,7 +54,7 @@
                 ;; https://github.com/borkdude/clj-kondo/issues/867
                 :unresolved-symbol             {:exclude [PersistentPriorityMap.EMPTY
                                                           number
-                                                          legacy.status-im.test-helpers/restore-app-db]}
+                                                          status-im.test-helpers/restore-app-db]}
                 :unresolved-var                {:level :error}
                 :unsorted-required-namespaces  {:level :error}
                 :unused-alias                  {:level :warning}

.clj-kondo/metosin/malli/config.edn

@@ -1,2 +0,0 @@
-{:lint-as {malli.experimental/defn schema.core/defn}
- :linters {:unresolved-symbol {:exclude [(malli.core/=>)]}}}

.clj-kondo/nubank/matcher-combinators/config.edn

@@ -1,4 +0,0 @@
-{:linters
- {:unresolved-symbol
-  {:exclude [(cljs.test/is [match? thrown-match?])
-             (clojure.test/is [match? thrown-match?])]}}}

.clj-kondo/status-im/config.edn

@@ -1,8 +1,2 @@
-{:hooks
- {:analyze-call
-  {utils.i18n/label                                     utils.i18n/label
-   test-helpers.component/get-all-by-translation-text   utils.i18n/label
-   test-helpers.component/get-by-translation-text       utils.i18n/label
-   test-helpers.component/query-all-by-translation-text utils.i18n/label
-   test-helpers.component/query-by-translation-text     utils.i18n/label}}
+{:hooks   {:analyze-call {utils.i18n/label utils.i18n/label}}
  :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}

.eslintrc.js

@@ -1,4 +1,4 @@
 module.exports = {
   root: true,
-  extends: '@react-native',
+  extends: '@react-native-community',
 };

.gitignore

@@ -36,10 +36,6 @@ project.xcworkspace
 **/android/.project
 **/android/.settings/org.eclipse.buildship.core.prefs
 local.properties
-*.hprof
-.cxx/
-*.keystore
-!debug.keystore
 
 # Atom
 .tags*
@@ -198,4 +194,3 @@ lefthook.yml
 ## clj-kondo
 /.clj-kondo/taoensso/*
 /.clj-kondo/babashka/*
-/.clj-kondo/rewrite-clj/rewrite-clj/config.edn

.nycrc

@@ -1,10 +1,10 @@
 {
   "include": [
-    "target/test/legacy/status_im/**"
+    "target/test/status_im/**"
   ],
   "exclude": [
-    "target/test/legacy/status_im/test/**",
-    "target/test/legacy/status_im/ui/**"
+    "target/test/status_im/test/**",
+    "target/test/status_im/ui/**"
   ],
   "report-dir": "./coverage-report",
   "all": true,
@@ -14,4 +14,4 @@
   "exclude-after-remap": false,
   "extension": [".js"],
   "reporter": ["lcovonly"]
-}
+}

.zprintrc

@@ -18,17 +18,13 @@
              ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-bl
              :respect-bl
 
-             ;; hang multiline left-hand-thing
+             ;; hang multiline left-hand-thing 
              ;; https://github.com/kkinnear/zprint/issues/273
              :multi-lhs-hang]
  :fn-map
  {"reg-sub"         :arg1-pair
   "h/describe"      :arg1-body
-  "h/describe-skip" :arg1-body
-  "h/describe-only" :arg1-body
   "h/test"          :arg1-body
-  "h/test-skip"     :arg1-body
-  "h/test-only"     :arg1-body
   "global.describe" :arg1-body
   "global.test"     :arg1-body
   "list-comp"       :binding
@@ -36,12 +32,10 @@
   "letsubs"         :binding
   "with-let"        "let"
   "reg-event-fx"    :arg1-pair
-  "reg-fx"          :arg1-pair
   "testing"         :arg1-body
   "deftest-sub"     :arg1-body
   "wait-for"        :arg1-body
   "with-deps-check" :arg1-body
-  "schema/=>"       :arg1-body
   "->"              [:noarg1-body
                      {:list               {:constant-pair? false :force-nl? false}
                       :next-inner-restore [[:list :constant-pair?]]}]

Makefile

@@ -283,9 +283,9 @@ run-ios: export TARGET := ios
 run-ios: export IOS_STATUS_GO_TARGETS := iossimulator/amd64
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
-	npx react-native run-ios --simulator="$(SIMULATOR)" | xcbeautify
+	npx react-native run-ios --simulator="$(SIMULATOR)"
 else
-	npx react-native run-ios | xcbeautify
+	npx react-native run-ios
 endif
 
 show-ios-devices: ##@other shows connected ios device and its name
@@ -311,14 +311,13 @@ endef
 lint: export TARGET := clojure
 lint: export CLJ_LINTER_PRINT_WARNINGS ?= false
 lint: ##@test Run code style checks
-	@sh scripts/lint/re-frame-in-quo-components.sh && \
-	sh scripts/lint/direct-require-component-outside-quo.sh && \
-	sh scripts/lint/require-i18n-resource-first.sh && \
+	@sh scripts/lint-re-frame-in-quo-components.sh && \
+	sh scripts/lint-direct-require-component-outside-quo.sh && \
 	clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	scripts/lint/translations.clj && \
+	scripts/lint_translations.clj && \
 	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	sh scripts/lint/trailing-newline.sh && \
+	sh scripts/lint-trailing-newline.sh && \
 	node_modules/.bin/prettier --write .
 
 # NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
@@ -327,8 +326,8 @@ lint-fix: ##@test Run code style checks and fix issues
 	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
 	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	clojure-lsp --ns-exclude-regex ".*/src/status_im/core\.cljs|.*/src/test_helpers/component_tests_preload\.cljs$$" clean-ns && \
-	sh scripts/lint/trailing-newline.sh --fix && \
+	clojure-lsp --ns-exclude-regex ".*/src/status_im2/core\.cljs$$" clean-ns && \
+	sh scripts/lint-trailing-newline.sh --fix && \
 	node_modules/.bin/prettier --write .
 
 shadow-server: export TARGET := clojure
@@ -364,23 +363,21 @@ android-test:
 component-test-watch: export TARGET := clojure
 component-test-watch: export COMPONENT_TEST := true
 component-test-watch: export BABEL_ENV := test
-component-test-watch: export JEST_USE_SILENT_REPORTER := false
 component-test-watch: ##@ Watch tests and re-run no changes to cljs files
 	@@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	yarn install
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js --testEnvironment node ' -e cljs
+	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
 
 component-test: export TARGET := clojure
 component-test: export COMPONENT_TEST := true
 component-test: export BABEL_ENV := test
-component-test: export JEST_USE_SILENT_REPORTER := false
 component-test: ##@test Run component tests once in NodeJS
 	@scripts/check-metro-shadow-process.sh
 	rm -rf ./component-spec
 	yarn install
 	yarn shadow-cljs compile component-test && \
-	jest --clearCache && jest --config=test/jest/jest.config.js --testEnvironment node
+	jest --config=test/jest/jest.config.js
 
 #--------------
 # Other

VERSION

@@ -1 +1 @@
-1.25.0
+1.26.0

android/app/build.gradle

@@ -1,75 +1,128 @@
 apply plugin: "com.android.application"
-apply plugin: "org.jetbrains.kotlin.android"
-apply plugin: "com.facebook.react"
 
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
 
 import com.android.build.OutputFile
 import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
 
-/*
- * This is the configuration block to customize your React Native Android app.
- * By default you don't need to apply any configuration, just uncomment the lines you need.
+/**
+ * The react.gradle file registers a task for each build variant:
+ * - bundlePrJsAndAssets
+ * - bundleDebugJsAndAssets
+ * - bundleReleaseJsAndAssets
+ * These basically call `react-native bundle` with the correct arguments during the Android build
+ * cycle. By default, bundleDebugJsAndAssets is skipped, as in debug/dev mode we prefer to load the
+ * bundle directly from the development server. Below you can see all the possible configurations
+ * and their defaults. If you decide to add a configuration block, make sure to add it before the
+ * `apply from: "../../node_modules/react-native/react.gradle"` line.
+ *
+ * project.ext.react = [
+ *   // the name of the generated asset file containing your JS bundle
+ *   bundleAssetName: "index.android.bundle",
+ *
+ *   // the entry file for bundle generation
+ *   entryFile: "index.js",
+ *
+ *   // whether to bundle JS and assets in debug mode
+ *   bundleInDebug: false,
+ *
+ *   // whether to bundle JS and assets in release mode
+ *   bundleInRelease: true,
+ *
+ *   // whether to bundle JS and assets in another build variant (if configured).
+ *   // See http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Build-Variants
+ *   // The configuration property can be in the following formats
+ *   //         'bundleIn${productFlavor}${buildType}'
+ *   //         'bundleIn${buildType}'
+ *   // bundleInFreeDebug: true,
+ *   // bundleInPaidRelease: true,
+ *   // bundleInBeta: true,
+ *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
+ *   // the root of your project, i.e. where "package.json" lives
+ *   root: "../../",
+ *
+ *   // where to put the JS bundle asset in debug mode
+ *   jsBundleDirDebug: "$buildDir/intermediates/assets/debug",
+ *
+ *   // where to put the JS bundle asset in release mode
+ *   jsBundleDirRelease: "$buildDir/intermediates/assets/release",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in debug mode
+ *   resourcesDirDebug: "$buildDir/intermediates/res/merged/debug",
+ *
+ *   // where to put drawable resources / React Native assets, e.g. the ones you use via
+ *   // require('./image.png')), in release mode
+ *   resourcesDirRelease: "$buildDir/intermediates/res/merged/release",
+ *
+ *   // by default the gradle tasks are skipped if none of the JS files or assets change; this means
+ *   // that we don't look at files in android/ or ios/ to determine whether the tasks are up to
+ *   // date; if you have any other folders that you want to ignore for performance reasons (gradle
+ *   // indexes the entire tree), add them here. Alternatively, if you have JS files in android/
+ *   // for example, you might want to remove it from here.
+ *   inputExcludes: ["android/**", "ios/**"],
+ *
+ *   // override which node gets called and with what additional arguments
+ *   nodeExecutableAndArgs: ["node", "--max-old-space-size=8192"],
+ *
+ *   // supply additional arguments to the packager
+ *   extraPackagerArgs: []
+ * ]
  */
-react {
-    /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '..'
-    // root = file("../")
-    //   The folder where the react-native NPM package is. Default is ../node_modules/react-native
-    // reactNativeDir = file("../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../node_modules/@react-native/codegen
-    // codegenDir = file("../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../node_modules/react-native/cli.js
-    // cliFile = file("../node_modules/react-native/cli.js")
 
-    /* Variants */
-    //   The list of variants to that are debuggable. For those we're going to
-    //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
-    //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
-    // debuggableVariants = ["liteDebug", "prodDebug"]
+/*
+ Enabling Hermes on x86 devices is crashing the app after a few reloads,
+ this flag can be used to disable Hermes while building app.
+ https://github.com/status-im/status-mobile/issues/14031
+ */
 
-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    nodeExecutableAndArgs = ["node", "--max-old-space-size=16384" ]
-    //
-    //   The command to run when bundling. By default is 'bundle'
-    // bundleCommand = "ram-bundle"
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
+def disableHermes = System.getenv('DISABLE_HERMES') == 'true'
 
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-}
+project.ext.react = [
+    nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"],
+    entryFile: "index.js",
+    /* NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices,
+     *       to guard against a hang in the UI thread after invoking status-go.
+     * Also a clean and rebuild is required when changing this. */
+    enableHermes: !disableHermes,
+    /* Disable 'The first definition was here.' warnings */
+    hermesFlagsRelease: ["-w"],
+    /* FIXME: Workaround for crash caused by missing libhermes-executor-release.so.
+     * https://github.com/facebook/react-native/issues/32928 */
+    deleteDebugFilesForVariant: { false },
+    enableVmCleanup: false,
+    bundleInPr: true,
+    inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
+]
+
+// NOTE: Uncomment if building RN from a fork
+// configurations.all {
+//     exclude group: 'com.facebook.react', module: 'react-native'
+// }
+
+apply from: "../../node_modules/react-native/react.gradle"
 
 /**
- * Set this to true to Run Proguard on Release builds to minify the Java bytecode.
+ * Run Proguard to shrink the Java bytecode in release builds.
  */
 def enableProguardInReleaseBuilds = false
 
 /**
- * The preferred build flavor of JavaScriptCore (JSC)
+ * The preferred build flavor of JavaScriptCore.
  *
  * For example, to use the international variant, you can use:
  * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
  *
  * The international variant includes ICU i18n library and necessary data
  * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US. Note that
+ * give correct results when using with locales other than en-US.  Note that
  * this variant is about 6MiB larger per architecture than default.
  */
 def jscFlavor = 'org.webkit:android-jsc:+'
@@ -81,8 +134,15 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
  * and the benefits of using Hermes will therefore be sharply reduced.
  */
-def enableHermes = hermesEnabled.toBoolean();
+def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Architectures to build native code for.
+ */
+def reactNativeArchitectures() {
+    def value = project.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
 
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
@@ -145,7 +205,6 @@ android {
         targetCompatibility JavaVersion.VERSION_11
     }
 
-    namespace "im.status.ethereum"
     defaultConfig {
         applicationId "im.status.ethereum"
         minSdkVersion rootProject.ext.minSdkVersion
@@ -161,8 +220,70 @@ android {
                 abiFilters getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
             }
         }
+	buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+
+        if (isNewArchitectureEnabled()) {
+            // We configure the NDK build only if you decide to opt-in for the New Architecture.
+            externalNativeBuild {
+                ndkBuild {
+                    arguments "APP_PLATFORM=android-21",
+                        "APP_STL=c++_shared",
+                        "NDK_TOOLCHAIN_VERSION=clang",
+                        "GENERATED_SRC_DIR=$buildDir/generated/source",
+                        "PROJECT_BUILD_DIR=$buildDir",
+                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
+                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
+                        "NODE_MODULES_DIR=$rootDir/../node_modules"
+                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+                    cppFlags "-std=c++17"
+                    // Make sure this target name is the same you specify inside the
+                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
+                    targets "rndiffapp_appmodules"
+                }
+            }
+        }
     }
 
+       if (isNewArchitectureEnabled()) {
+           // We configure the NDK build only if you decide to opt-in for the New Architecture.
+           externalNativeBuild {
+               ndkBuild {
+                   path "$projectDir/src/main/jni/Android.mk"
+               }
+           }
+           def reactAndroidProjectDir = project(':ReactAndroid').projectDir
+           def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
+               dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
+               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+               into("$buildDir/react-ndk/exported")
+           }
+           def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
+               dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
+               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
+               into("$buildDir/react-ndk/exported")
+           }
+           afterEvaluate {
+               // If you wish to add a custom TurboModule or component locally,
+               // you should uncomment this line.
+               // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
+               preDebugBuild.dependsOn(packageReactNdkDebugLibs)
+               preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
+
+               // Due to a bug inside AGP, we have to explicitly set a dependency
+               // between configureNdkBuild* tasks and the preBuild tasks.
+               // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
+               configureNdkBuildRelease.dependsOn(preReleaseBuild)
+               configureNdkBuildDebug.dependsOn(preDebugBuild)
+               reactNativeArchitectures().each { architecture ->
+                   tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
+                       dependsOn("preDebugBuild")
+                   }
+                   tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
+                       dependsOn("preReleaseBuild")
+                   }
+               }
+           }
+       }
     /**
      * Arbitrary project metadata
      * https://docs.gradle.org/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
@@ -233,11 +354,10 @@ android {
             versionNameSuffix   ".pr"
             debuggable          false
             matchingFallbacks = ["release"]
-             // necessary to make react-native-config's code generation work
-             resValue "string", "build_config_package", "im.status.ethereum"
+            // necessary to make react-native-config's code generation work
+            resValue "string", "build_config_package", "im.status.ethereum"
         }
     }
-
     // applicationVariants are e.g. debug, release
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
@@ -253,7 +373,6 @@ android {
         }
     }
 
-
     aaptOptions {
         // disable PNG optimization as for some reason it cannot be trusted to provide deterministic output (see https://f-droid.org/en/docs/Reproducible_Builds/)
         cruncherEnabled = false
@@ -265,12 +384,16 @@ android {
 }
 
 dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'com.facebook.soloader:soloader:0.10.3+'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
     implementation "androidx.core:core-splashscreen:1.0.0"
 
-    if (hermesEnabled.toBoolean()) {
-        implementation("com.facebook.react:hermes-android")
+    if (enableHermes) {
+      //noinspection GradleDynamicVersion
+      implementation("com.facebook.react:hermes-engine:+") { // From node_modules
+          exclude group: 'com.facebook.fbjni' }
       } else {
       implementation jscFlavor
     }
@@ -278,17 +401,37 @@ dependencies {
     // react-native-screens
     implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
-    implementation 'androidx.multidex:multidex:2.0.1' // required by status-mobile/android/app/src/main/java/im/status/ethereum/MainApplication.java
+
+    implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex)
+    implementation project(':react-native-dialogs')
     implementation project(':react-native-blur')
+    // Force using exact RN version instead of relying on gradle dependency resolution
+    // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
+    // NOTE: Uncomment if building RN from a fork
+    //compile ("com.facebook.react:react-native:0.55.4") { force = true }  // From node_modules
     implementation project(':react-native-status')
     implementation project(':react-native-status-keycard')
     implementation 'com.github.status-im:function:0.0.1'
     implementation 'com.facebook.fresco:fresco:2.5.0'
     implementation 'com.facebook.fresco:animated-gif:2.5.0'
     implementation "com.squareup.okhttp3:okhttp-tls:4.9.2"
-    implementation("com.google.prefab:cli:2.0.0")
 }
 
+if (isNewArchitectureEnabled()) {
+    // If new architecture is enabled, we let you build RN from source
+    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
+    // This will be applied to all the imported transtitive dependency.
+    configurations.all {
+        resolutionStrategy.dependencySubstitution {
+            substitute(module("com.facebook.react:react-native"))
+                     .using(project(":ReactAndroid"))
+                        .because("On New Architecture we're building React Native from source")
+                            substitute(module("com.facebook.react:hermes-engine"))
+                                .using(project(":ReactAndroid:hermes-engine"))
+                                    .because("On New Architecture we're building Hermes from source")
+        }
+    }
+}
 
 def getLocalNDKDir = { ->
     def rootDir = project.rootDir
@@ -323,3 +466,11 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+def isNewArchitectureEnabled() {
+    // To opt-in for the New Architecture, you can either:
+    // - Set `newArchEnabled` to true inside the `gradle.properties` file
+    // - Invoke gradle with `-newArchEnabled=true`
+    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
+    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+}

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
-          android:installLocation="auto">
+          android:installLocation="auto"
+          package="im.status.ethereum">
 
     <!-- non-dangerous permissions -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -16,11 +17,11 @@
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+                     android:maxSdkVersion="28" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application

android/app/src/main/java/im/status/ethereum/MainActivity.java

@@ -0,0 +1,260 @@
+package im.status.ethereum;
+
+import android.content.Context;
+import android.annotation.TargetApi;
+import androidx.annotation.Nullable;
+import android.app.AlertDialog;
+import android.app.ActivityManager;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.content.DialogInterface.OnClickListener;
+import android.content.pm.PackageManager;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import androidx.core.app.ActivityCompat;
+import android.util.Log;
+import android.view.WindowManager;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.provider.Settings;
+import android.os.Bundle;
+import android.os.Handler;
+import com.facebook.react.ReactActivityDelegate;
+import com.facebook.react.ReactRootView;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
+import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
+
+import com.reactnativenavigation.NavigationActivity;
+import com.facebook.react.modules.core.PermissionListener;
+import androidx.core.splashscreen.SplashScreen;
+import com.facebook.react.ReactActivity;
+
+import java.util.Properties;
+import im.status.ethereum.module.StatusThreadPoolExecutor;
+import im.status.ethereum.MainApplication;
+
+public class MainActivity extends NavigationActivity
+        implements ActivityCompat.OnRequestPermissionsResultCallback{
+
+
+    @Nullable private PermissionListener mPermissionListener;
+    private boolean keepSplash = true;
+    private final int SPLASH_DELAY = 3200;
+
+    private static void registerUncaughtExceptionHandler(final Context context) {
+        final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+        Thread.setDefaultUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
+            @Override
+            public void uncaughtException(final Thread thread, final Throwable t) {
+                // High priority, so don't use StatusThreadPoolExecutor
+                new Thread() {
+                    @Override
+                    public void run() {
+                        Looper.prepare();
+
+                        new AlertDialog.Builder(context)
+                                .setTitle("Error")
+                                .setMessage(t.toString())
+                                .setNegativeButton("Exit", new DialogInterface.OnClickListener() {
+                                    public void onClick(final DialogInterface dialog, final int id) {
+                                        dialog.dismiss();
+                                        defaultUncaughtExceptionHandler.uncaughtException(thread, t);
+                                    }
+                                }).show();
+
+                        Looper.loop();
+                    }
+                }.start();
+            }
+        });
+    }
+
+    private ActivityManager getActivityManager() {
+        return (ActivityManager) this.getSystemService(ACTIVITY_SERVICE);
+    }
+
+    private ActivityManager.MemoryInfo getAvailableMemory(final ActivityManager activityManager) {
+        final ActivityManager.MemoryInfo memoryInfo = new ActivityManager.MemoryInfo();
+        activityManager.getMemoryInfo(memoryInfo);
+        return memoryInfo;
+    }
+
+    protected void configureStatus() {
+        // Required because of crazy APN settings redirecting localhost (found in GB)
+        Properties properties = System.getProperties();
+        properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1");
+        properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1");
+    }
+
+    private Intent createNotificationSettingsIntent() {
+        final Intent intent = new Intent();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            intent.setAction(Settings.ACTION_APP_NOTIFICATION_SETTINGS);
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, getPackageName());
+        } else {
+            intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
+            intent.addCategory(Intent.CATEGORY_DEFAULT);
+            intent.setData(Uri.parse("package:" + getPackageName()));
+        }
+        return intent;
+    }
+
+    private void tryToEmit(String eventName, WritableMap event) {
+        try {
+            ((MainApplication) getApplication()).getReactNativeHost()
+                                                .getReactInstanceManager()
+                                                .getCurrentReactContext()
+                                                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                                                .emit("url", event);
+        } catch(Exception e) {/* we expect NPE on first start, which is OK because we have a fallback */}
+    }
+
+    @Override
+    public void onNewIntent(final Intent intent) {
+        super.onNewIntent(intent);
+        if (intent.getDataString() != null && intent.getData().getScheme().startsWith("app-settings")) {
+          startActivity(createNotificationSettingsIntent());
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
+        setTheme(R.style.DarkTheme);
+        // Make sure we get an Alert for every uncaught exceptions
+        registerUncaughtExceptionHandler(MainActivity.this);
+
+        // Report memory details for this application
+        final ActivityManager activityManager = getActivityManager();
+        Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
+
+        setSecureFlag();
+
+        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
+        super.onCreate(null);
+
+        if (!shouldShowRootedNotification()) {
+            configureStatus();
+        } else {
+            AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
+                    .setMessage(getResources().getString(R.string.root_warning))
+                    .setPositiveButton(getResources().getString(R.string.root_okay), new OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            rejectRootedNotification();
+                            dialog.dismiss();
+                            configureStatus();
+                        }
+                    })
+                    .setNegativeButton(getResources().getString(R.string.root_cancel), new OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            dialog.dismiss();
+                            MainActivity.this.finishAffinity();
+                        }
+                    })
+                    .setOnCancelListener(new OnCancelListener() {
+                        @Override
+                        public void onCancel(DialogInterface dialog) {
+                            dialog.dismiss();
+                            MainActivity.this.finishAffinity();
+                        }
+                    })
+                    .create();
+
+            dialog.show();
+        }
+
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                System.loadLibrary("status-logs");
+
+                // when app is started but the Activity has been destroyed, the deep linking url event is
+                // not emitted when coming back to foreground. This is a workaround. If the problem is
+                // resolved in react-native this code should be removed
+                if (getIntent().getData() != null) {
+                    WritableMap event = Arguments.createMap();
+                    event.putString("url", getIntent().getDataString());
+                    // on first start emit will (silently) fail, but the regular deep linking handler will work
+                    tryToEmit("url", event);
+                }
+            }
+        };
+
+        splashScreen.setKeepOnScreenCondition(() -> keepSplash);
+
+        Handler handler = new Handler();
+        handler.postDelayed(() -> keepSplash = false, SPLASH_DELAY);
+
+        StatusThreadPoolExecutor.getInstance().execute(r);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        Intent intent = new Intent("onConfigurationChanged");
+        intent.putExtra("newConfig", newConfig);
+        this.sendBroadcast(intent);
+    }
+
+    private static final String REJECTED_ROOTED_NOTIFICATION = "rejectedRootedNotification";
+    private static final Integer FREQUENCY_OF_REMINDER_IN_PERCENT = 5;
+
+    private boolean shouldShowRootedNotification() {
+        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
+            if (userRejectedRootedNotification()) {
+                return ((Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT);
+            } else return true;
+        } else {
+            return false;
+        }
+    }
+
+    private boolean userRejectedRootedNotification() {
+        SharedPreferences preferences = getPreferences(0);
+        return preferences.getBoolean(REJECTED_ROOTED_NOTIFICATION, false);
+    }
+
+    private void rejectRootedNotification() {
+        SharedPreferences preferences = getPreferences(0);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(REJECTED_ROOTED_NOTIFICATION, true);
+        editor.commit();
+    }
+
+    private void setSecureFlag() {
+        final SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
+        final boolean setSecure = sharedPrefs.getBoolean("BLANK_PREVIEW", false);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && setSecure) {
+            getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        } else {
+            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.M)
+    public void requestPermissions(String[] permissions, int requestCode, PermissionListener listener) {
+        mPermissionListener = listener;
+        requestPermissions(permissions, requestCode);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+        if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
+            mPermissionListener = null;
+        }
+    }
+}

android/app/src/main/java/im/status/ethereum/MainActivity.kt

@@ -1,236 +0,0 @@
-package im.status.ethereum
-
-import android.annotation.TargetApi
-import android.app.ActivityManager
-import android.app.AlertDialog
-import android.content.Context
-import android.content.DialogInterface
-import android.content.Intent
-import android.content.SharedPreferences
-import android.content.pm.PackageManager
-import android.content.res.Configuration
-import android.net.Uri
-import android.os.Build
-import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import android.preference.PreferenceManager
-import android.provider.Settings
-import android.util.Log
-import android.view.WindowManager
-import androidx.annotation.Nullable
-import androidx.core.app.ActivityCompat
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.facebook.react.ReactActivityDelegate
-import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.WritableMap
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
-import com.facebook.react.defaults.DefaultReactActivityDelegate
-import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.facebook.react.modules.core.PermissionListener
-import com.reactnativenavigation.NavigationActivity
-import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView
-import im.status.ethereum.MainApplication
-import im.status.ethereum.module.StatusThreadPoolExecutor
-import java.util.Properties
-
-class MainActivity : NavigationActivity(), ActivityCompat.OnRequestPermissionsResultCallback {
-
-    @Nullable
-    private var mPermissionListener: PermissionListener? = null
-    private var keepSplash = true
-    private val SPLASH_DELAY = 3200
-
-    /**
-     * Returns the name of the main component registered from JavaScript. This is used to schedule
-     * rendering of the component.
-     */
-    protected fun getMainComponentName(): String {
-        return "StatusIm"
-    }
-
-    private fun registerUncaughtExceptionHandler(context: Context) {
-        val defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler()
-        // High priority, so don't use StatusThreadPoolExecutor
-        Thread.setDefaultUncaughtExceptionHandler { thread, t ->
-            Thread {
-                Looper.prepare()
-                AlertDialog.Builder(context)
-                    .setTitle("Error")
-                    .setMessage(t.toString())
-                    .setNegativeButton("Exit") { dialog, id ->
-                        dialog.dismiss()
-                        defaultUncaughtExceptionHandler.uncaughtException(thread, t)
-                    }.show()
-                Looper.loop()
-            }.start()
-        }
-    }
-
-    private fun getActivityManager(): ActivityManager {
-        return getSystemService(ACTIVITY_SERVICE) as ActivityManager
-    }
-
-    private fun getAvailableMemory(activityManager: ActivityManager): ActivityManager.MemoryInfo {
-        val memoryInfo = ActivityManager.MemoryInfo()
-        activityManager.getMemoryInfo(memoryInfo)
-        return memoryInfo
-    }
-
-    protected fun configureStatus() {
-        // Required because of crazy APN settings redirecting localhost (found in GB)
-        val properties = System.getProperties()
-        properties.setProperty("http.nonProxyHosts", "localhost|127.0.0.1")
-        properties.setProperty("https.nonProxyHosts", "localhost|127.0.0.1")
-    }
-
-    private fun createNotificationSettingsIntent(): Intent {
-        val intent = Intent()
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
-            intent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
-        } else {
-            intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-            intent.addCategory(Intent.CATEGORY_DEFAULT)
-            intent.data = Uri.parse("package:$packageName")
-        }
-        return intent
-    }
-
-    private fun tryToEmit(eventName: String, event: WritableMap) {
-        try {
-                (getApplication() as MainApplication).getReactNativeHost()
-                .getReactInstanceManager()
-                .getCurrentReactContext()
-                ?.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
-                ?.emit("url", event)
-            } catch (e: Exception) { // we expect NPE on first start, which is OK because we have a fallback
-            }
-    }
-
-    override fun onNewIntent(intent: Intent) {
-        super.onNewIntent(intent)
-        if (intent.dataString != null && intent.data!!.scheme!!.startsWith("app-settings")) {
-            startActivity(createNotificationSettingsIntent())
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        val splashScreen = installSplashScreen();
-        setTheme(R.style.DarkTheme)
-        // Make sure we get an Alert for every uncaught exceptions
-        registerUncaughtExceptionHandler(this)
-
-        // Report memory details for this application
-        val activityManager = getActivityManager()
-        Log.v("RNBootstrap", "Available system memory " + getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.largeMemoryClass + "M")
-
-        setSecureFlag()
-
-        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
-        super.onCreate(null)
-
-        if (!shouldShowRootedNotification()) {
-            configureStatus()
-        } else {
-            val dialog = AlertDialog.Builder(this)
-                .setMessage(resources.getString(R.string.root_warning))
-                .setPositiveButton(resources.getString(R.string.root_okay)) { dialog, which ->
-                    rejectRootedNotification()
-                    dialog.dismiss()
-                    configureStatus()
-                }
-                .setNegativeButton(resources.getString(R.string.root_cancel)) { dialog, which ->
-                    dialog.dismiss()
-                    finishAffinity()
-                }
-                .setOnCancelListener {
-                    it.dismiss()
-                    finishAffinity()
-                }
-                .create()
-
-            dialog.show()
-        }
-
-        val r = Runnable {
-            System.loadLibrary("status-logs")
-
-            // when app is started but the Activity has been destroyed, the deep linking url event is
-            // not emitted when coming back to foreground. This is a workaround. If the problem is
-            // resolved in react-native this code should be removed
-            if (intent.data != null) {
-                val event = Arguments.createMap()
-                event.putString("url", intent.dataString)
-                // on first start emit will (silently) fail, but the regular deep linking handler will work
-                tryToEmit("url", event)
-            }
-        }
-
-        splashScreen.setKeepOnScreenCondition { keepSplash }
-
-        val handler = Handler()
-        handler.postDelayed({ keepSplash = false }, SPLASH_DELAY.toLong())
-
-        StatusThreadPoolExecutor.getInstance().execute(r)
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-    }
-
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        val intent = Intent("onConfigurationChanged")
-        intent.putExtra("newConfig", newConfig)
-        sendBroadcast(intent)
-    }
-
-    private val REJECTED_ROOTED_NOTIFICATION = "rejectedRootedNotification"
-    private val FREQUENCY_OF_REMINDER_IN_PERCENT = 5
-
-    private fun shouldShowRootedNotification(): Boolean {
-        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
-            return if (userRejectedRootedNotification()) {
-                (Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT
-            } else true
-        } else {
-            return false
-        }
-    }
-
-    private fun userRejectedRootedNotification(): Boolean {
-        val preferences = getPreferences(0)
-        return preferences.getBoolean(REJECTED_ROOTED_NOTIFICATION, false)
-    }
-
-    private fun rejectRootedNotification() {
-        val preferences = getPreferences(0)
-        val editor = preferences.edit()
-        editor.putBoolean(REJECTED_ROOTED_NOTIFICATION, true)
-        editor.commit()
-    }
-
-    private fun setSecureFlag() {
-        val sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this)
-        val setSecure = sharedPrefs.getBoolean("BLANK_PREVIEW", false)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH && setSecure) {
-            window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        } else {
-            window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
-        }
-    }
-
-   @TargetApi(Build.VERSION_CODES.M)
-   override fun requestPermissions(permissions: Array<String>, requestCode: Int, listener: PermissionListener) {
-       mPermissionListener = listener
-       super.requestPermissions(permissions, requestCode)
-   }
-
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
-        if (mPermissionListener != null && mPermissionListener!!.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
-            mPermissionListener = null
-        }
-    }
-}

android/app/src/main/java/im/status/ethereum/MainApplication.java

@@ -0,0 +1,87 @@
+package im.status.ethereum;
+
+import androidx.multidex.MultiDexApplication;
+import android.content.Context;
+import android.webkit.WebView;
+import im.status.ethereum.newarchitecture.MainApplicationReactNativeHost;
+import java.lang.reflect.InvocationTargetException;
+import com.facebook.react.PackageList;
+
+import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
+import com.facebook.react.ReactApplication;
+import cl.json.RNSharePackage;
+import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.react.NavigationReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.config.ReactFeatureFlags;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.modules.network.OkHttpClientProvider;
+import com.reactnativecommunity.blurview.BlurViewPackage;
+
+import java.util.List;
+
+import im.status.ethereum.keycard.RNStatusKeycardPackage;
+import im.status.ethereum.module.StatusPackage;
+import im.status.ethereum.pushnotifications.PushNotificationPackage;
+import im.status.ethereum.StatusOkHttpClientFactory;
+
+import com.facebook.react.bridge.JSIModulePackage;
+import com.swmansion.reanimated.ReanimatedJSIModulePackage;
+
+public class MainApplication extends NavigationApplication {
+
+    private final ReactNativeHost mReactNativeHost = new NavigationReactNativeHost(this) {
+        @Override
+        public boolean getUseDeveloperSupport() {
+            return BuildConfig.DEBUG;
+        }
+
+        @Override
+        protected List<ReactPackage> getPackages() {
+
+            StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());
+
+            List<ReactPackage> packages = new PackageList(this).getPackages();
+            packages.add(statusPackage);
+            packages.add(new ReactNativeDialogsPackage());
+            packages.add(new RNStatusKeycardPackage());
+            packages.add(new PushNotificationPackage());
+            packages.add(new BlurViewPackage());
+            return packages;
+        }
+
+        @Override
+        protected String getJSMainModuleName() {
+            return "index";
+        }
+
+	@Override
+	protected JSIModulePackage getJSIModulePackage() {
+	    return new ReanimatedJSIModulePackage();
+	}
+    };
+
+    private final ReactNativeHost mNewArchitectureNativeHost = new MainApplicationReactNativeHost(this);
+
+    @Override
+    public ReactNativeHost getReactNativeHost() {
+        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
+          return mNewArchitectureNativeHost;
+        } else {
+          return mReactNativeHost;
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        // If you opted-in for the New Architecture, we enable the TurboModule system
+        ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
+
+        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());
+
+        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
+    }
+
+}

android/app/src/main/java/im/status/ethereum/MainApplication.kt

@@ -1,61 +0,0 @@
-package im.status.ethereum
-
-import android.webkit.WebView
-import androidx.multidex.MultiDexApplication
-import com.facebook.react.PackageList
-import com.facebook.react.ReactApplication
-import com.facebook.react.ReactNativeHost
-import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JSIModulePackage
-import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
-import com.facebook.react.modules.network.OkHttpClientProvider
-import com.reactnativenavigation.NavigationApplication
-import com.reactnativenavigation.react.NavigationReactNativeHost
-import cl.json.RNSharePackage
-import com.reactnativecommunity.blurview.BlurViewPackage
-import im.status.ethereum.keycard.RNStatusKeycardPackage
-import im.status.ethereum.module.StatusPackage
-import im.status.ethereum.pushnotifications.PushNotificationPackage
-import im.status.ethereum.StatusOkHttpClientFactory
-
-class MainApplication : NavigationApplication() {
-
-    private val mReactNativeHost = object : NavigationReactNativeHost(this) {
-        override fun getUseDeveloperSupport(): Boolean {
-            return BuildConfig.DEBUG
-        }
-
-        override fun getPackages(): List<ReactPackage> {
-            val statusPackage = StatusPackage(RootUtil.isDeviceRooted())
-            val packages = PackageList(this).getPackages()
-            packages.add(statusPackage)
-            packages.add(RNStatusKeycardPackage())
-            packages.add(PushNotificationPackage())
-            packages.add(BlurViewPackage())
-            return packages
-        }
-
-        override fun getJSMainModuleName(): String = "index"
-
-        override val isNewArchEnabled: Boolean = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED
-
-        override val isHermesEnabled: Boolean = BuildConfig.IS_HERMES_ENABLED
-    }
-
-    override fun getReactNativeHost(): ReactNativeHost {
-        return mReactNativeHost
-    }
-
-    override fun onCreate() {
-        super.onCreate()
-
-        OkHttpClientProvider.setOkHttpClientFactory(StatusOkHttpClientFactory())
-
-        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1")
-
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-            // If you opted-in for the New Architecture, we load the native entry point for this app.
-            DefaultNewArchitectureEntryPoint.load()
-        }
-    }
-}

android/app/src/main/java/im/status/ethereum/StatusOkHttpClientFactory.java

@@ -27,23 +27,18 @@ class StatusOkHttpClientFactory implements OkHttpClientFactory {
       X509Certificate cert = null;
       HandshakeCertificates clientCertificates;
       String certPem = "";
-      // Get TLS PEM certificate from status-go
-      try {
-         // induce half second sleep because sometimes a cert is not immediately available
-         // TODO : remove sleep if App no longer crashes on Android 10 devices with
-         // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-         Thread.sleep(500);
-         certPem = getCertificatePem();
-      } catch(Exception e) {
-          Log.e(TAG, "Could not getImageTLSCert",e);
-      }
 
-      if (certPem.isEmpty()) {
-          Log.e(TAG, "Certificate is empty, cannot create OkHttpClient without a valid certificate");
-          return null;
-      }
-
-      // Convert PEM certificate string to X509Certificate object
+    // Get TLS PEM certificate from status-go
+    try {
+        // induce half second sleep because sometimes a cert is not immediately available
+        // TODO : remove sleep if App no longer crashes on Android 10 devices with
+        // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
+        Thread.sleep(500);
+        certPem = StatusPackage.getImageTLSCert();
+    } catch(Exception e) {
+        Log.e(TAG, "Could not getImageTLSCert",e);
+    }
+    // Convert PEM certificate string to X509Certificate object
     try {
       // induce half second sleep because sometimes a cert is not immediately available
       // TODO : remove sleep if App no longer crashes on Android 10 devices
@@ -79,17 +74,4 @@ class StatusOkHttpClientFactory implements OkHttpClientFactory {
       return null;
     }
   }
-    private String getCertificatePem() {
-        try {
-            String certPem = StatusPackage.getImageTLSCert();
-            if (certPem == null || certPem.trim().isEmpty()) {
-                Log.e(TAG, "Certificate PEM string is null or empty");
-                return "";
-            }
-            return certPem;
-        } catch (Exception e) {
-            Log.e(TAG, "Could not getImageTLSCert", e);
-            return "";
-        }
-    }
 }

android/app/src/main/java/im/status/ethereum/newarchitecture/MainApplicationReactNativeHost.java

@@ -0,0 +1,103 @@
+package im.status.ethereum.newarchitecture;
+import android.app.Application;
+import androidx.annotation.NonNull;
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.JSIModulePackage;
+import com.facebook.react.bridge.JSIModuleProvider;
+import com.facebook.react.bridge.JSIModuleSpec;
+import com.facebook.react.bridge.JSIModuleType;
+import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.UIManager;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.react.fabric.CoreComponentsRegistry;
+import com.facebook.react.fabric.FabricJSIModuleProvider;
+import com.facebook.react.fabric.ReactNativeConfig;
+import com.facebook.react.uimanager.ViewManagerRegistry;
+import im.status.ethereum.BuildConfig;
+import im.status.ethereum.newarchitecture.components.MainComponentsRegistry;
+import im.status.ethereum.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
+import java.util.ArrayList;
+import java.util.List;
+/**
+ * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
+ * TurboModule delegates and the Fabric Renderer.
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationReactNativeHost extends ReactNativeHost {
+  public MainApplicationReactNativeHost(Application application) {
+    super(application);
+  }
+  @Override
+  public boolean getUseDeveloperSupport() {
+    return BuildConfig.DEBUG;
+  }
+  @Override
+  protected List<ReactPackage> getPackages() {
+    List<ReactPackage> packages = new PackageList(this).getPackages();
+    // Packages that cannot be autolinked yet can be added manually here, for example:
+    //     packages.add(new MyReactNativePackage());
+    // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
+    //     packages.add(new TurboReactPackage() { ... });
+    // If you have custom Fabric Components, their ViewManagers should also be loaded here
+    // inside a ReactPackage.
+    return packages;
+  }
+  @Override
+  protected String getJSMainModuleName() {
+    return "index";
+  }
+  @NonNull
+  @Override
+  protected ReactPackageTurboModuleManagerDelegate.Builder
+      getReactPackageTurboModuleManagerDelegateBuilder() {
+    // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
+    // for the new architecture and to use TurboModules correctly.
+    return new MainApplicationTurboModuleManagerDelegate.Builder();
+  }
+  @Override
+  protected JSIModulePackage getJSIModulePackage() {
+    return new JSIModulePackage() {
+      @Override
+      public List<JSIModuleSpec> getJSIModules(
+          final ReactApplicationContext reactApplicationContext,
+          final JavaScriptContextHolder jsContext) {
+        final List<JSIModuleSpec> specs = new ArrayList<>();
+        // Here we provide a new JSIModuleSpec that will be responsible of providing the
+        // custom Fabric Components.
+        specs.add(
+            new JSIModuleSpec() {
+              @Override
+              public JSIModuleType getJSIModuleType() {
+                return JSIModuleType.UIManager;
+              }
+              @Override
+              public JSIModuleProvider<UIManager> getJSIModuleProvider() {
+                final ComponentFactory componentFactory = new ComponentFactory();
+                CoreComponentsRegistry.register(componentFactory);
+                // Here we register a Components Registry.
+                // The one that is generated with the template contains no components
+                // and just provides you the one from React Native core.
+                MainComponentsRegistry.register(componentFactory);
+                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
+                ViewManagerRegistry viewManagerRegistry =
+                    new ViewManagerRegistry(
+                        reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
+                return new FabricJSIModuleProvider(
+                    reactApplicationContext,
+                    componentFactory,
+                    ReactNativeConfig.DEFAULT_CONFIG,
+                    viewManagerRegistry);
+              }
+            });
+        return specs;
+      }
+    };
+  }
+}

android/app/src/main/java/im/status/ethereum/newarchitecture/components/MainComponentsRegistry.java

@@ -0,0 +1,30 @@
+package im.status.ethereum.newarchitecture.components;
+import com.facebook.jni.HybridData;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.fabric.ComponentFactory;
+import com.facebook.soloader.SoLoader;
+/**
+ * Class responsible to load the custom Fabric Components. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+@DoNotStrip
+public class MainComponentsRegistry {
+  static {
+    SoLoader.loadLibrary("fabricjni");
+  }
+  @DoNotStrip private final HybridData mHybridData;
+  @DoNotStrip
+  private native HybridData initHybrid(ComponentFactory componentFactory);
+  @DoNotStrip
+  private MainComponentsRegistry(ComponentFactory componentFactory) {
+    mHybridData = initHybrid(componentFactory);
+  }
+  @DoNotStrip
+  public static MainComponentsRegistry register(ComponentFactory componentFactory) {
+    return new MainComponentsRegistry(componentFactory);
+  }
+}

android/app/src/main/java/im/status/ethereum/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java

@@ -0,0 +1,40 @@
+package im.status.ethereum.newarchitecture.modules;
+import com.facebook.jni.HybridData;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.soloader.SoLoader;
+import java.util.List;
+/**
+ * Class responsible to load the TurboModules. This class has native methods and needs a
+ * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
+ * folder for you).
+ *
+ * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
+ * `newArchEnabled` property). Is ignored otherwise.
+ */
+public class MainApplicationTurboModuleManagerDelegate
+    extends ReactPackageTurboModuleManagerDelegate {
+  private static volatile boolean sIsSoLibraryLoaded;
+  protected MainApplicationTurboModuleManagerDelegate(
+      ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) {
+    super(reactApplicationContext, packages);
+  }
+  protected native HybridData initHybrid();
+  native boolean canCreateTurboModule(String moduleName);
+  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
+    protected MainApplicationTurboModuleManagerDelegate build(
+        ReactApplicationContext context, List<ReactPackage> packages) {
+      return new MainApplicationTurboModuleManagerDelegate(context, packages);
+    }
+  }
+  @Override
+  protected synchronized void maybeLoadOtherSoLibraries() {
+    if (!sIsSoLibraryLoaded) {
+      // If you change the name of your application .so file in the Android.mk file,
+      // make sure you update the name here as well.
+      SoLoader.loadLibrary("status-im_appmodules");
+      sIsSoLibraryLoaded = true;
+    }
+  }
+}

android/app/src/main/jni/Android.mk

@@ -0,0 +1,39 @@
+THIS_DIR := $(call my-dir)
+include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to include the following autogenerated makefile.
+# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
+include $(CLEAR_VARS)
+LOCAL_PATH := $(THIS_DIR)
+# You can customize the name of your application .so file here.
+LOCAL_MODULE := rndiffapp_appmodules
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+# If you wish to add a custom TurboModule or Fabric component in your app you
+# will have to uncomment those lines to include the generated source
+# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
+#
+# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
+# Here you should add any native library you wish to depend on.
+LOCAL_SHARED_LIBRARIES := \
+  libfabricjni \
+  libfbjni \
+  libfolly_runtime \
+  libglog \
+  libjsi \
+  libreact_codegen_rncore \
+  libreact_debug \
+  libreact_nativemodule_core \
+  libreact_render_componentregistry \
+  libreact_render_core \
+  libreact_render_debug \
+  libreact_render_graphics \
+  librrc_view \
+  libruntimeexecutor \
+  libturbomodulejsijni \
+  libyoga
+LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
+include $(BUILD_SHARED_LIBRARY)

android/app/src/main/jni/MainApplicationModuleProvider.cpp

@@ -0,0 +1,20 @@
+#include "MainApplicationModuleProvider.h"
+#include <rncore.h>
+namespace facebook {
+namespace react {
+std::shared_ptr<TurboModule> MainApplicationModuleProvider(
+    const std::string moduleName,
+    const JavaTurboModule::InitParams &params) {
+  // Here you can provide your own module provider for TurboModules coming from
+  // either your application or from external libraries. The approach to follow
+  // is similar to the following (for a library called `samplelibrary`:
+  //
+  // auto module = samplelibrary_ModuleProvider(moduleName, params);
+  // if (module != nullptr) {
+  //    return module;
+  // }
+  // return rncore_ModuleProvider(moduleName, params);
+  return rncore_ModuleProvider(moduleName, params);
+}
+} // namespace react
+} // namespace facebook

android/app/src/main/jni/MainApplicationModuleProvider.h

@@ -0,0 +1,11 @@
+#pragma once
+#include <memory>
+#include <string>
+#include <ReactCommon/JavaTurboModule.h>
+namespace facebook {
+namespace react {
+std::shared_ptr<TurboModule> MainApplicationModuleProvider(
+    const std::string moduleName,
+    const JavaTurboModule::InitParams &params);
+} // namespace react
+} // namespace facebook

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp

@@ -0,0 +1,38 @@
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainApplicationModuleProvider.h"
+namespace facebook {
+namespace react {
+jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
+MainApplicationTurboModuleManagerDelegate::initHybrid(
+    jni::alias_ref<jhybridobject>) {
+  return makeCxxInstance();
+}
+void MainApplicationTurboModuleManagerDelegate::registerNatives() {
+  registerHybrid({
+      makeNativeMethod(
+          "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
+      makeNativeMethod(
+          "canCreateTurboModule",
+          MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
+  });
+}
+std::shared_ptr<TurboModule>
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+    const std::string name,
+    const std::shared_ptr<CallInvoker> jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+std::shared_ptr<TurboModule>
+MainApplicationTurboModuleManagerDelegate::getTurboModule(
+    const std::string name,
+    const JavaTurboModule::InitParams &params) {
+  return MainApplicationModuleProvider(name, params);
+}
+bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
+    std::string name) {
+  return getTurboModule(name, nullptr) != nullptr ||
+      getTurboModule(name, {.moduleName = name}) != nullptr;
+}
+} // namespace react
+} // namespace facebook

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h

@@ -0,0 +1,30 @@
+#include <memory>
+#include <string>
+#include <ReactCommon/TurboModuleManagerDelegate.h>
+#include <fbjni/fbjni.h>
+namespace facebook {
+namespace react {
+class MainApplicationTurboModuleManagerDelegate
+    : public jni::HybridClass<
+          MainApplicationTurboModuleManagerDelegate,
+          TurboModuleManagerDelegate> {
+ public:
+  // Adapt it to the package you used for your Java class.
+  static constexpr auto kJavaDescriptor =
+      "Lcom/rndiffapp/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
+  static void registerNatives();
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string name,
+      const std::shared_ptr<CallInvoker> jsInvoker) override;
+  std::shared_ptr<TurboModule> getTurboModule(
+      const std::string name,
+      const JavaTurboModule::InitParams &params) override;
+  /**
+   * Test-only method. Allows user to verify whether a TurboModule can be
+   * created by instances of this class.
+   */
+  bool canCreateTurboModule(std::string name);
+};
+} // namespace react
+} // namespace facebook

android/app/src/main/jni/MainComponentsRegistry.cpp

@@ -0,0 +1,48 @@
+#include "MainComponentsRegistry.h"
+#include <CoreComponentsRegistry.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/components/rncore/ComponentDescriptors.h>
+namespace facebook {
+namespace react {
+MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
+std::shared_ptr<ComponentDescriptorProviderRegistry const>
+MainComponentsRegistry::sharedProviderRegistry() {
+  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
+  // Custom Fabric Components go here. You can register custom
+  // components coming from your App or from 3rd party libraries here.
+  //
+  // providerRegistry->add(concreteComponentDescriptorProvider<
+  //        AocViewerComponentDescriptor>());
+  return providerRegistry;
+}
+jni::local_ref<MainComponentsRegistry::jhybriddata>
+MainComponentsRegistry::initHybrid(
+    jni::alias_ref<jclass>,
+    ComponentFactory *delegate) {
+  auto instance = makeCxxInstance(delegate);
+  auto buildRegistryFunction =
+      [](EventDispatcher::Weak const &eventDispatcher,
+         ContextContainer::Shared const &contextContainer)
+      -> ComponentDescriptorRegistry::Shared {
+    auto registry = MainComponentsRegistry::sharedProviderRegistry()
+                        ->createComponentDescriptorRegistry(
+                            {eventDispatcher, contextContainer});
+    auto mutableRegistry =
+        std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
+    mutableRegistry->setFallbackComponentDescriptor(
+        std::make_shared<UnimplementedNativeViewComponentDescriptor>(
+            ComponentDescriptorParameters{
+                eventDispatcher, contextContainer, nullptr}));
+    return registry;
+  };
+  delegate->buildRegistryFunction = buildRegistryFunction;
+  return instance;
+}
+void MainComponentsRegistry::registerNatives() {
+  registerHybrid({
+      makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
+  });
+}
+} // namespace react
+} // namespace facebook

android/app/src/main/jni/MainComponentsRegistry.h

@@ -0,0 +1,24 @@
+#pragma once
+#include <ComponentFactory.h>
+#include <fbjni/fbjni.h>
+#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
+#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
+namespace facebook {
+namespace react {
+class MainComponentsRegistry
+    : public facebook::jni::HybridClass<MainComponentsRegistry> {
+ public:
+  // Adapt it to the package you used for your Java class.
+  constexpr static auto kJavaDescriptor =
+      "Lcom/rndiffapp/newarchitecture/components/MainComponentsRegistry;";
+  static void registerNatives();
+  MainComponentsRegistry(ComponentFactory *delegate);
+ private:
+  static std::shared_ptr<ComponentDescriptorProviderRegistry const>
+  sharedProviderRegistry();
+  static jni::local_ref<jhybriddata> initHybrid(
+      jni::alias_ref<jclass>,
+      ComponentFactory *delegate);
+};
+} // namespace react
+} // namespace facebook

android/app/src/main/jni/OnLoad.cpp

@@ -0,0 +1,10 @@
+#include <fbjni/fbjni.h>
+#include "MainApplicationTurboModuleManagerDelegate.h"
+#include "MainComponentsRegistry.h"
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    facebook::react::MainApplicationTurboModuleManagerDelegate::
+        registerNatives();
+    facebook::react::MainComponentsRegistry::registerNatives();
+  });
+}

android/build.gradle

@@ -1,3 +1,4 @@
+import org.apache.tools.ant.taskdefs.condition.Os
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 /**
@@ -5,17 +6,25 @@
 */
 ext {
     // kotlin_version is needed for react-native-camera-kit library
-    kotlin_version      = project.kotlinPluginVersion
-    RNNKotlinVersion    = project.kotlinPluginVersion
-    RNGH_kotlinVersion  = project.kotlinPluginVersion
+    kotlin_version      = project.kotlinVersion
+    RNNKotlinVersion    = "1.6.20"
+    RNGH_kotlinVersion  = "1.6.20"
     buildToolsVersion   = project.buildToolsVersion
     minSdkVersion       = Integer.valueOf(project.minSdkVersion)
     compileSdkVersion   = Integer.valueOf(project.compileSdkVersion)
     targetSdkVersion    = Integer.valueOf(project.targetSdkVersion)
     supportLibVersion   = project.supportLibVersion
     gradlePluginVersion = project.gradlePluginVersion
-    kotlinVersion       = project.kotlinPluginVersion
-    ndkVersion = "25.2.9519653"
+    kotlinPluginVersion = project.kotlinPluginVersion
+
+    if (System.properties['os.arch'] == "aarch64") {
+        // For M1 Users we need to use the NDK 24 which added support for aarch64
+        ndkVersion = "24.0.8215888"
+    } else {
+        // Otherwise we default to the side-by-side NDK version from AGP.
+        ndkVersion = "21.4.7075529"
+    }
+
 }
 
 buildscript {
@@ -26,8 +35,11 @@ buildscript {
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${project.ext.kotlinPluginVersion}"
-        classpath("com.android.tools.build:gradle")
+        classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
         classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("de.undercouch:gradle-download-task:5.0.1")
+        // WARNING: Do not place your application dependencies here!
+        //          They belong in the individual module build.gradle files.
     }
 }
 
@@ -52,14 +64,34 @@ allprojects {
             throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!')
         }
     }
+
     repositories {
+        exclusiveContent {
+           // We get React Native's Android binaries exclusively through npm,
+           // from a local Maven repo inside node_modules/react-native/.
+           // (The use of exclusiveContent prevents looking elsewhere like Maven Central
+           // and potentially getting a wrong version.)
+           filter {
+               includeGroup "com.facebook.react"
+           }
+           forRepository {
+               maven {
+                   url "$rootDir/../node_modules/react-native/android"
+               }
+           }
+        }
         mavenLocal()
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        maven { url("$rootDir/../node_modules/react-native/android") }
         // Android JSC is installed from npm
         maven { url("$rootDir/../node_modules/jsc-android/dist") }
         // For geth, function, and status-go
         flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR }
+        // Everything Else
         google()
+        jcenter() // Required for @react-native-community/blur:3.6.1, can be removed after updating to 3.6.1+
         mavenCentral()
+        //         maven { url "https://www.jitpack.io" }
         maven { url 'https://mvnrepository.com/artifact/com.github.gundy/semver4j'}
     }
 }

android/gradle.properties

@@ -21,14 +21,15 @@
 # $keytool -genkey -v -keystore ./status-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias status
 
 # Version requirements used throughout the Gradle scripts
+kotlinVersion=1.6.20
 minSdkVersion=24
-compileSdkVersion=33
-targetSdkVersion=33
-buildToolsVersion=33.0.0
+compileSdkVersion=31
+targetSdkVersion=31
+buildToolsVersion=31.0.0
 supportLibVersion=28.0.0
-# This should match version from nix/pkgs/aapt2/default.nix
-gradlePluginVersion=7.4.2
-kotlinPluginVersion=1.7.22
+# This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
+gradlePluginVersion=7.2.2
+kotlinPluginVersion=1.6.20
 
 android.useAndroidX=true
 android.enableJetifier=true
@@ -41,7 +42,7 @@ KEYSTORE_KEY_PASSWORD=password
 # By default we build a mostly universal APK
 ANDROID_ABI_SPLIT=false
 # Some platforms are excluded though
-ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64
+ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86
 
 org.gradle.jvmargs=-Xmx8704M
 
@@ -54,7 +55,3 @@ commitHash=unknown
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 newArchEnabled=false
-
-# Use this property to enable or disable the Hermes JS engine.
-# If set to false, you will be using JSC instead.
-hermesEnabled=true

android/settings.gradle

@@ -12,10 +12,18 @@ apply from: file("../node_modules/@react-native-community/cli-platform-android/n
 include ':react-native-nfc-manager'
 project(':react-native-nfc-manager').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-nfc-manager/android')
 include ':app'
+include ':react-native-dialogs'
+project(':react-native-dialogs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-dialogs/android')
 include ':react-native-status'
 project(':react-native-status').projectDir = new File(rootProject.projectDir, '../modules/react-native-status/android')
 include ':react-native-status-keycard'
 project(':react-native-status-keycard').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-status-keycard/android')
 include ':react-native-blur'
 project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/blur/android')
-includeBuild('../node_modules/@react-native/gradle-plugin')
+includeBuild('../node_modules/react-native-gradle-plugin')
+if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
+    include(":ReactAndroid")
+    project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')
+    include(":ReactAndroid:hermes-engine")
+    project(":ReactAndroid:hermes-engine").projectDir = file('../node_modules/react-native/ReactAndroid/hermes-engine')
+}

babel.config.js

@@ -9,7 +9,7 @@ module.exports = {
           '@babel/preset-env',
           {
             targets: {
-              node: 'current',
+              node: '14',
             },
           },
         ],

ci/Jenkinsfile.android

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.4'
+library 'status-jenkins-lib@v1.7.15'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/Jenkinsfile.combined

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.4'
+library 'status-jenkins-lib@v1.7.15'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.e2e-nightly

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.4'
+library 'status-jenkins-lib@v1.7.15'
 
 pipeline {
   agent { label 'linux' }

ci/Jenkinsfile.ios

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.4'
+library 'status-jenkins-lib@v1.7.15'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -77,6 +77,7 @@ pipeline {
           }
         }
         stage('Upload') {
+          when { expression { !utils.isReleaseBuild() } }
           steps { script {
             env.DIAWI_URL = ios.uploadToDiawi()
             env.PKG_URL = env.DIAWI_URL

ci/Jenkinsfile.tests

@@ -1,5 +1,5 @@
 #!/usr/bin/env groovy
-library 'status-jenkins-lib@v1.8.4'
+library 'status-jenkins-lib@v1.7.15'
 
 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

ci/tests/Jenkinsfile.e2e-nightly

@@ -36,10 +36,10 @@ pipeline {
       steps { script {
         copyArtifacts(
           projectName: "status-mobile/platforms/android-e2e",
-          filter: 'result/*-x86_64.apk',
+          filter: 'result/*-x86.apk',
           selector: specific(env.APK_BUILD_NUMBER),
         )
-        apk_path = "${env.WORKSPACE}/${utils.findFile('result/*-x86_64.apk')}"
+        apk_path = "${env.WORKSPACE}/${utils.findFile('result/*-x86.apk')}"
 
       } }
     }

doc/new-guidelines.md

@@ -641,26 +641,6 @@ keywords and concatenating them into a single string.
 ```
 
 ### Tests
-#### Prefer `match?` over `=` when comparing data structures
-
-Prefer the `match?` directive over `=` when comparing data structures, otherwise
-when the check fails the output can be too difficult to read. `match?` is
-defined by library https://github.com/nubank/matcher-combinators.
-
-```clojure
-;; bad
-(deftest some-test
-  (let [expected {...}
-        actual {...}]
-    (is (= expected actual))))
-
-;; good
-(deftest some-test
-  (let [expected {...}
-        actual {...}]
-    (is (match? expected actual))))
-```
-
 #### Subscription tests
 
 Test [layer-3 subscriptions](https://day8.github.io/re-frame/subscriptions/) by
@@ -736,7 +716,7 @@ src
 
 - `src/js`: Raw Javascript files, e.g. React Native Reanimated worklets.
 - `src/mocks`: Plumbing configuration to be able to run tests.
-- `src/quo/`: The component library for Status Mobile. [Read more...](../src/quo/README.md)
+- `src/quo/`: The component library for Status Mobile.
 - `src/react_native/`: Contains only low-level constructs to help React Native
   work in tandem with Clojure(Script).
 - `src/status_im2/`: Directory where we try to be as strict as possible about

ios/Podfile

@@ -1,18 +1,16 @@
-# Resolve react_native_pods.rb with node to allow for hoisting
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "react-native/scripts/react_native_pods.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
+require_relative '../node_modules/react-native/scripts/react_native_pods'
+require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, min_ios_version_supported
-prepare_react_native_project!
+platform :ios, '12.4'
 
-linkage = ENV['USE_FRAMEWORKS']
-if linkage != nil
-  Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
-  use_frameworks! :linkage => linkage.to_sym
-end
+production = ENV["PRODUCTION"] == "1"
+
+# We need to enable codegen discovery to fix the issue of these files not being generated properly:
+# ios/build/generated/ios/FBReactNativeSpec/FBReactNativeSpec-generated.mm
+# ios/build/generated/ios/FBReactNativeSpec/FBReactNativeSpec.h
+# more details here : https://github.com/status-im/status-mobile/issues/15911
+# TODO: remove this flag once you upgrade react-native above version 0.70
+ENV['USE_CODEGEN_DISCOVERY'] = "1"
 
 # If inside a Nix shell, allow pod install
 inside_nix_shell = ENV['IN_NIX_SHELL']
@@ -32,8 +30,11 @@ abstract_target 'Status' do
 
   use_react_native!(
     :path => config[:reactNativePath],
-    :hermes_enabled => false,
+    # to enable hermes on iOS, change `false` to `true` and then install pods
+    :production => production,
+    :hermes_enabled => flags[:hermes_enabled],
     :fabric_enabled => flags[:fabric_enabled],
+    :use_codegen_discovery => true,
     # An absolute path to your application root.
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
@@ -44,8 +45,9 @@ abstract_target 'Status' do
   pod 'SSZipArchive', '2.4.3'
 
   permissions_path = '../node_modules/react-native-permissions/ios'
-  pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone/Permission-Microphone.podspec"
-  pod 'Permission-Camera', :path => "#{permissions_path}/Camera/Permission-Camera.podspec"
+  pod 'Permission-Microphone', :path => "#{permissions_path}/Microphone.podspec"
+  pod 'Permission-Camera', :path => "#{permissions_path}/Camera.podspec"
+
   pod "react-native-status-keycard", path: "../node_modules/react-native-status-keycard"
   pod "react-native-status", path: "../modules/react-native-status"
   pod "Keycard", git: "https://github.com/status-im/Keycard.swift.git"

ios/StatusIm.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* StatusImTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* StatusImTests.m */; };
+		04515E9DF839CBF55C690E79 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5006FF03675A7E50320B4002 /* libPods-Status-StatusImPR.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */; };
@@ -43,9 +44,8 @@
 		715D8132290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		715D8133290BE850006F5C88 /* UbuntuMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */; };
 		74B758FC20D7C00B003343C3 /* launch-image-universal.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */; };
+		81F3191BB1D4BDF3442402BD /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F8E9088BDE117AB71366407 /* libPods-Status-StatusIm.a */; };
 		8391E8E0E93C41A98AAA6631 /* Inter-SemiBoldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = A4F2BBE8D4DD4140A6CCAC39 /* Inter-SemiBoldItalic.otf */; };
-		8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */; };
-		9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.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 */; };
@@ -57,10 +57,10 @@
 		C1715FFB29C0BCE50088FA8B /* launch-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */; };
 		C1715FFC29C0BCE80088FA8B /* launch-icon.png in Resources */ = {isa = PBXBuildFile; fileRef = C14C5F9229C0ADB5005C58A7 /* launch-icon.png */; };
 		CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE4E31B21D8695250033ED64 /* Statusgo.xcframework */; };
+		D156FF2CCF43C136F7BF8AE5 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3EFEEB5FC1235562D5D3BF1 /* libPods-Status-StatusIm-StatusImTests.a */; };
 		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 */; };
-		E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -108,14 +108,15 @@
 		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 = "<group>"; };
 		00E356F21AD99517003FC87E /* StatusImTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StatusImTests.m; sourceTree = "<group>"; };
-		1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
+		06AF19FA626AFFC91E66916B /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
+		0F8E9088BDE117AB71366407 /* 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 = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = StatusIm/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = StatusIm/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = StatusIm/main.m; sourceTree = "<group>"; };
 		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 = "<group>"; };
-		28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		1CDF317A2E103217DF386083 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		3A2626CE245C3F2200D5F94B /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		3A6406FB24A3ADF90046ED37 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		3A8F8EA924A4D31600BF206D /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; };
@@ -123,24 +124,21 @@
 		3AB1C3AD245C043900098F67 /* StatusIm-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusIm-Bridging-Header.h"; sourceTree = "<group>"; };
 		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; };
-		59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
-		5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		5006FF03675A7E50320B4002 /* libPods-Status-StatusImPR.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusImPR.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		65F693BD2578002500A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = System/Library/Frameworks/CoreNFC.framework; sourceTree = SDKROOT; };
 		65F693BF2578003600A45E76 /* CoreNFC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreNFC.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.0.sdk/System/iOSSupport/System/Library/Frameworks/CoreNFC.framework; sourceTree = DEVELOPER_DIR; };
 		65F6941725780A4E00A45E76 /* StatusImTests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "StatusImTests-Bridging-Header.h"; sourceTree = "<group>"; };
 		65F6941825780A4F00A45E76 /* Bridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bridge.swift; sourceTree = "<group>"; };
-		668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.release.xcconfig"; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		715D8131290BE850006F5C88 /* UbuntuMono-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "UbuntuMono-Regular.ttf"; path = "../resources/fonts/UbuntuMono-Regular.ttf"; sourceTree = "<group>"; };
 		74B758FB20D7C00B003343C3 /* launch-image-universal.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "launch-image-universal.storyboard"; sourceTree = "<group>"; };
 		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 = "<group>"; };
-		9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		93347A9564A62A24509EFA9C /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		9EC0135C1E06FB1900155B5C /* RCTWKWebView.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWKWebView.xcodeproj; path = "../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView.xcodeproj"; sourceTree = "<group>"; };
-		A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.release.xcconfig"; sourceTree = "<group>"; };
 		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 = "<group>"; };
-		ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.release.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.release.xcconfig"; sourceTree = "<group>"; };
+		AA6DC18226EB1EFB2A8FE64D /* Pods-Status-StatusIm.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm.debug.xcconfig"; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		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; };
@@ -150,10 +148,12 @@
 		C14C5F8C29C0A149005C58A7 /* launch-icon@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@3x.png"; path = "StatusIm/launch-icon@3x.png"; sourceTree = "<group>"; };
 		C14C5F9029C0AD9C005C58A7 /* launch-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon@2x.png"; path = "StatusIm/launch-icon@2x.png"; sourceTree = "<group>"; };
 		C14C5F9229C0ADB5005C58A7 /* launch-icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "launch-icon.png"; path = "StatusIm/launch-icon.png"; sourceTree = "<group>"; };
+		C618F2C2EF820C722B1E7624 /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
 		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 = "<group>"; };
 		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 = "<group>"; };
 		CE4E31B21D8695250033ED64 /* Statusgo.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Statusgo.xcframework; path = "../modules/react-native-status/ios/RCTStatus/Statusgo.xcframework"; sourceTree = "<group>"; };
-		D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusImPR.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR.debug.xcconfig"; sourceTree = "<group>"; };
+		D3EFEEB5FC1235562D5D3BF1 /* libPods-Status-StatusIm-StatusImTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Status-StatusIm-StatusImTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		DAE7378308FEB005CE0A6E42 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; path = "Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -161,7 +161,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				E6794203DEE6BE3C85F205F8 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
+				D156FF2CCF43C136F7BF8AE5 /* libPods-Status-StatusIm-StatusImTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -174,7 +174,7 @@
 				CE4E31B31D8695250033ED64 /* Statusgo.xcframework in Frameworks */,
 				25DC9C9DC25846BD8D084888 /* libc++.tbd in Frameworks */,
 				BA68A2377A20496EA737000D /* libz.tbd in Frameworks */,
-				8BE7C1BD90A0AB68254988BD /* libPods-Status-StatusIm.a in Frameworks */,
+				81F3191BB1D4BDF3442402BD /* libPods-Status-StatusIm.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -188,7 +188,7 @@
 				3AAD2AC224A3A60E0075D594 /* Statusgo.xcframework in Frameworks */,
 				3AAD2AC524A3A60E0075D594 /* libc++.tbd in Frameworks */,
 				3AAD2AC624A3A60E0075D594 /* libz.tbd in Frameworks */,
-				9930D2C5DF7BE851C6CE54A1 /* libPods-Status-StatusImPR.a in Frameworks */,
+				04515E9DF839CBF55C690E79 /* libPods-Status-StatusImPR.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,9 +314,9 @@
 				CE4E31B21D8695250033ED64 /* Statusgo.xcframework */,
 				8B9A886A2CB448B1ABA0EB62 /* libc++.tbd */,
 				4E586E1B0E544F64AA9F5BD1 /* libz.tbd */,
-				28A248DF828DD5505CABC707 /* libPods-Status-StatusIm.a */,
-				9305FC57D289E57F96162DD2 /* libPods-Status-StatusIm-StatusImTests.a */,
-				5B792BBAE71EAA1C3F2C9C47 /* libPods-Status-StatusImPR.a */,
+				0F8E9088BDE117AB71366407 /* libPods-Status-StatusIm.a */,
+				D3EFEEB5FC1235562D5D3BF1 /* libPods-Status-StatusIm-StatusImTests.a */,
+				5006FF03675A7E50320B4002 /* libPods-Status-StatusImPR.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -324,12 +324,12 @@
 		D0D5C8D06825D33BA2D2121E /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */,
-				668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */,
-				59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
-				ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
-				D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */,
-				A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */,
+				AA6DC18226EB1EFB2A8FE64D /* Pods-Status-StatusIm.debug.xcconfig */,
+				1CDF317A2E103217DF386083 /* Pods-Status-StatusIm.release.xcconfig */,
+				DAE7378308FEB005CE0A6E42 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */,
+				93347A9564A62A24509EFA9C /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */,
+				C618F2C2EF820C722B1E7624 /* Pods-Status-StatusImPR.debug.xcconfig */,
+				06AF19FA626AFFC91E66916B /* Pods-Status-StatusImPR.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -341,11 +341,11 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "StatusImTests" */;
 			buildPhases = (
-				CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */,
+				A461E3110C485D2A21EB942C /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */,
+				2B2389E62F0A9702C522FD40 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -361,14 +361,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "StatusIm" */;
 			buildPhases = (
-				523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */,
+				C5DA0344FCE555AD1908FBCD /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
 				20B6B6891D92C42700CC5C6A /* Embed Frameworks */,
 				E3914A731DF919ED00EBB515 /* Run Script */,
-				28606042DA81A750949525E4 /* [CP] Copy Pods Resources */,
+				EC618D80223E4CE064CFF898 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -383,14 +383,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3AAD2AD924A3A60E0075D594 /* Build configuration list for PBXNativeTarget "StatusImPR" */;
 			buildPhases = (
-				BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */,
+				0196982A5A6EB89DC2106F9B /* [CP] Check Pods Manifest.lock */,
 				3AAD2ABB24A3A60E0075D594 /* Sources */,
 				3AAD2ABF24A3A60E0075D594 /* Frameworks */,
 				3AAD2AC924A3A60E0075D594 /* Resources */,
 				3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */,
 				3AAD2AD624A3A60E0075D594 /* Embed Frameworks */,
 				3AAD2AD724A3A60E0075D594 /* Run Script */,
-				BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */,
+				4DBAAF9A3117797361E216BA /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -544,13 +544,35 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\"${NODE_ARGS:- --max-old-space-size=16384 }\"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
-		28606042DA81A750949525E4 /* [CP] Copy Pods Resources */ = {
+		0196982A5A6EB89DC2106F9B /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		2B2389E62F0A9702C522FD40 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh",
+				"${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",
@@ -563,7 +585,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
@@ -594,29 +616,7 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
-		523CD6BCB20FD78FBF3564AD /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		BB1D92AA7446228787D6925C /* [CP] Copy Pods Resources */ = {
+		4DBAAF9A3117797361E216BA /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -638,29 +638,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusImPR/Pods-Status-StatusImPR-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		BDAFF7E8D7D1C97E92C1F9B0 /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Status-StatusImPR-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		CA339D1D94763C013F2794AD /* [CP] Check Pods Manifest.lock */ = {
+		A461E3110C485D2A21EB942C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -682,26 +660,26 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D737FA0B0E9D346092C626FB /* [CP] Copy Pods Resources */ = {
+		C5DA0344FCE555AD1908FBCD /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			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",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			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",
+				"$(DERIVED_FILE_DIR)/Pods-Status-StatusIm-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm-StatusImTests/Pods-Status-StatusIm-StatusImTests-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		E3914A731DF919ED00EBB515 /* Run Script */ = {
@@ -718,6 +696,28 @@
 			shellPath = "/usr/bin/env sh";
 			shellScript = "\"${PROJECT_DIR}/scripts/set_xcode_version.sh\" > ./logs/set_xcode_version.log 2>&1";
 		};
+		EC618D80223E4CE064CFF898 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			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;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Status-StatusIm/Pods-Status-StatusIm-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -765,7 +765,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 59C9C002A09CA7F40E69C6CB /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
+			baseConfigurationReference = DAE7378308FEB005CE0A6E42 /* Pods-Status-StatusIm-StatusImTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = .debug;
@@ -802,7 +802,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = ACFD5EEA905CF67FD6F8C2CC /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
+			baseConfigurationReference = 93347A9564A62A24509EFA9C /* Pods-Status-StatusIm-StatusImTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_ID_SUFFIX = "";
@@ -835,7 +835,7 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1130DCD9CBDCA3CA461F55B4 /* Pods-Status-StatusIm.debug.xcconfig */;
+			baseConfigurationReference = AA6DC18226EB1EFB2A8FE64D /* Pods-Status-StatusIm.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -915,7 +915,7 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 668C1A2ADF1899973DAA1AB7 /* Pods-Status-StatusIm.release.xcconfig */;
+			baseConfigurationReference = 1CDF317A2E103217DF386083 /* Pods-Status-StatusIm.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";
@@ -988,7 +988,7 @@
 		};
 		3AAD2ADA24A3A60E0075D594 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = D0D6FCD821497D4A6D28C82E /* Pods-Status-StatusImPR.debug.xcconfig */;
+			baseConfigurationReference = C618F2C2EF820C722B1E7624 /* Pods-Status-StatusImPR.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = .debug;
@@ -1065,7 +1065,7 @@
 		};
 		3AAD2ADB24A3A60E0075D594 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = A18E846035BD6544591E45B9 /* Pods-Status-StatusImPR.release.xcconfig */;
+			baseConfigurationReference = 06AF19FA626AFFC91E66916B /* Pods-Status-StatusImPR.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = "AppIconPR$(BUNDLE_ID_SUFFIX)";
 				BUNDLE_ID_SUFFIX = "";

ios/StatusIm/AppDelegate.h

@@ -7,10 +7,12 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#import <RCTAppDelegate.h>
+#import <React/RCTBridgeDelegate.h>
 #import <UIKit/UIKit.h>
 #import <UserNotifications/UNUserNotificationCenter.h>
 
-@interface AppDelegate : RCTAppDelegate <UIApplicationDelegate, UNUserNotificationCenterDelegate>
+@interface AppDelegate : UIResponder <UIApplicationDelegate, RCTBridgeDelegate, UNUserNotificationCenterDelegate>
+
+@property (nonatomic, strong) UIWindow *window;
 
 @end

ios/StatusIm/AppDelegate.mm

@@ -17,6 +17,7 @@
 #import "RNSplashScreen.h"
 #import "RCTLinkingManager.h"
 
+#import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTHTTPRequestHandler.h>
 
@@ -27,8 +28,30 @@
 #import <SDWebImage/SDWebImageDownloaderOperation.h>
 
 #import <Security/Security.h>
+// adding this for v0.68.x
+#import <React/RCTAppSetupUtils.h>
+#if RCT_NEW_ARCH_ENABLED
+#import <React/CoreModulesPlugins.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <React/RCTFabricSurfaceHostingProxyRootView.h>
+#import <React/RCTSurfacePresenter.h>
+#import <React/RCTSurfacePresenterBridgeAdapter.h>
+#import <ReactCommon/RCTTurboModuleManager.h>
 #import <react/config/ReactNativeConfig.h>
 
+static NSString *const kRNConcurrentRoot = @"concurrentRoot";
+
+@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
+  RCTTurboModuleManager *_turboModuleManager;
+  RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
+  std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
+  facebook::react::ContextContainer::Shared _contextContainer;
+  }
+@end
+#endif
+
+
+
 //TODO: properly import the framework
 extern "C" NSString* StatusgoImageServerTLSCert();
 
@@ -43,12 +66,18 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+  RCTAppSetupPrepareApp(application);
 
-  if (!self.bridge) {
-    self.bridge = [self createBridgeWithDelegate:self launchOptions:launchOptions];
-  }
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  [ReactNativeNavigation bootstrapWithBridge:bridge];
 
-  [ReactNativeNavigation bootstrapWithBridge:self.bridge];
+  #if RCT_NEW_ARCH_ENABLED
+      _contextContainer = std::make_shared<facebook::react::ContextContainer const>();
+      _reactNativeConfig = std::make_shared<facebook::react::EmptyReactNativeConfig const>();
+      _contextContainer->insert("ReactNativeConfig", _reactNativeConfig);
+      _bridgeAdapter = [[RCTSurfacePresenterBridgeAdapter alloc] initWithBridge:bridge contextContainer:_contextContainer];
+      bridge.surfacePresenter = _bridgeAdapter.surfacePresenter;
+  #endif
 
   signal(SIGPIPE, SIG_IGN);
   NSURL *jsCodeLocation;
@@ -103,6 +132,25 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 }
 
 
+/// This method controls whether the `concurrentRoot`feature of React18 is turned on or off.
+///
+/// @see: https://reactjs.org/blog/2022/03/29/react-v18.html
+/// @note: This requires to be rendering on Fabric (i.e. on the New Architecture).
+/// @return: `true` if the `concurrentRoot` feture is enabled. Otherwise, it returns `false`.
+- (BOOL)concurrentRootEnabled
+{
+  // Switch this bool to turn on and off the concurrent root
+  return true;
+}
+- (NSDictionary *)prepareInitialProps
+{
+  NSMutableDictionary *initProps = [NSMutableDictionary new];
+#ifdef RCT_NEW_ARCH_ENABLED
+  initProps[kRNConcurrentRoot] = @([self concurrentRootEnabled]);
+#endif
+  return initProps;
+}
+
 - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 {
 #if DEBUG
@@ -112,6 +160,37 @@ extern "C" NSString* StatusgoImageServerTLSCert();
 #endif
 }
 
+#if RCT_NEW_ARCH_ENABLED
+#pragma mark - RCTCxxBridgeDelegate
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
+{
+  _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
+                                                             delegate:self
+                                                            jsInvoker:bridge.jsCallInvoker];
+  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
+}
+#pragma mark RCTTurboModuleManagerDelegate
+- (Class)getModuleClassFromName:(const char *)name
+{
+  return RCTCoreModulesClassProvider(name);
+}
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                      jsInvoker:(std::shared_ptr<facebook::react::CallInvoker>)jsInvoker
+{
+  return nullptr;
+}
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const std::string &)name
+                                                     initParams:
+                                                         (const facebook::react::ObjCTurboModule::InitParams &)params
+{
+  return nullptr;
+}
+- (id<RCTTurboModule>)getModuleInstanceFromClass:(Class)moduleClass
+{
+  return RCTAppSetupDefaultModuleFromClass(moduleClass);
+}
+#endif
+
 - (void)applicationWillResignActive:(UIApplication *)application {
   if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BLANK_PREVIEW"]) {
     [self.window addSubview:_blankView];

metro.config.js

@@ -1,11 +1,10 @@
-const { getDefaultConfig, mergeConfig } = require('@react-native/metro-config');
 /**
- * Metro configuration
- * https://facebook.github.io/metro/docs/configuration
+ * Metro configuration for React Native
+ * https://github.com/facebook/react-native
  *
- * @type {import('metro-config').MetroConfig}
+ * @format
  */
-const config = {
+module.exports = {
   transformer: {
     getTransformOptions: async () => ({
       transform: {
@@ -15,10 +14,6 @@ const config = {
     }),
   },
   resolver: {
-    resolverMainFields: ['react-native', 'browser', 'main'],
-    nodeModulesPaths: ['./node_modules'],
     extraNodeModules: require('node-libs-react-native'),
-    unstable_enableSymlinks: true,
   },
 };
-module.exports = mergeConfig(getDefaultConfig(__dirname), config);

modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java

@@ -1183,11 +1183,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         return pathCombine(absRootDirPath, "keystore");
     }
 
-    @ReactMethod(isBlockingSynchronousMethod = true)
-    public String fleets() {
-        return Statusgo.fleets();
-    }
-
     @ReactMethod(isBlockingSynchronousMethod = true)
     public String backupDisabledDataDir() {
         return this.getNoBackupDirectory();

modules/react-native-status/ios/RCTStatus/RCTStatus.m

@@ -981,10 +981,6 @@ RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(isAddress:(NSString *)address) {
   return StatusgoIsAddress(address);
 }
 
-RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(fleets) {
-  return StatusgoFleets();
-}
-
 RCT_EXPORT_BLOCKING_SYNCHRONOUS_METHOD(toChecksumAddress:(NSString *)address) {
   return StatusgoToChecksumAddress(address);
 }

modules/react-native-status/nodejs/status.cpp

@@ -298,7 +298,6 @@ void _MultiAccountStoreAccount(const FunctionCallbackInfo<Value>& args) {
 	delete c;
 }
 
-
 void _InitKeystore(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -563,17 +562,6 @@ void _CheckAddressChecksum(const FunctionCallbackInfo<Value>& args) {
 
 }
 
-void _Fleets(const FunctionCallbackInfo<Value>& args) {
-	Isolate* isolate = args.GetIsolate();
-	// Call exported Go function, which returns a C string
-	char *c = Fleets();
-
-	Local<String> ret = String::NewFromUtf8(isolate, c).ToLocalChecked();
-	args.GetReturnValue().Set(ret);
-	delete c;
-}
-
-
 void _IsAddress(const FunctionCallbackInfo<Value>& args) {
 	Isolate* isolate = args.GetIsolate();
         Local<Context> context = isolate->GetCurrentContext();
@@ -1900,7 +1888,6 @@ void init(Local<Object> exports) {
 	NODE_SET_METHOD(exports, "multiAccountStoreDerivedAccounts", _MultiAccountStoreDerivedAccounts);
 	NODE_SET_METHOD(exports, "multiAccountStoreAccount", _MultiAccountStoreAccount);
 	NODE_SET_METHOD(exports, "initKeystore", _InitKeystore);
-	NODE_SET_METHOD(exports, "fleets", _Fleets);
 	NODE_SET_METHOD(exports, "stopCPUProfiling", _StopCPUProfiling);
 	NODE_SET_METHOD(exports, "encodeTransfer", _EncodeTransfer);
 	NODE_SET_METHOD(exports, "encodeFunctionCall", _EncodeFunctionCall);

nix/deps/clojure/deps.json

@@ -45,20 +45,11 @@
   },
 
   {
-    "path": "borkdude/dynaload/0.3.5/dynaload-0.3.5",
+    "path": "borkdude/edamame/1.1.17/edamame-1.1.17",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "accd696ba364b850b4d92e38f5a34d0e828a0ad1",
-      "sha256": "0k62m1f29xfh3cp67w7kcvkp5aj35simi8kf95ycvkmgp76w11q8"
-    }
-  },
-
-  {
-    "path": "borkdude/edamame/1.3.23/edamame-1.3.23",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "254d023e97ed438f0f44532b5a06d928d031ede4",
-      "sha256": "0l7mxza2nimslhg0qh6jp7gmb8sd6l89fk5d1zvzq2xskscq2vly"
+      "sha1": "9087f7abf0104e0354d7db7fc4576608eac558f4",
+      "sha256": "1n1872i240lakn4pzsag4grf7bv7lcsipmqllxd9m4k1zp3dgla1"
     }
   },
 
@@ -90,20 +81,20 @@
   },
 
   {
-    "path": "cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3",
+    "path": "cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "5ae0efd9377a5e60c084bdaf4a2ce094f759ce23",
-      "sha256": "0drxf9nm23i1pcgrkwbcr09msq37csilzww38709add0hz8spjhq"
+      "sha1": "45f6034b26a14138e74145b7a4059628c0fedcd1",
+      "sha256": "1dy1l6y8cb8xiqq97a4lf8giyiicq4wfl4s2lxn5fb6614cjxqx2"
     }
   },
 
   {
-    "path": "cider/piggieback/0.4.1/piggieback-0.4.1",
+    "path": "cider/piggieback/0.5.2/piggieback-0.5.2",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "0a02a3e2ecd7a126ab60d8a44793342f20ced79b",
-      "sha256": "142vl5np33akcrnn6pksi0rjfsmmi528villxsj6cwcndvybiw4m"
+      "sha1": "ecfd5c286a85db3f059e75c37fca5722d9e26f79",
+      "sha256": "1ps9yf3cxmlm447hqkidjb5xry90n0wl3jk0jn28fagq31lzylkl"
     }
   },
 
@@ -548,24 +539,6 @@
     }
   },
 
-  {
-    "path": "metosin/malli/0.13.0/malli-0.13.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "286c52d26a3a9d613b5f692971bd19c581cdc4b0",
-      "sha256": "0vaq9d6cln5j4ww302fwlgg7m647cf2j16gs2i1p1d4klbn4jddz"
-    }
-  },
-
-  {
-    "path": "mvxcvi/arrangement/2.1.0/arrangement-2.1.0",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "1bc8f3bba7a28de85f319b7d464aa8d955f44918",
-      "sha256": "1j1rkwrs4wm8zk9v7ilgpnyav5sipdd2bmb83sazh392blw52wpk"
-    }
-  },
-
   {
     "path": "net/cgrand/macrovich/0.2.1/macrovich-0.2.1",
     "host": "https://repo.clojars.org",
@@ -602,15 +575,6 @@
     }
   },
 
-  {
-    "path": "nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8",
-    "host": "https://repo.clojars.org",
-    "jar": {
-      "sha1": "4c94bd510f0c18a20191e46dd6becedebc640bbd",
-      "sha256": "0wpla2hx0s4mda58ndyd8938zmnz1gyhgfr6pzfphy27xfbvsssl"
-    }
-  },
-
   {
     "path": "org/apache/ant/ant/1.10.11/ant-1.10.11",
     "host": "https://repo1.maven.org/maven2",
@@ -755,15 +719,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "aa95d25ea98bfe1152ea540f6e58a303c8cacc86",
-      "sha256": "0qvdsr5ryjmrpz622ivpyq5aayn42y4bk531vbasyj2yj7gcg35h"
-    }
-  },
-
   {
     "path": "org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218",
     "host": "https://repo1.maven.org/maven2",
@@ -773,15 +728,6 @@
     }
   },
 
-  {
-    "path": "org/clojure/test.check/1.1.1/test.check-1.1.1",
-    "host": "https://repo1.maven.org/maven2",
-    "jar": {
-      "sha1": "f33d988fd57bc9c11af1952db81c10f319c91416",
-      "sha256": "0y2hpkj7zl4yrpsl35ifpdaja5c72b8fpjcnmdgmld9c7cb1hlcl"
-    }
-  },
-
   {
     "path": "org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0",
     "host": "https://repo1.maven.org/maven2",
@@ -963,11 +909,11 @@
   },
 
   {
-    "path": "refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0",
+    "path": "refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0",
     "host": "https://repo.clojars.org",
     "jar": {
-      "sha1": "6bc3441afc94f7ca024e41a864ca75e05df7e207",
-      "sha256": "0w8hax99y98l53mixxzx2ja0vcnhjv8dnsaz1zj3vqk775ns5w6i"
+      "sha1": "2b3bb82da53b5db9c2b2aa298417816b81d0ed97",
+      "sha256": "1ysqabmlnghki6x0636zngxza2d83c85276wp9ma9wk183mkv52a"
     }
   },
 

nix/deps/clojure/deps.list

@@ -3,13 +3,12 @@ babashka/fs/0.2.16/fs-0.2.16.jar
 bidi/bidi/2.1.6/bidi-2.1.6.jar
 binaryage/env-config/0.2.2/env-config-0.2.2.jar
 binaryage/oops/0.7.2/oops-0.7.2.jar
-borkdude/dynaload/0.3.5/dynaload-0.3.5.jar
-borkdude/edamame/1.3.23/edamame-1.3.23.jar
+borkdude/edamame/1.1.17/edamame-1.1.17.jar
 borkdude/sci.impl.reflector/0.0.1/sci.impl.reflector-0.0.1.jar
 camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cheshire/cheshire/5.11.0/cheshire-5.11.0.jar
-cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
-cider/piggieback/0.4.1/piggieback-0.4.1.jar
+cider/cider-nrepl/0.29.0/cider-nrepl-0.29.0.jar
+cider/piggieback/0.5.2/piggieback-0.5.2.jar
 clj-kondo/clj-kondo/2023.09.07/clj-kondo-2023.09.07.jar
 cljs-bean/cljs-bean/1.9.0/cljs-bean-1.9.0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
@@ -59,13 +58,10 @@ javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar
 javax/servlet/servlet-api/2.5/servlet-api-2.5.jar
 javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar
 medley/medley/0.8.2/medley-0.8.2.jar
-metosin/malli/0.13.0/malli-0.13.0.jar
-mvxcvi/arrangement/2.1.0/arrangement-2.1.0.jar
 net/cgrand/macrovich/0.2.1/macrovich-0.2.1.jar
 net/java/dev/jna/jna/5.12.1/jna-5.12.1.jar
 nrepl/bencode/1.1.0/bencode-1.1.0.jar
 nrepl/nrepl/1.0.0/nrepl-1.0.0.jar
-nubank/matcher-combinators/3.8.8/matcher-combinators-3.8.8.jar
 org/apache/ant/ant/1.10.11/ant-1.10.11.jar
 org/apache/ant/ant-launcher/1.10.11/ant-launcher-1.10.11.jar
 org/babashka/sci/0.7.38/sci-0.7.38.jar
@@ -82,9 +78,7 @@ org/clojure/data.json/2.4.0/data.json-2.4.0.jar
 org/clojure/data.priority-map/1.1.0/data.priority-map-1.1.0.jar
 org/clojure/google-closure-library/0.0-20230227-c7c0a541/google-closure-library-0.0-20230227-c7c0a541.jar
 org/clojure/google-closure-library-third-party/0.0-20230227-c7c0a541/google-closure-library-third-party-0.0-20230227-c7c0a541.jar
-org/clojure/math.combinatorics/0.2.0/math.combinatorics-0.2.0.jar
 org/clojure/spec.alpha/0.3.218/spec.alpha-0.3.218.jar
-org/clojure/test.check/1.1.1/test.check-1.1.1.jar
 org/clojure/tools.analyzer/1.1.0/tools.analyzer-1.1.0.jar
 org/clojure/tools.analyzer.jvm/1.2.2/tools.analyzer.jvm-1.2.2.jar
 org/clojure/tools.cli/1.0.206/tools.cli-1.0.206.jar
@@ -105,7 +99,7 @@ org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
 reagent/reagent/1.2.0/reagent-1.2.0.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
+refactor-nrepl/refactor-nrepl/3.6.0/refactor-nrepl-3.6.0.jar
 re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar

nix/deps/gradle/deps.list

@@ -1,28 +1,21 @@
 androidx.activity:activity:1.0.0
-androidx.activity:activity:1.0.0-rc01
 androidx.activity:activity:1.2.4
 androidx.annotation:annotation-experimental:1.1.0
 androidx.annotation:annotation:1.1.0
 androidx.annotation:annotation:1.2.0
 androidx.annotation:annotation:1.3.0
-androidx.appcompat:appcompat-resources:1.1.0-rc01
 androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat-resources:1.3.1
 androidx.appcompat:appcompat-resources:1.4.1
-androidx.appcompat:appcompat-resources:1.4.2
-androidx.appcompat:appcompat:1.1.0-rc01
 androidx.appcompat:appcompat:1.2.0
 androidx.appcompat:appcompat:1.3.1
 androidx.appcompat:appcompat:1.4.1
-androidx.appcompat:appcompat:1.4.2
 androidx.arch.core:core-common:2.0.0
 androidx.arch.core:core-common:2.1.0
-androidx.arch.core:core-common:2.1.0-rc01
 androidx.arch.core:core-runtime:2.0.0
 androidx.arch.core:core-runtime:2.1.0
 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
 androidx.autofill:autofill:1.1.0
-androidx.biometric:biometric:1.1.0
 androidx.camera:camera-camera2:1.1.0
 androidx.camera:camera-core:1.1.0
 androidx.camera:camera-lifecycle:1.1.0
@@ -31,7 +24,6 @@ androidx.cardview:cardview:1.0.0
 androidx.collection:collection:1.0.0
 androidx.collection:collection:1.1.0
 androidx.concurrent:concurrent-futures:1.0.0
-androidx.concurrent:concurrent-futures:1.1.0
 androidx.constraintlayout:constraintlayout-solver:2.0.4
 androidx.constraintlayout:constraintlayout:2.0.4
 androidx.coordinatorlayout:coordinatorlayout:1.0.0
@@ -39,7 +31,6 @@ androidx.coordinatorlayout:coordinatorlayout:1.1.0
 androidx.core:core-ktx:1.6.0
 androidx.core:core-splashscreen:1.0.0
 androidx.core:core:1.1.0
-androidx.core:core:1.1.0-rc01
 androidx.core:core:1.2.0
 androidx.core:core:1.6.0
 androidx.core:core:1.7.0
@@ -49,18 +40,16 @@ androidx.databinding:databinding-common:3.2.1
 androidx.databinding:databinding-common:3.3.1
 androidx.databinding:databinding-common:3.5.4
 androidx.databinding:databinding-common:4.1.0
-androidx.databinding:databinding-common:7.0.4
 androidx.databinding:databinding-common:7.2.1
-androidx.databinding:databinding-common:7.3.1
-androidx.databinding:databinding-common:7.4.2
+androidx.databinding:databinding-common:7.2.2
+androidx.databinding:databinding-common:7.3.0
 androidx.databinding:databinding-compiler-common:3.2.1
 androidx.databinding:databinding-compiler-common:3.3.1
 androidx.databinding:databinding-compiler-common:3.5.4
 androidx.databinding:databinding-compiler-common:4.1.0
-androidx.databinding:databinding-compiler-common:7.0.4
 androidx.databinding:databinding-compiler-common:7.2.1
-androidx.databinding:databinding-compiler-common:7.3.1
-androidx.databinding:databinding-compiler-common:7.4.2
+androidx.databinding:databinding-compiler-common:7.2.2
+androidx.databinding:databinding-compiler-common:7.3.0
 androidx.documentfile:documentfile:1.0.0
 androidx.drawerlayout:drawerlayout:1.0.0
 androidx.emoji2:emoji2-views-helper:1.0.0
@@ -72,7 +61,6 @@ androidx.exifinterface:exifinterface:1.2.0
 androidx.exifinterface:exifinterface:1.3.2
 androidx.fragment:fragment:1.0.0
 androidx.fragment:fragment:1.1.0
-androidx.fragment:fragment:1.1.0-rc01
 androidx.fragment:fragment:1.3.6
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-ui:1.0.0
@@ -80,7 +68,6 @@ androidx.legacy:legacy-support-core-utils:1.0.0
 androidx.legacy:legacy-support-v4:1.0.0
 androidx.lifecycle:lifecycle-common:2.0.0
 androidx.lifecycle:lifecycle-common:2.1.0
-androidx.lifecycle:lifecycle-common:2.1.0-rc01
 androidx.lifecycle:lifecycle-common:2.3.1
 androidx.lifecycle:lifecycle-common:2.4.0
 androidx.lifecycle:lifecycle-livedata-core:2.0.0
@@ -91,13 +78,11 @@ androidx.lifecycle:lifecycle-livedata:2.1.0
 androidx.lifecycle:lifecycle-process:2.4.0
 androidx.lifecycle:lifecycle-runtime:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.1.0
-androidx.lifecycle:lifecycle-runtime:2.1.0-rc01
 androidx.lifecycle:lifecycle-runtime:2.3.1
 androidx.lifecycle:lifecycle-runtime:2.4.0
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
 androidx.lifecycle:lifecycle-viewmodel:2.0.0
 androidx.lifecycle:lifecycle-viewmodel:2.1.0
-androidx.lifecycle:lifecycle-viewmodel:2.1.0-rc01
 androidx.lifecycle:lifecycle-viewmodel:2.3.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
@@ -108,29 +93,18 @@ androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.0
 androidx.resourceinspection:resourceinspection-annotation:1.0.0
 androidx.savedstate:savedstate:1.0.0
-androidx.savedstate:savedstate:1.0.0-rc01
 androidx.savedstate:savedstate:1.1.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
 androidx.startup:startup-runtime:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02
-androidx.test.ext:junit:1.1.4-alpha05
-androidx.test.services:storage:1.4.2-alpha02
-androidx.test:annotation:1.0.0
-androidx.test:core:1.4.1-alpha05
-androidx.test:monitor:1.6.0-alpha02
-androidx.test:runner:1.5.0-alpha02
-androidx.tracing:tracing:1.1.0
-androidx.transition:transition:1.1.0
+androidx.tracing:tracing:1.0.0
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
 androidx.vectordrawable:vectordrawable-animated:1.1.0
-androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01
 androidx.vectordrawable:vectordrawable:1.1.0
-androidx.vectordrawable:vectordrawable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.0
-androidx.versionedparcelable:versionedparcelable:1.1.0-rc01
 androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager2:viewpager2:1.0.0
 androidx.viewpager:viewpager:1.0.0
@@ -143,12 +117,10 @@ commons-codec:commons-codec:1.11
 commons-io:commons-io:2.4
 commons-logging:commons-logging:1.1.1
 commons-logging:commons-logging:1.2
-com.adarshr:gradle-test-logger-plugin:2.0.0
 com.adobe.xmp:xmpcore:6.1.11
 com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
 com.airbnb.android:lottie:3.4.4
-com.almworks.sqlite4java:sqlite4java:1.0.392
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
@@ -156,10 +128,9 @@ com.android.databinding:baseLibrary:3.2.1
 com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
 com.android.databinding:baseLibrary:4.1.0
-com.android.databinding:baseLibrary:7.0.4
 com.android.databinding:baseLibrary:7.2.1
-com.android.databinding:baseLibrary:7.3.1
-com.android.databinding:baseLibrary:7.4.2
+com.android.databinding:baseLibrary:7.2.2
+com.android.databinding:baseLibrary:7.3.0
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
@@ -167,40 +138,36 @@ com.android.tools.analytics-library:crash:26.2.1
 com.android.tools.analytics-library:crash:26.3.1
 com.android.tools.analytics-library:crash:26.5.4
 com.android.tools.analytics-library:crash:27.1.0
-com.android.tools.analytics-library:crash:30.0.4
 com.android.tools.analytics-library:crash:30.2.1
-com.android.tools.analytics-library:crash:30.3.1
-com.android.tools.analytics-library:crash:30.4.2
+com.android.tools.analytics-library:crash:30.2.2
+com.android.tools.analytics-library:crash:30.3.0
 com.android.tools.analytics-library:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
 com.android.tools.analytics-library:protos:26.2.1
 com.android.tools.analytics-library:protos:26.3.1
 com.android.tools.analytics-library:protos:26.5.4
 com.android.tools.analytics-library:protos:27.1.0
-com.android.tools.analytics-library:protos:30.0.4
 com.android.tools.analytics-library:protos:30.2.1
-com.android.tools.analytics-library:protos:30.3.1
-com.android.tools.analytics-library:protos:30.4.2
+com.android.tools.analytics-library:protos:30.2.2
+com.android.tools.analytics-library:protos:30.3.0
 com.android.tools.analytics-library:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
 com.android.tools.analytics-library:shared:26.2.1
 com.android.tools.analytics-library:shared:26.3.1
 com.android.tools.analytics-library:shared:26.5.4
 com.android.tools.analytics-library:shared:27.1.0
-com.android.tools.analytics-library:shared:30.0.4
 com.android.tools.analytics-library:shared:30.2.1
-com.android.tools.analytics-library:shared:30.3.1
-com.android.tools.analytics-library:shared:30.4.2
+com.android.tools.analytics-library:shared:30.2.2
+com.android.tools.analytics-library:shared:30.3.0
 com.android.tools.analytics-library:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
 com.android.tools.analytics-library:tracker:26.2.1
 com.android.tools.analytics-library:tracker:26.3.1
 com.android.tools.analytics-library:tracker:26.5.4
 com.android.tools.analytics-library:tracker:27.1.0
-com.android.tools.analytics-library:tracker:30.0.4
 com.android.tools.analytics-library:tracker:30.2.1
-com.android.tools.analytics-library:tracker:30.3.1
-com.android.tools.analytics-library:tracker:30.4.2
+com.android.tools.analytics-library:tracker:30.2.2
+com.android.tools.analytics-library:tracker:30.3.0
 com.android.tools.build.jetifier:jetifier-core:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-core:1.0.0-beta04
@@ -214,33 +181,30 @@ com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10
 com.android.tools.build:aapt2-proto:0.3.1
 com.android.tools.build:aapt2-proto:0.4.0
 com.android.tools.build:aapt2-proto:4.1.0-6503028
-com.android.tools.build:aapt2-proto:7.0.4-7396180
 com.android.tools.build:aapt2-proto:7.2.1-7984345
-com.android.tools.build:aapt2-proto:7.3.1-8691043
-com.android.tools.build:aapt2-proto:7.4.2-8841542
+com.android.tools.build:aapt2-proto:7.2.2-7984345
+com.android.tools.build:aapt2-proto:7.3.0-8691043
 com.android.tools.build:aaptcompiler:4.1.0
-com.android.tools.build:aaptcompiler:7.0.4
 com.android.tools.build:aaptcompiler:7.2.1
-com.android.tools.build:aaptcompiler:7.3.1
-com.android.tools.build:aaptcompiler:7.4.2
+com.android.tools.build:aaptcompiler:7.2.2
+com.android.tools.build:aaptcompiler:7.3.0
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
 com.android.tools.build:apksig:3.2.1
 com.android.tools.build:apksig:3.3.1
 com.android.tools.build:apksig:3.5.4
 com.android.tools.build:apksig:4.1.0
-com.android.tools.build:apksig:7.0.4
 com.android.tools.build:apksig:7.2.1
-com.android.tools.build:apksig:7.3.1
-com.android.tools.build:apksig:7.4.2
+com.android.tools.build:apksig:7.2.2
+com.android.tools.build:apksig:7.3.0
 com.android.tools.build:apkzlib:3.2.1
 com.android.tools.build:apkzlib:3.3.1
 com.android.tools.build:apkzlib:3.5.4
 com.android.tools.build:apkzlib:4.1.0
-com.android.tools.build:apkzlib:7.0.4
 com.android.tools.build:apkzlib:7.2.1
-com.android.tools.build:apkzlib:7.3.1
-com.android.tools.build:apkzlib:7.4.2
+com.android.tools.build:apkzlib:7.2.2
+com.android.tools.build:apkzlib:7.3.0
+com.android.tools.build:builder-model:1.1.3
 com.android.tools.build:builder-model:1.3.1
 com.android.tools.build:builder-model:1.5.0
 com.android.tools.build:builder-model:3.0.0
@@ -249,10 +213,10 @@ com.android.tools.build:builder-model:3.2.1
 com.android.tools.build:builder-model:3.3.1
 com.android.tools.build:builder-model:3.5.4
 com.android.tools.build:builder-model:4.1.0
-com.android.tools.build:builder-model:7.0.4
 com.android.tools.build:builder-model:7.2.1
-com.android.tools.build:builder-model:7.3.1
-com.android.tools.build:builder-model:7.4.2
+com.android.tools.build:builder-model:7.2.2
+com.android.tools.build:builder-model:7.3.0
+com.android.tools.build:builder-test-api:1.1.3
 com.android.tools.build:builder-test-api:1.3.1
 com.android.tools.build:builder-test-api:1.5.0
 com.android.tools.build:builder-test-api:3.0.0
@@ -261,10 +225,10 @@ com.android.tools.build:builder-test-api:3.2.1
 com.android.tools.build:builder-test-api:3.3.1
 com.android.tools.build:builder-test-api:3.5.4
 com.android.tools.build:builder-test-api:4.1.0
-com.android.tools.build:builder-test-api:7.0.4
 com.android.tools.build:builder-test-api:7.2.1
-com.android.tools.build:builder-test-api:7.3.1
-com.android.tools.build:builder-test-api:7.4.2
+com.android.tools.build:builder-test-api:7.2.2
+com.android.tools.build:builder-test-api:7.3.0
+com.android.tools.build:builder:1.1.3
 com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
@@ -273,33 +237,30 @@ com.android.tools.build:builder:3.2.1
 com.android.tools.build:builder:3.3.1
 com.android.tools.build:builder:3.5.4
 com.android.tools.build:builder:4.1.0
-com.android.tools.build:builder:7.0.4
 com.android.tools.build:builder:7.2.1
-com.android.tools.build:builder:7.3.1
-com.android.tools.build:builder:7.4.2
+com.android.tools.build:builder:7.2.2
+com.android.tools.build:builder:7.3.0
 com.android.tools.build:bundletool:0.5.0
 com.android.tools.build:bundletool:0.6.0
 com.android.tools.build:bundletool:0.9.0
 com.android.tools.build:bundletool:0.14.0
-com.android.tools.build:bundletool:1.6.0
 com.android.tools.build:bundletool:1.8.2
 com.android.tools.build:bundletool:1.9.0
-com.android.tools.build:bundletool:1.11.4
 com.android.tools.build:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
 com.android.tools.build:gradle-api:3.2.1
 com.android.tools.build:gradle-api:3.3.1
 com.android.tools.build:gradle-api:3.5.4
 com.android.tools.build:gradle-api:4.1.0
-com.android.tools.build:gradle-api:7.0.4
 com.android.tools.build:gradle-api:7.2.1
-com.android.tools.build:gradle-api:7.3.1
-com.android.tools.build:gradle-api:7.4.2
+com.android.tools.build:gradle-api:7.2.2
+com.android.tools.build:gradle-api:7.3.0
+com.android.tools.build:gradle-core:1.1.3
 com.android.tools.build:gradle-core:1.3.1
 com.android.tools.build:gradle-core:1.5.0
 com.android.tools.build:gradle-core:3.0.0
 com.android.tools.build:gradle-core:3.0.1
-com.android.tools.build:gradle-settings-api:7.4.2
+com.android.tools.build:gradle:1.1.3
 com.android.tools.build:gradle:1.3.1
 com.android.tools.build:gradle:1.5.0
 com.android.tools.build:gradle:3.0.0
@@ -308,9 +269,10 @@ com.android.tools.build:gradle:3.2.1
 com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
 com.android.tools.build:gradle:4.1.0
-com.android.tools.build:gradle:7.0.4
 com.android.tools.build:gradle:7.2.1
-com.android.tools.build:gradle:7.3.1
+com.android.tools.build:gradle:7.2.2
+com.android.tools.build:gradle:7.3.0
+com.android.tools.build:manifest-merger:24.1.3
 com.android.tools.build:manifest-merger:24.3.1
 com.android.tools.build:manifest-merger:24.5.0
 com.android.tools.build:manifest-merger:26.0.0
@@ -319,12 +281,12 @@ com.android.tools.build:manifest-merger:26.2.1
 com.android.tools.build:manifest-merger:26.3.1
 com.android.tools.build:manifest-merger:26.5.4
 com.android.tools.build:manifest-merger:27.1.0
-com.android.tools.build:manifest-merger:30.0.4
 com.android.tools.build:manifest-merger:30.2.1
-com.android.tools.build:manifest-merger:30.3.1
-com.android.tools.build:manifest-merger:30.4.2
+com.android.tools.build:manifest-merger:30.2.2
+com.android.tools.build:manifest-merger:30.3.0
 com.android.tools.build:transform-api:1.5.0
 com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api
+com.android.tools.ddms:ddmlib:24.1.3
 com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.0
@@ -333,10 +295,9 @@ com.android.tools.ddms:ddmlib:26.2.1
 com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
 com.android.tools.ddms:ddmlib:27.1.0
-com.android.tools.ddms:ddmlib:30.0.4
 com.android.tools.ddms:ddmlib:30.2.1
-com.android.tools.ddms:ddmlib:30.3.1
-com.android.tools.ddms:ddmlib:30.4.2
+com.android.tools.ddms:ddmlib:30.2.2
+com.android.tools.ddms:ddmlib:30.3.0
 com.android.tools.external.com-intellij:intellij-core:26.0.0
 com.android.tools.external.com-intellij:intellij-core:26.0.1
 com.android.tools.external.lombok:lombok-ast:0.2.3
@@ -344,6 +305,7 @@ com.android.tools.external.org-jetbrains:uast:26.0.0
 com.android.tools.external.org-jetbrains:uast:26.0.1
 com.android.tools.jack:jack-api:0.9.0
 com.android.tools.jill:jill-api:0.9.0
+com.android.tools.layoutlib:layoutlib-api:24.1.3
 com.android.tools.layoutlib:layoutlib-api:24.3.1
 com.android.tools.layoutlib:layoutlib-api:24.5.0
 com.android.tools.layoutlib:layoutlib-api:26.0.0
@@ -352,14 +314,15 @@ com.android.tools.layoutlib:layoutlib-api:26.2.1
 com.android.tools.layoutlib:layoutlib-api:26.3.1
 com.android.tools.layoutlib:layoutlib-api:26.5.4
 com.android.tools.layoutlib:layoutlib-api:27.1.0
-com.android.tools.layoutlib:layoutlib-api:30.0.4
 com.android.tools.layoutlib:layoutlib-api:30.2.1
-com.android.tools.layoutlib:layoutlib-api:30.3.1
-com.android.tools.layoutlib:layoutlib-api:30.4.2
+com.android.tools.layoutlib:layoutlib-api:30.2.2
+com.android.tools.layoutlib:layoutlib-api:30.3.0
+com.android.tools.lint:lint-api:24.1.3
 com.android.tools.lint:lint-api:24.3.1
 com.android.tools.lint:lint-api:24.5.0
 com.android.tools.lint:lint-api:26.0.0
 com.android.tools.lint:lint-api:26.0.1
+com.android.tools.lint:lint-checks:24.1.3
 com.android.tools.lint:lint-checks:24.3.1
 com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
@@ -369,38 +332,36 @@ com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
 com.android.tools.lint:lint-gradle-api:27.1.0
 com.android.tools.lint:lint-model:27.1.0
-com.android.tools.lint:lint-model:30.0.4
 com.android.tools.lint:lint-model:30.2.1
-com.android.tools.lint:lint-model:30.3.1
-com.android.tools.lint:lint-model:30.4.2
+com.android.tools.lint:lint-model:30.2.2
+com.android.tools.lint:lint-model:30.3.0
 com.android.tools.lint:lint-typedef-remover:30.2.1
-com.android.tools.lint:lint-typedef-remover:30.3.1
-com.android.tools.lint:lint-typedef-remover:30.4.2
+com.android.tools.lint:lint-typedef-remover:30.2.2
+com.android.tools.lint:lint-typedef-remover:30.3.0
+com.android.tools.lint:lint:24.1.3
 com.android.tools.lint:lint:24.3.1
 com.android.tools.lint:lint:24.5.0
 com.android.tools.lint:lint:26.0.0
 com.android.tools.lint:lint:26.0.1
 com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.1
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.1
-com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2
-com.android.tools.utp:android-device-provider-gradle-proto:30.0.4
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.2.2
+com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0
 com.android.tools.utp:android-device-provider-gradle-proto:30.2.1
-com.android.tools.utp:android-device-provider-gradle-proto:30.3.1
-com.android.tools.utp:android-device-provider-gradle-proto:30.4.2
+com.android.tools.utp:android-device-provider-gradle-proto:30.2.2
+com.android.tools.utp:android-device-provider-gradle-proto:30.3.0
 com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.1
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.2.2
+com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0
 com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.1
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.0.4
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.2.2
+com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0
 com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.1
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.1
-com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.0.4
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.2.2
+com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0
 com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.1
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.1
-com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.2.2
+com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0
+com.android.tools:annotations:24.1.3
 com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
@@ -409,10 +370,10 @@ com.android.tools:annotations:26.2.1
 com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
 com.android.tools:annotations:27.1.0
-com.android.tools:annotations:30.0.4
 com.android.tools:annotations:30.2.1
-com.android.tools:annotations:30.3.1
-com.android.tools:annotations:30.4.2
+com.android.tools:annotations:30.2.2
+com.android.tools:annotations:30.3.0
+com.android.tools:common:24.1.3
 com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
@@ -421,10 +382,10 @@ com.android.tools:common:26.2.1
 com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
 com.android.tools:common:27.1.0
-com.android.tools:common:30.0.4
 com.android.tools:common:30.2.1
-com.android.tools:common:30.3.1
-com.android.tools:common:30.4.2
+com.android.tools:common:30.2.2
+com.android.tools:common:30.3.0
+com.android.tools:dvlib:24.1.3
 com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
@@ -433,20 +394,19 @@ com.android.tools:dvlib:26.2.1
 com.android.tools:dvlib:26.3.1
 com.android.tools:dvlib:26.5.4
 com.android.tools:dvlib:27.1.0
-com.android.tools:dvlib:30.0.4
 com.android.tools:dvlib:30.2.1
-com.android.tools:dvlib:30.3.1
-com.android.tools:dvlib:30.4.2
+com.android.tools:dvlib:30.2.2
+com.android.tools:dvlib:30.3.0
 com.android.tools:repository:26.0.0
 com.android.tools:repository:26.0.1
 com.android.tools:repository:26.2.1
 com.android.tools:repository:26.3.1
 com.android.tools:repository:26.5.4
 com.android.tools:repository:27.1.0
-com.android.tools:repository:30.0.4
 com.android.tools:repository:30.2.1
-com.android.tools:repository:30.3.1
-com.android.tools:repository:30.4.2
+com.android.tools:repository:30.2.2
+com.android.tools:repository:30.3.0
+com.android.tools:sdklib:24.1.3
 com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
@@ -455,10 +415,10 @@ com.android.tools:sdklib:26.2.1
 com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
 com.android.tools:sdklib:27.1.0
-com.android.tools:sdklib:30.0.4
 com.android.tools:sdklib:30.2.1
-com.android.tools:sdklib:30.3.1
-com.android.tools:sdklib:30.4.2
+com.android.tools:sdklib:30.2.2
+com.android.tools:sdklib:30.3.0
+com.android.tools:sdk-common:24.1.3
 com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
@@ -467,20 +427,17 @@ com.android.tools:sdk-common:26.2.1
 com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
 com.android.tools:sdk-common:27.1.0
-com.android.tools:sdk-common:30.0.4
 com.android.tools:sdk-common:30.2.1
-com.android.tools:sdk-common:30.3.1
-com.android.tools:sdk-common:30.4.2
+com.android.tools:sdk-common:30.2.2
+com.android.tools:sdk-common:30.3.0
 com.android:signflinger:4.1.0
-com.android:signflinger:7.0.4
 com.android:signflinger:7.2.1
-com.android:signflinger:7.3.1
-com.android:signflinger:7.4.2
+com.android:signflinger:7.2.2
+com.android:signflinger:7.3.0
 com.android:zipflinger:4.1.0
-com.android:zipflinger:7.0.4
 com.android:zipflinger:7.2.1
-com.android:zipflinger:7.3.1
-com.android:zipflinger:7.4.2
+com.android:zipflinger:7.2.2
+com.android:zipflinger:7.3.0
 com.diffplug.durian:durian-collect:1.2.0
 com.diffplug.durian:durian-core:1.2.0
 com.diffplug.durian:durian-io:1.2.0
@@ -489,7 +446,7 @@ com.diffplug.spotless:spotless-lib:2.30.0
 com.diffplug.spotless:spotless-plugin-gradle:6.11.0
 com.drewnoakes:metadata-extractor:2.18.0
 com.facebook.conceal:conceal:1.1.3
-com.facebook.fbjni:fbjni:0.3.0
+com.facebook.fbjni:fbjni-java-only:0.2.2
 com.facebook.fresco:animated-base:2.5.0
 com.facebook.fresco:animated-drawable:2.5.0
 com.facebook.fresco:animated-gif:2.5.0
@@ -509,11 +466,9 @@ com.facebook.fresco:nativeimagetranscoder:2.5.0
 com.facebook.fresco:soloader:2.5.0
 com.facebook.fresco:ui-common:2.5.0
 com.facebook.infer.annotation:infer-annotation:0.18.0
-com.facebook.react:hermes-android:0.72.5
-com.facebook.react:react-android:0.72.5
-com.facebook.soloader:annotation:0.10.5
-com.facebook.soloader:nativeloader:0.10.5
-com.facebook.soloader:soloader:0.10.5
+com.facebook.soloader:annotation:0.10.3
+com.facebook.soloader:nativeloader:0.10.3
+com.facebook.soloader:soloader:0.10.3
 com.facebook.yoga:proguard-annotations:1.19.0
 com.fasterxml.jackson.core:jackson-annotations:2.11.1
 com.fasterxml.jackson.core:jackson-core:2.11.1
@@ -555,7 +510,6 @@ com.google.api.grpc:proto-google-common-protos:1.12.0
 com.google.api.grpc:proto-google-common-protos:2.0.1
 com.google.auto.value:auto-value-annotations:1.6.2
 com.google.auto.value:auto-value-annotations:1.6.3
-com.google.auto.value:auto-value-annotations:1.7.4
 com.google.auto.value:auto-value:1.5.2
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
@@ -574,7 +528,6 @@ com.google.errorprone:error_prone_annotations:2.3.2
 com.google.errorprone:error_prone_annotations:2.3.4
 com.google.errorprone:error_prone_annotations:2.4.0
 com.google.errorprone:error_prone_annotations:2.7.1
-com.google.errorprone:error_prone_annotations:2.9.0
 com.google.firebase:firebase-annotations:16.0.0
 com.google.firebase:firebase-components:16.1.0
 com.google.firebase:firebase-encoders-json:17.1.0
@@ -600,7 +553,6 @@ com.google.mlkit:barcode-scanning:17.0.2
 com.google.mlkit:common:18.0.0
 com.google.mlkit:vision-common:17.0.0
 com.google.mlkit:vision-interfaces:16.0.0
-com.google.prefab:cli:2.0.0
 com.google.protobuf:protobuf-java-util:3.4.0
 com.google.protobuf:protobuf-java-util:3.10.0
 com.google.protobuf:protobuf-java-util:3.17.2
@@ -608,18 +560,13 @@ com.google.protobuf:protobuf-java:3.0.0
 com.google.protobuf:protobuf-java:3.4.0
 com.google.protobuf:protobuf-java:3.10.0
 com.google.protobuf:protobuf-java:3.17.2
-com.google.testing.platform:core-proto:0.0.8-alpha04
 com.google.testing.platform:core-proto:0.0.8-alpha07
-com.google.testing.platform:core-proto:0.0.8-alpha08
 com.google.test.platform:core-proto:0.0.2-dev
-com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
 com.parse.bolts:bolts-tasks:1.4.0
 com.squareup.okhttp3:okhttp-tls:4.9.2
 com.squareup.okhttp3:okhttp-urlconnection:4.9.2
 com.squareup.okhttp3:okhttp:4.9.2
-com.squareup.okio:okio-metadata:2.8.0
-com.squareup.okio:okio:2.8.0
 com.squareup.okio:okio:2.9.0
 com.squareup:javapoet:1.8.0
 com.squareup:javapoet:1.10.0
@@ -687,16 +634,16 @@ junit:junit:4.12
 junit:junit:4.13.2
 me.zhanghai.android.materialprogressbar:library:1.4.2
 net.bytebuddy:byte-buddy-agent:1.11.13
-net.bytebuddy:byte-buddy-agent:1.11.19
 net.bytebuddy:byte-buddy:1.11.13
-net.bytebuddy:byte-buddy:1.11.19
 net.java.dev.jna:jna-platform:5.6.0
 net.java.dev.jna:jna:5.6.0
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
+net.sf.proguard:proguard-base:5.1
 net.sf.proguard:proguard-base:5.2.1
 net.sf.proguard:proguard-base:5.3.3
 net.sf.proguard:proguard-base:6.0.3
+net.sf.proguard:proguard-gradle:5.1
 net.sf.proguard:proguard-gradle:5.2.1
 net.sf.proguard:proguard-gradle:5.3.3
 net.sf.proguard:proguard-gradle:6.0.3
@@ -733,7 +680,6 @@ org.bouncycastle:bcprov-jdk15on:1.48
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
 org.bouncycastle:bcprov-jdk15on:1.67
-org.bouncycastle:bcprov-jdk15on:1.68
 org.checkerframework:checker-qual:2.5.2
 org.checkerframework:checker-qual:2.8.1
 org.checkerframework:checker-qual:2.11.1
@@ -747,10 +693,10 @@ org.codehaus.mojo:animal-sniffer-annotations:1.18
 org.codehaus.mojo:animal-sniffer-annotations:1.19
 org.codehaus.woodstox:stax2-api:4.2.1
 org.conscrypt:conscrypt-android:2.0.0
+org.eclipse.jdt.core.compiler:ecj:4.4
 org.eclipse.jdt.core.compiler:ecj:4.4.2
 org.eclipse.jdt.core.compiler:ecj:4.6.1
 org.eclipse.jgit:org.eclipse.jgit:5.13.1.202206130422-r
-org.fusesource.jansi:jansi:1.18
 org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.3.1
@@ -759,13 +705,12 @@ org.glassfish.jaxb:txw2:2.2.11
 org.glassfish.jaxb:txw2:2.3.1
 org.glassfish.jaxb:txw2:2.3.2
 org.hamcrest:hamcrest-core:1.3
-org.hamcrest:hamcrest:2.2
-org.jacoco:org.jacoco.agent:0.8.8
-org.jacoco:org.jacoco.ant:0.8.8
+org.jacoco:org.jacoco.agent:0.8.7
+org.jacoco:org.jacoco.ant:0.8.7
 org.jacoco:org.jacoco.core:0.7.4.201502262128
-org.jacoco:org.jacoco.core:0.8.8
+org.jacoco:org.jacoco.core:0.8.7
 org.jacoco:org.jacoco.report:0.7.4.201502262128
-org.jacoco:org.jacoco.report:0.8.8
+org.jacoco:org.jacoco.report:0.8.7
 org.jdom:jdom2:2.0.6
 org.jetbrains.dokka:dokka-core:1.4.32
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
@@ -777,92 +722,68 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20
 org.jetbrains.kotlin:kotlin-android-extensions:1.6.20
-org.jetbrains.kotlin:kotlin-android-extensions:1.7.22
 org.jetbrains.kotlin:kotlin-annotations-jvm:1.3.72
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.20
-org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.22
 org.jetbrains.kotlin:kotlin-build-common:1.6.20
-org.jetbrains.kotlin:kotlin-build-common:1.7.22
 org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-compiler-runner:1.6.20
-org.jetbrains.kotlin:kotlin-compiler-runner:1.7.22
 org.jetbrains.kotlin:kotlin-daemon-client:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-client:1.7.22
 org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.22
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.7.22
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.22
 org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.20
-org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22
 org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.20
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.22
-org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.7.22
+org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.6.20
 org.jetbrains.kotlin:kotlin-native-utils:1.6.20
-org.jetbrains.kotlin:kotlin-native-utils:1.7.22
 org.jetbrains.kotlin:kotlin-project-model:1.6.20
-org.jetbrains.kotlin:kotlin-project-model:1.7.22
 org.jetbrains.kotlin:kotlin-reflect:1.1.3-2
 org.jetbrains.kotlin:kotlin-reflect:1.2.0
 org.jetbrains.kotlin:kotlin-reflect:1.3.20
 org.jetbrains.kotlin:kotlin-reflect:1.3.50
 org.jetbrains.kotlin:kotlin-reflect:1.3.72
-org.jetbrains.kotlin:kotlin-reflect:1.4.32
 org.jetbrains.kotlin:kotlin-reflect:1.5.31
-org.jetbrains.kotlin:kotlin-reflect:1.7.10
-org.jetbrains.kotlin:kotlin-reflect:1.7.22
+org.jetbrains.kotlin:kotlin-reflect:1.6.20
 org.jetbrains.kotlin:kotlin-scripting-common:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-common:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.22
 org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.20
-org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.22
-org.jetbrains.kotlin:kotlin-script-runtime:1.7.22
+org.jetbrains.kotlin:kotlin-script-runtime:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-common:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.10
 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.3.72
-org.jetbrains.kotlin:kotlin-stdlib:1.4.32
 org.jetbrains.kotlin:kotlin-stdlib:1.5.31
+org.jetbrains.kotlin:kotlin-stdlib:1.6.10
 org.jetbrains.kotlin:kotlin-stdlib:1.6.20
-org.jetbrains.kotlin:kotlin-stdlib:1.7.22
-org.jetbrains.kotlin:kotlin-tooling-core:1.7.22
+org.jetbrains.kotlin:kotlin-stdlib:1.6.21
 org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.20
 org.jetbrains.kotlin:kotlin-util-io:1.6.20
-org.jetbrains.kotlin:kotlin-util-io:1.7.22
 org.jetbrains.kotlin:kotlin-util-klib:1.6.20
-org.jetbrains.kotlin:kotlin-util-klib:1.7.22
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
 org.jetbrains:markdown-jvm:0.2.1
@@ -873,61 +794,37 @@ org.jvnet.staxex:stax-ex:1.7.7
 org.jvnet.staxex:stax-ex:1.8
 org.jvnet.staxex:stax-ex:1.8.1
 org.mockito:mockito-core:3.12.4
-org.mockito:mockito-core:4.0.0
-org.mockito:mockito-inline:4.0.0
 org.objenesis:objenesis:3.2
 org.ow2.asm:asm-analysis:5.0.3
 org.ow2.asm:asm-analysis:5.1
 org.ow2.asm:asm-analysis:6.0
 org.ow2.asm:asm-analysis:7.0
 org.ow2.asm:asm-analysis:9.1
-org.ow2.asm:asm-analysis:9.2
 org.ow2.asm:asm-commons:5.1
 org.ow2.asm:asm-commons:6.0
 org.ow2.asm:asm-commons:7.0
 org.ow2.asm:asm-commons:9.1
-org.ow2.asm:asm-commons:9.2
 org.ow2.asm:asm-debug-all:5.0.1
 org.ow2.asm:asm-tree:5.0.3
 org.ow2.asm:asm-tree:5.1
 org.ow2.asm:asm-tree:6.0
 org.ow2.asm:asm-tree:7.0
 org.ow2.asm:asm-tree:9.1
-org.ow2.asm:asm-tree:9.2
 org.ow2.asm:asm-util:5.1
 org.ow2.asm:asm-util:6.0
 org.ow2.asm:asm-util:7.0
 org.ow2.asm:asm-util:9.1
-org.ow2.asm:asm-util:9.2
 org.ow2.asm:asm:5.0.3
 org.ow2.asm:asm:5.1
 org.ow2.asm:asm:6.0
 org.ow2.asm:asm:7.0
 org.ow2.asm:asm:9.1
-org.ow2.asm:asm:9.2
-org.robolectric:annotations:4.7.3
-org.robolectric:junit:4.7.3
-org.robolectric:nativeruntime:4.7.3
-org.robolectric:pluginapi:4.7.3
-org.robolectric:plugins-maven-dependency-resolver:4.7.3
-org.robolectric:resources:4.7.3
-org.robolectric:robolectric:4.7.3
-org.robolectric:sandbox:4.7.3
-org.robolectric:shadowapi:4.7.3
-org.robolectric:shadows-framework:4.7.3
-org.robolectric:utils-reflector:4.7.3
-org.robolectric:utils:4.7.3
 org.slf4j:slf4j-api:1.7.30
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1
 org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2
 xerces:xercesImpl:2.12.0
 xml-apis:xml-apis:1.4.01
-com.android.tools.build:gradle:1.3.1
-com.squareup.okio:okio:1.13.0
-com.squareup.okio:okio:1.15.0
-com.squareup.okhttp3:okhttp:3.12.1
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-com.android.tools.lint:lint-gradle:30.4.2
-com.android.tools.build:gradle:7.4.2
-com.android.tools.build:aapt2:7.4.2-8841542
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
+org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
+com.android.tools.lint:lint-gradle:30.2.2
+com.android.tools.build:gradle:7.0.4

nix/deps/gradle/deps.urls

@@ -1,6 +1,4 @@
-https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0-rc01/activity-1.0.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.1.0/activity-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.2.4/activity-1.2.4.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.0.0/annotation-experimental-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.1.0/annotation-experimental-1.1.0.pom
@@ -11,28 +9,22 @@ https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0-rc0
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.3.0/annotation-1.3.0.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0-rc01/appcompat-resources-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.3.1/appcompat-resources-1.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.4.1/appcompat-resources-1.4.1.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.4.2/appcompat-resources-1.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0-rc01/appcompat-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.3.1/appcompat-1.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.4.1/appcompat-1.4.1.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.4.2/appcompat-1.4.2.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.1/core-common-2.0.1.pom
-https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0-rc01/core-common-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/core-runtime-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/autofill/autofill/1.1.0/autofill-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/biometric/biometric/1.1.0/biometric-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/camera/camera-camera2/1.1.0/camera-camera2-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/camera/camera-core/1.1.0/camera-core-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/camera/camera-lifecycle/1.1.0/camera-lifecycle-1.1.0.pom
@@ -41,7 +33,6 @@ https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardvie
 https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.1.0/collection-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/concurrent/concurrent-futures/1.0.0/concurrent-futures-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/concurrent/concurrent-futures/1.1.0/concurrent-futures-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout-solver/2.0.4/constraintlayout-solver-2.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout/2.0.4/constraintlayout-2.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.0.0/coordinatorlayout-1.0.0.pom
@@ -67,16 +58,16 @@ https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/4.1.0/databinding-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.0.4/databinding-common-7.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.2.1/databinding-common-7.2.1.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.1/databinding-common-7.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.4.2/databinding-common-7.4.2.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.2.2/databinding-common-7.2.2.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/7.3.0/databinding-common-7.3.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.2.1/databinding-compiler-common-3.2.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.3.1/databinding-compiler-common-3.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/3.5.4/databinding-compiler-common-3.5.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/4.1.0/databinding-compiler-common-4.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.0.4/databinding-compiler-common-7.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.2.1/databinding-compiler-common-7.2.1.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.3.1/databinding-compiler-common-7.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.4.2/databinding-compiler-common-7.4.2.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.2.2/databinding-compiler-common-7.2.2.pom
+https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-compiler-common/7.3.0/databinding-compiler-common-7.3.0.pom
 https://dl.google.com/dl/android/maven2/androidx/documentfile/documentfile/1.0.0/documentfile-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/drawerlayout/drawerlayout/1.0.0/drawerlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/emoji2/emoji2-views-helper/1.0.0/emoji2-views-helper-1.0.0.pom
@@ -87,40 +78,29 @@ https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.3.2/exifinterface-1.3.2.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fragment-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0-rc01/fragment-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.2.5/fragment-1.2.5.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.3.6/fragment-1.3.6.pom
 https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1.0.0/legacy-support-core-ui-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-v4/1.0.0/legacy-support-v4-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.0.0/lifecycle-common-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0-rc01/lifecycle-common-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.2.0/lifecycle-common-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.3.1/lifecycle-common-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.4.0/lifecycle-common-2.4.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.0.0/lifecycle-livedata-core-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.1.0/lifecycle-livedata-core-2.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.2.0/lifecycle-livedata-core-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.3.1/lifecycle-livedata-core-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.0.0/lifecycle-livedata-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.1.0/lifecycle-livedata-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-process/2.4.0/lifecycle-process-2.4.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.0.0/lifecycle-runtime-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0-rc01/lifecycle-runtime-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.2.0/lifecycle-runtime-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.3.1/lifecycle-runtime-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.4.0/lifecycle-runtime-2.4.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/1.0.0/lifecycle-viewmodel-savedstate-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.2.0/lifecycle-viewmodel-savedstate-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.3.1/lifecycle-viewmodel-savedstate-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.0.0/lifecycle-viewmodel-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0-rc01/lifecycle-viewmodel-2.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.2.0/lifecycle-viewmodel-2.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.3.1/lifecycle-viewmodel-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/localbroadcastmanager/localbroadcastmanager/1.0.0/localbroadcastmanager-1.0.0.pom
@@ -130,7 +110,6 @@ https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0.p
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.0.0/recyclerview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/resourceinspection/resourceinspection-annotation/1.0.0/resourceinspection-annotation-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0-rc01/savedstate-1.0.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.1.0/savedstate-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/slidingpanelayout/slidingpanelayout/1.0.0/slidingpanelayout-1.0.0.pom
@@ -138,24 +117,13 @@ https://dl.google.com/dl/android/maven2/androidx/startup/startup-runtime/1.0.0/s
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.0.0/swiperefreshlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.1.0-alpha02/swiperefreshlayout-1.1.0-alpha02.pom
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.1.0/swiperefreshlayout-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/test/annotation/1.0.0/annotation-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/test/core/1.4.1-alpha05/core-1.4.1-alpha05.pom
-https://dl.google.com/dl/android/maven2/androidx/test/ext/junit/1.1.4-alpha05/junit-1.1.4-alpha05.pom
-https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.4.0/monitor-1.4.0.pom
-https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.6.0-alpha02/monitor-1.6.0-alpha02.pom
-https://dl.google.com/dl/android/maven2/androidx/test/runner/1.5.0-alpha02/runner-1.5.0-alpha02.pom
-https://dl.google.com/dl/android/maven2/androidx/test/services/storage/1.4.2-alpha02/storage-1.4.2-alpha02.pom
 https://dl.google.com/dl/android/maven2/androidx/tracing/tracing/1.0.0/tracing-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/tracing/tracing/1.1.0/tracing-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.0.0/transition-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.1.0/transition-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0-rc01/transition-1.2.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0/transition-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.0.0/vectordrawable-animated-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0-rc01/vectordrawable-animated-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable-animated/1.1.0/vectordrawable-animated-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.0.0/vectordrawable-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0-rc01/vectordrawable-1.1.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.0.0/versionedparcelable-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0-rc01/versionedparcelable-1.1.0-rc01.pom
@@ -175,15 +143,15 @@ https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/4.1.0/baseLibrary-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.0.4/baseLibrary-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.2.1/baseLibrary-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.3.1/baseLibrary-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.4.2/baseLibrary-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.2.2/baseLibrary-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/7.3.0/baseLibrary-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/4.1.0/signflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.0.4/signflinger-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/signflinger/7.2.1/signflinger-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/signflinger/7.3.1/signflinger-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/signflinger/7.4.2/signflinger-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/signflinger/7.2.2/signflinger-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/signflinger/7.3.0/signflinger-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/26.0.2/appcompat-v7-26.0.2.pom
@@ -210,8 +178,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/cras
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/27.1.0/crash-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.0.4/crash-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.2.1/crash-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.3.1/crash-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.4.2/crash-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.2.2/crash-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/30.3.0/crash-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
@@ -220,8 +188,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/prot
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/27.1.0/protos-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.0.4/protos-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.2.1/protos-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.3.1/protos-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.4.2/protos-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.2.2/protos-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/30.3.0/protos-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
@@ -230,8 +198,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shar
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/27.1.0/shared-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.0.4/shared-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.2.1/shared-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.3.1/shared-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.4.2/shared-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.2.2/shared-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/30.3.0/shared-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
@@ -240,8 +208,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/trac
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/27.1.0/tracker-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.0.4/tracker-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.2.1/tracker-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.3.1/tracker-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.4.2/tracker-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.2.2/tracker-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/30.3.0/tracker-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
@@ -250,8 +218,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/ann
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/27.1.0/annotations-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.0.4/annotations-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.2.1/annotations-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.3.1/annotations-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.4.2/annotations-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.2.2/annotations-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/30.3.0/annotations-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.4.0/aapt2-proto-0.4.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.0-6503028/aapt2-proto-4.1.0-6503028.pom
@@ -259,15 +227,13 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/4.1.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.0.0-beta04-7396180/aapt2-proto-7.0.0-beta04-7396180.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.0.4-7396180/aapt2-proto-7.0.4-7396180.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.2.1-7984345/aapt2-proto-7.2.1-7984345.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.0-alpha07-8248216/aapt2-proto-7.3.0-alpha07-8248216.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.1-8691043/aapt2-proto-7.3.1-8691043.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.4.2-8841542/aapt2-proto-7.4.2-8841542.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/7.4.2-8841542/aapt2-7.4.2-8841542.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.2.2-7984345/aapt2-proto-7.2.2-7984345.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/7.3.0-8691043/aapt2-proto-7.3.0-8691043.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/4.1.0/aaptcompiler-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.0.4/aaptcompiler-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.2.1/aaptcompiler-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3.1/aaptcompiler-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.4.2/aaptcompiler-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.2.2/aaptcompiler-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/aaptcompiler/7.3.0/aaptcompiler-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
@@ -276,16 +242,16 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/4.1.0/apksig-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.0.4/apksig-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.1/apksig-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.1/apksig-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.4.2/apksig-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.2.2/apksig-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/7.3.0/apksig-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.3.1/apkzlib-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/apkzlib-3.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/4.1.0/apkzlib-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.0.4/apkzlib-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.2.1/apkzlib-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.1/apkzlib-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.4.2/apkzlib-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.2.2/apkzlib-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/7.3.0/apkzlib-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
@@ -294,8 +260,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/4.1.0/builder-model-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.0.4/builder-model-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.2.1/builder-model-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.3.1/builder-model-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.4.2/builder-model-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.2.2/builder-model-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/7.3.0/builder-model-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1.pom
@@ -304,8 +270,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/4.1.0/builder-test-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.0.4/builder-test-api-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.2.1/builder-test-api-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.3.1/builder-test-api-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.4.2/builder-test-api-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.2.2/builder-test-api-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/7.3.0/builder-test-api-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
@@ -314,8 +280,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/bu
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/4.1.0/builder-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.0.4/builder-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.1/builder-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.3.1/builder-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.4.2/builder-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.2.2/builder-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/7.3.0/builder-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.9.0/bundletool-0.9.0.pom
@@ -323,7 +289,6 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.6.0/bundletool-1.6.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.8.2/bundletool-1.8.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.9.0/bundletool-1.9.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/1.11.4/bundletool-1.11.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
@@ -332,11 +297,10 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/4.1.0/gradle-api-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.0.4/gradle-api-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.2.1/gradle-api-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.3.1/gradle-api-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.4.2/gradle-api-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.2.2/gradle-api-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/7.3.0/gradle-api-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-settings-api/7.4.2/gradle-settings-api-7.4.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.0/gradle-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
@@ -345,8 +309,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gra
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/4.1.0/gradle-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.0.4/gradle-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.1/gradle-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.3.1/gradle-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.4.2/gradle-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.2.2/gradle-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/7.3.0/gradle-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-alpha10/jetifier-core-1.0.0-alpha10.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta02/jetifier-core-1.0.0-beta02.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-core/1.0.0-beta04/jetifier-core-1.0.0-beta04.pom
@@ -365,8 +329,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/27.1.0/manifest-merger-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.0.4/manifest-merger-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.2.1/manifest-merger-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.3.1/manifest-merger-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.4.2/manifest-merger-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.2.2/manifest-merger-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/30.3.0/manifest-merger-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
@@ -375,8 +339,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-2
 https://dl.google.com/dl/android/maven2/com/android/tools/common/27.1.0/common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.0.4/common-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/30.2.1/common-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.1/common-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/common/30.4.2/common-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/30.2.2/common-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/common/30.3.0/common-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
@@ -385,8 +349,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddm
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/27.1.0/ddmlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.0.4/ddmlib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.2.1/ddmlib-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.1/ddmlib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.4.2/ddmlib-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.2.2/ddmlib-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/30.3.0/ddmlib-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
@@ -395,15 +359,15 @@ https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/27.1.0/dvlib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.0.4/dvlib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.1/dvlib-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.3.1/dvlib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.4.2/dvlib-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.2.2/dvlib-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/30.3.0/dvlib-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/30.4.2/intellij-core-30.4.2.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/30.4.2/kotlin-compiler-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/30.2.2/intellij-core-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/30.2.2/kotlin-compiler-30.2.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/30.4.2/uast-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/30.2.2/uast-30.2.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
@@ -412,31 +376,30 @@ https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-ap
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/27.1.0/layoutlib-api-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.0.4/layoutlib-api-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.2.1/layoutlib-api-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.3.1/layoutlib-api-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.4.2/layoutlib-api-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.2.2/layoutlib-api-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/30.3.0/layoutlib-api-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/30.4.2/lint-api-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/30.2.2/lint-api-30.2.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/30.4.2/lint-checks-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/30.2.2/lint-checks-30.2.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.5.4/lint-gradle-api-26.5.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/27.1.0/lint-gradle-api-27.1.0.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/30.4.2/lint-gradle-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/30.2.2/lint-gradle-30.2.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/27.1.0/lint-model-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.0.4/lint-model-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.2.1/lint-model-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.3.1/lint-model-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.4.2/lint-model-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.2.2/lint-model-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-model/30.3.0/lint-model-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.1/lint-typedef-remover-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.3.1/lint-typedef-remover-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.4.2/lint-typedef-remover-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.2.2/lint-typedef-remover-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-typedef-remover/30.3.0/lint-typedef-remover-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.0/lint-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/30.4.2/lint-30.4.2.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/play-sdk-proto/30.4.2/play-sdk-proto-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/30.2.2/lint-30.2.2.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
@@ -445,8 +408,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repo
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/27.1.0/repository-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.0.4/repository-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.2.1/repository-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.1/repository-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.4.2/repository-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.2.2/repository-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/30.3.0/repository-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
@@ -455,8 +418,8 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-2
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/27.1.0/sdklib-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.0.4/sdklib-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.2.1/sdklib-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.1/sdklib-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.4.2/sdklib-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.2.2/sdklib-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/30.3.0/sdklib-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
@@ -465,34 +428,34 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/27.1.0/sdk-common-27.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.0.4/sdk-common-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.2.1/sdk-common-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.3.1/sdk-common-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.4.2/sdk-common-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.2.2/sdk-common-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/30.3.0/sdk-common-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.2.1/android-device-provider-ddmlib-proto-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.3.1/android-device-provider-ddmlib-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.4.2/android-device-provider-ddmlib-proto-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.2.2/android-device-provider-ddmlib-proto-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-ddmlib-proto/30.3.0/android-device-provider-ddmlib-proto-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.0.4/android-device-provider-gradle-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.2.1/android-device-provider-gradle-proto-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.3.1/android-device-provider-gradle-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.4.2/android-device-provider-gradle-proto-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.2.2/android-device-provider-gradle-proto-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-device-provider-gradle-proto/30.3.0/android-device-provider-gradle-proto-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.2.1/android-test-plugin-host-additional-test-output-proto-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.3.1/android-test-plugin-host-additional-test-output-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.4.2/android-test-plugin-host-additional-test-output-proto-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.2.2/android-test-plugin-host-additional-test-output-proto-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-additional-test-output-proto/30.3.0/android-test-plugin-host-additional-test-output-proto-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.2.1/android-test-plugin-host-coverage-proto-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.3.1/android-test-plugin-host-coverage-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.4.2/android-test-plugin-host-coverage-proto-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.2.2/android-test-plugin-host-coverage-proto-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-coverage-proto/30.3.0/android-test-plugin-host-coverage-proto-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.0.4/android-test-plugin-host-retention-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.2.1/android-test-plugin-host-retention-proto-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.3.1/android-test-plugin-host-retention-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.4.2/android-test-plugin-host-retention-proto-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.2.2/android-test-plugin-host-retention-proto-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-host-retention-proto/30.3.0/android-test-plugin-host-retention-proto-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.0.4/android-test-plugin-result-listener-gradle-proto-30.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.2.1/android-test-plugin-result-listener-gradle-proto-30.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.3.1/android-test-plugin-result-listener-gradle-proto-30.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.4.2/android-test-plugin-result-listener-gradle-proto-30.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.2.2/android-test-plugin-result-listener-gradle-proto-30.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/utp/android-test-plugin-result-listener-gradle-proto/30.3.0/android-test-plugin-result-listener-gradle-proto-30.3.0.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/4.1.0/zipflinger-4.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.0.4/zipflinger-7.0.4.pom
 https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.1/zipflinger-7.2.1.pom
-https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.1/zipflinger-7.3.1.pom
-https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.4.2/zipflinger-7.4.2.pom
+https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.2.2/zipflinger-7.2.2.pom
+https://dl.google.com/dl/android/maven2/com/android/zipflinger/7.3.0/zipflinger-7.3.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.pom
 https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/2.3.3/transport-backend-cct-2.3.3.pom
 https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.5/transport-runtime-2.2.5.pom
@@ -513,10 +476,8 @@ https://dl.google.com/dl/android/maven2/com/google/mlkit/barcode-scanning/17.0.2
 https://dl.google.com/dl/android/maven2/com/google/mlkit/common/18.0.0/common-18.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-common/17.0.0/vision-common-17.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/mlkit/vision-interfaces/16.0.0/vision-interfaces-16.0.0.pom
-https://dl.google.com/dl/android/maven2/com/google/prefab/cli/2.0.0/cli-2.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha04/core-proto-0.0.8-alpha04.pom
 https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha07/core-proto-0.0.8-alpha07.pom
-https://dl.google.com/dl/android/maven2/com/google/testing/platform/core-proto/0.0.8-alpha08/core-proto-0.0.8-alpha08.pom
 https://dl.google.com/dl/android/maven2/com/google/test/platform/core-proto/0.0.2-dev/core-proto-0.0.2-dev.pom
 https://jitpack.io/com/github/Dimezis/BlurView/version-2.0.3/BlurView-version-2.0.3.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
@@ -525,7 +486,7 @@ https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.1.1/lib-3.1.1.
 https://jitpack.io/com/github/wix-playground/ahbottomnavigation/3.3.0/ahbottomnavigation-3.3.0.pom
 https://jitpack.io/com/github/wix-playground/reflow-animator/1.0.6/reflow-animator-1.0.6.pom
 https://jitpack.io/com/github/yalantis/ucrop/2.2.6-native/ucrop-2.2.6-native.pom
-https://plugins.gradle.org/m2/com/adarshr/gradle-test-logger-plugin/2.0.0/gradle-test-logger-plugin-2.0.0.pom
+https://plugins.gradle.org/m2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.6.10/org.jetbrains.kotlin.jvm.gradle.plugin-1.6.10.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.1/antlr-2.7.1.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.4/commons-codec-1.4.pom
@@ -537,49 +498,63 @@ https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.16.0/commons-
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
-https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.0/commons-logging-1.3.0.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/airbnb/android/lottie/3.4.4/lottie-3.4.4.pom
-https://repo.maven.apache.org/maven2/com/almworks/sqlite4java/sqlite4java/1.0.392/sqlite4java-1.0.392.pom
 https://repo.maven.apache.org/maven2/com/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5.pom
 https://repo.maven.apache.org/maven2/com/android/databinding/compilerCommon/1.0-rc5/compilerCommon-1.0-rc5.pom
+https://repo.maven.apache.org/maven2/com/android/tools/annotations/24.1.3/annotations-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/annotations/24.3.1/annotations-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/annotations/24.5.0/annotations-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/build/builder-model/1.1.3/builder-model-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/builder-model/1.3.1/builder-model-1.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/builder-model/1.5.0/builder-model-1.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/build/builder-test-api/1.1.3/builder-test-api-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/builder-test-api/1.3.1/builder-test-api-1.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/builder-test-api/1.5.0/builder-test-api-1.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/build/builder/1.1.3/builder-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/builder/1.3.1/builder-1.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/builder/1.5.0/builder-1.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/build/gradle-core/1.1.3/gradle-core-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/gradle-core/1.3.1/gradle-core-1.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/gradle-core/1.5.0/gradle-core-1.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/build/gradle/1.1.3/gradle-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/gradle/1.3.1/gradle-1.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/gradle/1.5.0/gradle-1.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/build/manifest-merger/24.1.3/manifest-merger-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/manifest-merger/24.3.1/manifest-merger-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/manifest-merger/24.5.0/manifest-merger-24.5.0.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/transform-api/1.5.0/transform-api-1.5.0.pom
 https://repo.maven.apache.org/maven2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api.pom
+https://repo.maven.apache.org/maven2/com/android/tools/common/24.1.3/common-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/common/24.3.1/common-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/common/24.5.0/common-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/ddms/ddmlib/24.1.3/ddmlib-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/ddms/ddmlib/24.3.1/ddmlib-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/ddms/ddmlib/24.5.0/ddmlib-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/dvlib/24.1.3/dvlib-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/dvlib/24.3.1/dvlib-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/dvlib/24.5.0/dvlib-24.5.0.pom
 https://repo.maven.apache.org/maven2/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.pom
 https://repo.maven.apache.org/maven2/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/layoutlib/layoutlib-api/24.1.3/layoutlib-api-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/layoutlib/layoutlib-api/24.3.1/layoutlib-api-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/layoutlib/layoutlib-api/24.5.0/layoutlib-api-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/lint/lint-api/24.1.3/lint-api-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/lint/lint-api/24.3.1/lint-api-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/lint/lint-api/24.5.0/lint-api-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/lint/lint-checks/24.1.3/lint-checks-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/lint/lint-checks/24.3.1/lint-checks-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/lint/lint-checks/24.5.0/lint-checks-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/lint/lint/24.1.3/lint-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/lint/lint/24.3.1/lint-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/lint/lint/24.5.0/lint-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/sdklib/24.1.3/sdklib-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/sdklib/24.3.1/sdklib-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/sdklib/24.5.0/sdklib-24.5.0.pom
+https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.1.3/sdk-common-24.1.3.pom
 https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.3.1/sdk-common-24.3.1.pom
 https://repo.maven.apache.org/maven2/com/android/tools/sdk-common/24.5.0/sdk-common-24.5.0.pom
 https://repo.maven.apache.org/maven2/com/diffplug/durian/durian-collect/1.2.0/durian-collect-1.2.0.pom
@@ -590,7 +565,7 @@ https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-lib/2.30.0/s
 https://repo.maven.apache.org/maven2/com/diffplug/spotless/spotless-plugin-gradle/6.11.0/spotless-plugin-gradle-6.11.0.pom
 https://repo.maven.apache.org/maven2/com/drewnoakes/metadata-extractor/2.18.0/metadata-extractor-2.18.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/conceal/conceal/1.1.3/conceal-1.1.3.pom
-https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni/0.3.0/fbjni-0.3.0.pom
+https://repo.maven.apache.org/maven2/com/facebook/fbjni/fbjni-java-only/0.2.2/fbjni-java-only-0.2.2.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-base/2.5.0/animated-base-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-drawable/2.5.0/animated-drawable-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/animated-gif/2.5.0/animated-gif-2.5.0.pom
@@ -610,36 +585,33 @@ https://repo.maven.apache.org/maven2/com/facebook/fresco/nativeimagetranscoder/2
 https://repo.maven.apache.org/maven2/com/facebook/fresco/soloader/2.5.0/soloader-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/fresco/ui-common/2.5.0/ui-common-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/facebook/infer/annotation/infer-annotation/0.18.0/infer-annotation-0.18.0.pom
-https://repo.maven.apache.org/maven2/com/facebook/react/hermes-android/0.72.5/hermes-android-0.72.5.pom
-https://repo.maven.apache.org/maven2/com/facebook/react/react-android/0.72.5/react-android-0.72.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.10.1/annotation-0.10.1.pom
-https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.10.5/annotation-0.10.5.pom
+https://repo.maven.apache.org/maven2/com/facebook/soloader/annotation/0.10.3/annotation-0.10.3.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.10.1/nativeloader-0.10.1.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.10.3/nativeloader-0.10.3.pom
-https://repo.maven.apache.org/maven2/com/facebook/soloader/nativeloader/0.10.5/nativeloader-0.10.5.pom
 https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.1/soloader-0.10.1.pom
-https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.5/soloader-0.10.5.pom
+https://repo.maven.apache.org/maven2/com/facebook/soloader/soloader/0.10.3/soloader-0.10.3.pom
 https://repo.maven.apache.org/maven2/com/facebook/yoga/proguard-annotations/1.19.0/proguard-annotations-1.19.0.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.11.1/jackson-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.1/jackson-annotations-2.16.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.16.0-rc1/jackson-annotations-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.11.1/jackson-core-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.1/jackson-core-2.16.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-core/2.16.0-rc1/jackson-core-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.11.1/jackson-databind-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.1/jackson-databind-2.16.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.16.0-rc1/jackson-databind-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/dataformat/jackson-dataformat-xml/2.11.1/jackson-dataformat-xml-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.11.1/jackson-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.16.1/jackson-base-2.16.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-base/2.16.0-rc1/jackson-base-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.11.1/jackson-bom-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.16.1/jackson-bom-2.16.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-bom/2.16.0-rc1/jackson-bom-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.11/jackson-parent-2.11.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.16/jackson-parent-2.16.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/jackson-parent/2.16-rc1/jackson-parent-2.16-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.11.1/jackson-modules-base-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.16.1/jackson-modules-base-2.16.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-modules-base/2.16.0-rc1/jackson-modules-base-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.11.1/jackson-module-jaxb-annotations-2.11.1.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.16.1/jackson-module-jaxb-annotations-2.16.1.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-jaxb-annotations/2.16.0-rc1/jackson-module-jaxb-annotations-2.16.0-rc1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/jackson/module/jackson-module-kotlin/2.11.1/jackson-module-kotlin-2.11.1.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/38/oss-parent-38.pom
-https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/56/oss-parent-56.pom
+https://repo.maven.apache.org/maven2/com/fasterxml/oss-parent/55/oss-parent-55.pom
 https://repo.maven.apache.org/maven2/com/fasterxml/woodstox/woodstox-core/6.2.1/woodstox-core-6.2.1.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/annotations/4.12.0/annotations-4.12.0.pom
 https://repo.maven.apache.org/maven2/com/github/bumptech/glide/compiler/4.12.0/compiler-4.12.0.pom
@@ -662,15 +634,12 @@ https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/6/auto-parent-6
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/7/auto-parent-7.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.3/auto-value-annotations-1.6.3.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.7.4/auto-value-annotations-1.7.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.10.4/auto-value-annotations-1.10.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.3/auto-value-parent-1.6.3.pom
-https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.7.4/auto-value-parent-1.7.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.10.4/auto-value-parent-1.10.4.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
-https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.1/jsr305-3.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson-parent/2.7/gson-parent-2.7.pom
@@ -696,8 +665,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotatio
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.4.0/error_prone_annotations-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.7.1/error_prone_annotations-2.7.1.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.9.0/error_prone_annotations-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.24.0/error_prone_annotations-2.24.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.0.18/error_prone_parent-2.0.18.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.2.0/error_prone_parent-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
@@ -705,12 +673,10 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.4/error_prone_parent-2.3.4.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.4.0/error_prone_parent-2.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.7.1/error_prone_parent-2.7.1.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.9.0/error_prone_parent-2.9.0.pom
-https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.24.0/error_prone_parent-2.24.0.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.23.0/error_prone_parent-2.23.0.pom
 https://repo.maven.apache.org/maven2/com/google/flatbuffers/flatbuffers-java/1.12.0/flatbuffers-java-1.12.0.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
-https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-parent-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/22.0/guava-parent-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/23.0/guava-parent-23.0.pom
@@ -722,8 +688,8 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/29.0-jre/guav
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-android/guava-parent-30.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/30.1-jre/guava-parent-30.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/31.0.1-jre/guava-parent-31.0.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/33.0.0-jre/guava-parent-33.0.0-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/33.0.0-jre/guava-testlib-33.0.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/32.1.3-jre/guava-parent-32.1.3-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava-testlib/32.1.3-jre/guava-testlib-32.1.3-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/17.0/guava-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/22.0/guava-22.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/23.0/guava-23.0.pom
@@ -735,7 +701,7 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/29.0-jre/guava-29.0-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-android/guava-30.1-android.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/30.1-jre/guava-30.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.0.1-jre/guava-31.0.1-jre.pom
-https://repo.maven.apache.org/maven2/com/google/guava/guava/33.0.0-jre/guava-33.0.0-jre.pom
+https://repo.maven.apache.org/maven2/com/google/guava/guava/32.1.3-jre/guava-32.1.3-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/1.0/listenablefuture-1.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
@@ -769,9 +735,8 @@ https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.10.0/
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.13.0/protobuf-parent-3.13.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/3.17.2/protobuf-parent-3.17.2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-parent/4.0.0-rc-2/protobuf-parent-4.0.0-rc-2.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.2.0/truth-parent-1.2.0.pom
-https://repo.maven.apache.org/maven2/com/google/truth/truth/1.2.0/truth-1.2.0.pom
-https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.1.5/truth-parent-1.1.5.pom
+https://repo.maven.apache.org/maven2/com/google/truth/truth/1.1.5/truth-1.1.5.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-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
@@ -785,17 +750,12 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/4.9.2/okhttp-4.9.2.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/okio/okio-jvm/3.7.0/okio-jvm-3.7.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-metadata/2.8.0/okio-metadata-2.8.0.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.13.0/okio-parent-1.13.0.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-jvm/3.6.0/okio-jvm-3.6.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.17.4/okio-parent-1.17.4.pom
-https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.13.0/okio-1.13.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/1.17.4/okio-1.17.4.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/2.8.0/okio-2.8.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.7.0/okio-3.7.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.6.0/okio-3.6.0.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/1.2.1/all-1.2.1.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.2/all-1.2.2.pom
@@ -912,14 +872,11 @@ https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
 https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.13/byte-buddy-agent-1.11.13.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.11.19/byte-buddy-agent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.8/byte-buddy-agent-1.14.8.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.13/byte-buddy-parent-1.11.13.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.11.19/byte-buddy-parent-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.10/byte-buddy-parent-1.14.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.14.8/byte-buddy-parent-1.14.8.pom
 https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.13/byte-buddy-1.11.13.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.11.19/byte-buddy-1.11.19.pom
-https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.14.8/byte-buddy-1.14.8.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna-platform/5.6.0/jna-platform-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/dev/jna/jna/5.6.0/jna-5.6.0.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
@@ -928,13 +885,16 @@ https://repo.maven.apache.org/maven2/net/java/jvnet-parent/4/jvnet-parent-4.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/5/jvnet-parent-5.pom
 https://repo.maven.apache.org/maven2/net/sf/jopt-simple/jopt-simple/4.9/jopt-simple-4.9.pom
 https://repo.maven.apache.org/maven2/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.pom
+https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-base/5.3.3/proguard-base-5.3.3.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-base/6.0.3/proguard-base-6.0.3.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-base/6.3.0beta1/proguard-base-6.3.0beta1.pom
+https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-gradle/5.3.3/proguard-gradle-5.3.3.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-gradle/6.0.3/proguard-gradle-6.0.3.pom
+https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-parent/5.1/proguard-parent-5.1.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-parent/5.2.1/proguard-parent-5.2.1.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-parent/5.3.3/proguard-parent-5.3.3.pom
 https://repo.maven.apache.org/maven2/net/sf/proguard/proguard-parent/6.0.3/proguard-parent-6.0.3.pom
@@ -963,7 +923,6 @@ https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/29/apache-29.pom
-https://repo.maven.apache.org/maven2/org/apache/apache/31/apache-31.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.20/commons-compress-1.20.pom
@@ -981,7 +940,6 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/58/commons-parent-58.pom
-https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/65/commons-parent-65.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -1026,17 +984,17 @@ 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/bouncycastle/bcprov-jdk15on/1.67/bcprov-jdk15on-1.67.pom
-https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.68/bcprov-jdk15on-1.68.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-compat-qual/2.5.6/checker-compat-qual-2.5.6.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-compat-qual/2.5.5/checker-compat-qual-2.5.5.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/2.5.8/checker-qual-2.5.8.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.11.1/checker-qual-2.11.1.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.42.0/checker-qual-3.42.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.39.0/checker-qual-3.39.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-xml/3.0.10/groovy-xml-3.0.10.pom
+https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.9/groovy-3.0.9.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy/3.0.10/groovy-3.0.10.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.17/animal-sniffer-annotations-1.17.pom
@@ -1066,12 +1024,10 @@ https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.6/project-1.0.
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.7.pom
 https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.8/project-1.0.8.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
+https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit-parent/5.13.1.202206130422-r/org.eclipse.jgit-parent-5.13.1.202206130422-r.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jgit/org.eclipse.jgit/5.13.1.202206130422-r/org.eclipse.jgit-5.13.1.202206130422-r.pom
-https://repo.maven.apache.org/maven2/org/fusesource/fusesource-pom/1.11/fusesource-pom-1.11.pom
-https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi-project/1.18/jansi-project-1.18.pom
-https://repo.maven.apache.org/maven2/org/fusesource/jansi/jansi/1.18/jansi-1.18.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.1/jaxb-bom-2.3.1.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.3.2/jaxb-bom-2.3.2.pom
@@ -1089,17 +1045,17 @@ https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-cor
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.8.8/org.jacoco.agent-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.8.7/org.jacoco.agent-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.agent/0.8.11/org.jacoco.agent-0.8.11.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.ant/0.8.8/org.jacoco.ant-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.ant/0.8.7/org.jacoco.ant-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.8/org.jacoco.build-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.7/org.jacoco.build-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.11/org.jacoco.build-0.8.11.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.8/org.jacoco.core-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.7/org.jacoco.core-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.11/org.jacoco.core-0.8.11.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
-https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.8.8/org.jacoco.report-0.8.8.pom
+https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.8.7/org.jacoco.report-0.8.7.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.8.11/org.jacoco.report-0.8.11.pom
 https://repo.maven.apache.org/maven2/org/jdom/jdom2/2.0.6/jdom2-2.0.6.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/annotations/13.0/annotations-13.0.pom
@@ -1115,37 +1071,35 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-co
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.4.1/kotlinx-coroutines-core-1.4.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.5.2/kotlinx-coroutines-core-1.5.2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/jvm/org.jetbrains.kotlin.jvm.gradle.plugin/1.7.22/org.jetbrains.kotlin.jvm.gradle.plugin-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.6.20/kotlin-android-extensions-runtime-1.6.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.6.10/kotlin-android-extensions-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.6.20/kotlin-android-extensions-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.7.22/kotlin-android-extensions-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotations-jvm/1.3.72/kotlin-annotations-jvm-1.3.72.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.6.10/kotlin-annotation-processing-gradle-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.6.20/kotlin-annotation-processing-gradle-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.7.22/kotlin-annotation-processing-gradle-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.6.10/kotlin-build-common-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.6.20/kotlin-build-common-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-build-common/1.7.22/kotlin-build-common-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.10/kotlin-compiler-embeddable-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.6.20/kotlin-compiler-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-embeddable/1.7.22/kotlin-compiler-embeddable-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.6.10/kotlin-compiler-runner-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.6.20/kotlin-compiler-runner-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-compiler-runner/1.7.22/kotlin-compiler-runner-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.6.10/kotlin-daemon-client-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.6.20/kotlin-daemon-client-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-client/1.7.22/kotlin-daemon-client-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.10/kotlin-daemon-embeddable-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.6.20/kotlin-daemon-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-daemon-embeddable/1.7.22/kotlin-daemon-embeddable-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.10/kotlin-gradle-plugin-api-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.6.20/kotlin-gradle-plugin-api-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-api/1.7.22/kotlin-gradle-plugin-api-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea-proto/1.7.22/kotlin-gradle-plugin-idea-proto-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/1.7.22/kotlin-gradle-plugin-idea-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.10/kotlin-gradle-plugin-model-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.6.20/kotlin-gradle-plugin-model-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin-model/1.7.22/kotlin-gradle-plugin-model-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.10/kotlin-gradle-plugin-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.6.20/kotlin-gradle-plugin-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-gradle-plugin/1.7.22/kotlin-gradle-plugin-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.10/kotlin-klib-commonizer-api-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.6.20/kotlin-klib-commonizer-api-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-api/1.7.22/kotlin-klib-commonizer-api-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.7.22/kotlin-klib-commonizer-embeddable-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-klib-commonizer-embeddable/1.6.20/kotlin-klib-commonizer-embeddable-1.6.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.6.10/kotlin-native-utils-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.6.20/kotlin-native-utils-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-native-utils/1.7.22/kotlin-native-utils-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.6.10/kotlin-project-model-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.6.20/kotlin-project-model-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-project-model/1.7.22/kotlin-project-model-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.1.3-2/kotlin-reflect-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.2.0/kotlin-reflect-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.20/kotlin-reflect-1.3.20.pom
@@ -1153,20 +1107,19 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.50/
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.3.72/kotlin-reflect-1.3.72.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.4.32/kotlin-reflect-1.4.32.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.5.31/kotlin-reflect-1.5.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.6.20/kotlin-reflect-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.10/kotlin-reflect-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.7.22/kotlin-reflect-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/2.0.0-Beta2/kotlin-reflect-2.0.0-Beta2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-reflect/1.9.20-RC/kotlin-reflect-1.9.20-RC.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.10/kotlin-scripting-common-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.6.20/kotlin-scripting-common-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-common/1.7.22/kotlin-scripting-common-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.10/kotlin-scripting-compiler-embeddable-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.6.20/kotlin-scripting-compiler-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-embeddable/1.7.22/kotlin-scripting-compiler-embeddable-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.10/kotlin-scripting-compiler-impl-embeddable-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.6.20/kotlin-scripting-compiler-impl-embeddable-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-compiler-impl-embeddable/1.7.22/kotlin-scripting-compiler-impl-embeddable-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.10/kotlin-scripting-jvm-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.6.20/kotlin-scripting-jvm-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-scripting-jvm/1.7.22/kotlin-scripting-jvm-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.6.10/kotlin-script-runtime-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.6.20/kotlin-script-runtime-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-script-runtime/1.7.22/kotlin-script-runtime-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.2.71/kotlin-stdlib-common-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.0/kotlin-stdlib-common-1.3.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.20/kotlin-stdlib-common-1.3.20.pom
@@ -1185,8 +1138,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.6.10/kotlin-stdlib-common-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.20/kotlin-stdlib-common-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.10/kotlin-stdlib-common-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.7.22/kotlin-stdlib-common-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.9.10/kotlin-stdlib-common-1.9.10.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.50/kotlin-stdlib-jdk7-1.3.50.pom
@@ -1196,9 +1148,9 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.0/kotlin-stdlib-jdk7-1.5.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.30/kotlin-stdlib-jdk7-1.5.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.31/kotlin-stdlib-jdk7-1.5.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.20/kotlin-stdlib-jdk7-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.10/kotlin-stdlib-jdk7-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.7.22/kotlin-stdlib-jdk7-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.9.10/kotlin-stdlib-jdk7-1.9.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
@@ -1208,8 +1160,9 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.0/kotlin-stdlib-jdk8-1.5.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.30/kotlin-stdlib-jdk8-1.5.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.5.31/kotlin-stdlib-jdk8-1.5.31.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.10/kotlin-stdlib-jdk8-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.7.22/kotlin-stdlib-jdk8-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.20/kotlin-stdlib-jdk8-1.6.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.9.10/kotlin-stdlib-jdk8-1.9.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2/kotlin-stdlib-1.1.3-2.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.0/kotlin-stdlib-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.2.20/kotlin-stdlib-1.2.20.pom
@@ -1231,16 +1184,14 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.31/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.10/kotlin-stdlib-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.20/kotlin-stdlib-1.6.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.6.21/kotlin-stdlib-1.6.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.10/kotlin-stdlib-1.7.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.7.22/kotlin-stdlib-1.7.22.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.21/kotlin-stdlib-1.9.21.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/2.0.0-Beta2/kotlin-stdlib-2.0.0-Beta2.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-core/1.7.22/kotlin-tooling-core-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.10/kotlin-stdlib-1.9.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.9.20-RC/kotlin-stdlib-1.9.20-RC.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.10/kotlin-tooling-metadata-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-tooling-metadata/1.6.20/kotlin-tooling-metadata-1.6.20.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.6.10/kotlin-util-io-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.6.20/kotlin-util-io-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.7.22/kotlin-util-io-1.7.22.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.6.10/kotlin-util-klib-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.6.20/kotlin-util-klib-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.7.22/kotlin-util-klib-1.7.22.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown-jvm/0.2.1/markdown-jvm-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/markdown/0.2.1/markdown-0.2.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
@@ -1249,15 +1200,13 @@ https://repo.maven.apache.org/maven2/org/json/json/20231013/json-20231013.pom
 https://repo.maven.apache.org/maven2/org/jsoup/jsoup/1.13.1/jsoup-1.13.1.pom
 https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.2/junit-bom-5.9.2.pom
 https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.3/junit-bom-5.9.3.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.1/junit-bom-5.10.1.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.10.0/junit-bom-5.10.0.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8.1/stax-ex-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.8/stax-ex-1.8.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
 https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.12.4/mockito-core-3.12.4.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/4.0.0/mockito-core-4.0.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.8.0/mockito-core-5.8.0.pom
-https://repo.maven.apache.org/maven2/org/mockito/mockito-inline/4.0.0/mockito-inline-4.0.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/5.6.0/mockito-core-5.6.0.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.3/objenesis-parent-3.3.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.pom
@@ -1268,14 +1217,12 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/7.0/asm-analysis-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-bom/9.6/asm-bom-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.6/asm-commons-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/6.0_BETA/asm-debug-all-6.0_BETA.pom
@@ -1290,37 +1237,22 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.6/asm-tree-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0/asm-util-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.0/asm-util-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/8.0.1/asm-util-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/9.1/asm-util-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/9.2/asm-util-9.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.0/asm-6.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/8.0.1/asm-8.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.pom
-https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.6/asm-9.6.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5.1/ow2-1.5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
-https://repo.maven.apache.org/maven2/org/robolectric/annotations/4.7.3/annotations-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/junit/4.7.3/junit-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/nativeruntime/4.7.3/nativeruntime-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/pluginapi/4.7.3/pluginapi-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/plugins-maven-dependency-resolver/4.7.3/plugins-maven-dependency-resolver-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/resources/4.7.3/resources-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/robolectric/4.7.3/robolectric-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/sandbox/4.7.3/sandbox-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/shadowapi/4.7.3/shadowapi-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/shadows-framework/4.7.3/shadows-framework-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.7.3/utils-reflector-4.7.3.pom
-https://repo.maven.apache.org/maven2/org/robolectric/utils/4.7.3/utils-4.7.3.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.pom
@@ -1328,7 +1260,6 @@ https://repo.maven.apache.org/maven2/org/slf4j/slf4j-bom/2.0.9/slf4j-bom-2.0.9.p
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.21/slf4j-parent-1.7.21.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/1.7.30/slf4j-parent-1.7.30.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.9/slf4j-parent-2.0.9.pom
-https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/5/oss-parent-5.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom

nix/deps/gradle/generate.sh

@@ -42,15 +42,10 @@ function gen_deps_list() {
 # https://github.com/status-im/status-mobile/issues/15447
 function add_deps_hack() {
     echo -n \
-'com.android.tools.build:gradle:1.3.1
-com.squareup.okio:okio:1.13.0
-com.squareup.okio:okio:1.15.0
-com.squareup.okhttp3:okhttp:3.12.1
-org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.7.22
-com.android.tools.lint:lint-gradle:30.4.2
-com.android.tools.build:gradle:7.4.2
-com.android.tools.build:aapt2:7.4.2-8841542
-org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' \
+'org.jetbrains.kotlin.jvm:org.jetbrains.kotlin.jvm.gradle.plugin:1.6.10
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2
+com.android.tools.lint:lint-gradle:30.2.2
+com.android.tools.build:gradle:7.0.4' \
         >> "${DEPS_LIST}"
 }
 

nix/deps/gradle/gradle_parser.awk

@@ -25,9 +25,8 @@ function findPackage(line, regex) {
 
     # Lines after configuration name list packages
     for (getline line; line != ""; getline line) {
-
-        # JavaScript Core (JSC) is provided by node_modules
-        if (line ~ "org.webkit:android-jsc") { continue }
+        # React Native is provided by node_modules
+        if (line ~ "com.facebook.react:(react-native|hermes-engine)") { continue }
 
         # Example: +--- org.jetbrains.kotlin:kotlin-stdlib:1.3.50
         if (findPackage(line, "--- ([^ :]+):([^ :]+):([^ :]+)$")) {

nix/deps/gradle/proj.list

@@ -4,8 +4,8 @@ react-native-background-timer
 react-native-blob-util
 react-native-blur
 react-native-camera-kit
-react-native-camera-roll_camera-roll
 react-native-community_audio-toolkit
+react-native-community_cameraroll
 react-native-community_clipboard
 react-native-community_masked-view
 react-native-community_netinfo

nix/deps/nodejs-patched/default.nix

@@ -10,8 +10,10 @@ stdenv.mkDerivation {
     "unpackPhase"
     "patchGradlePhase"
     "patchBuildIdPhase"
-    "patchKeyChainPhase"
-    "patchGlogPhase"
+    "patchHermesPhase"
+    "patchJavaPhase"
+    "patchReactNativePhase"
+    "patchPodPhase"
     "installPhase"
   ];
 
@@ -47,12 +49,24 @@ stdenv.mkDerivation {
       ${patchMavenSources} $modBuildGradle
     done
   '';
-
   # Do not add a BuildId to the generated libraries, for reproducibility
   patchBuildIdPhase = ''
-    substituteInPlace ./node_modules/react-native/ReactAndroid/src/main/jni/CMakeLists.txt --replace \
-      '-Wl,--build-id' \
-      '-Wl,--build-id=none'
+    substituteInPlace ./node_modules/react-native/ReactAndroid/src/main/jni/Application.mk --replace \
+        '-Wl,--build-id' \
+        '-Wl,--build-id=none'
+  '';
+  # Fix bugs in Hermes usage:
+  # https://github.com/facebook/react-native/issues/25601#issuecomment-510856047
+  # - Make PR builds also count as release builds
+  # - Fix issue where hermes command is being called with same input/output file
+  patchHermesPhase = ''
+    substituteInPlace ./node_modules/react-native/react.gradle --replace \
+        'targetName.toLowerCase().contains("release")' \
+        '!targetName.toLowerCase().contains("debug")'
+  '';
+  # Patch Java files in modules which are not yet ported to AndroidX
+  patchJavaPhase = ''
+    ${nodejs}/bin/node ./node_modules/jetifier/bin/jetify
   '';
 
   installPhase = ''
@@ -60,21 +74,28 @@ stdenv.mkDerivation {
     cp -R node_modules $out/
   '';
 
-  # Remove gradle-test-logger-plugin:
-  # https://github.com/oblador/react-native-keychain/issues/595
-  # TODO: remove this patch when we this library fixes above issue
-  patchKeyChainPhase = ''
-    sed -i -e '/classpath/d' \
-      -e '/apply plugin: "com\.adarshr\.test-logger"/d' \
-      ./node_modules/react-native-keychain/android/build.gradle
+#  Fix glog configuration issue in react-native:
+#  https://github.com/facebook/react-native/issues/33966
+#  TODO: remove this patch when we reach react-native 0.71.4
+  patchReactNativePhase = ''
+    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh --replace \
+      'sed -i' \
+      'sed -i.bak -e'
+    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh --replace \
+       'src/glog/logging.h.in' \
+       'src/glog/logging.h.in && rm src/glog/logging.h.in.bak'
+     substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh --replace \
+        'src/config.h.in' \
+        'src/config.h.in && rm src/config.h.in.bak'
   '';
 
-  # Fix pod issue after upgrading to MacOS Sonoma and Xcode 15
-  # https://github.com/status-im/status-mobile/issues/17682
-  patchGlogPhase = ''
-    substituteInPlace ./node_modules/react-native/scripts/ios-configure-glog.sh \
-    --replace 'export CC="' '#export CC="' \
-    --replace 'export CXX="' '#export CXX="'
+#  Fix pod issue in react-native 0.67.5:
+#  https://stackoverflow.com/questions/71248072/no-member-named-cancelbuttontintcolor-in-jsnativeactionsheetmanagerspecsh
+#  TODO: remove this patch when maybe after 0.68.5
+  patchPodPhase = ''
+    substituteInPlace ./node_modules/react-native/React/CoreModules/RCTActionSheetManager.mm --replace \
+          '[RCTConvert UIColor:options.cancelButtonTintColor() ? @(*options.cancelButtonTintColor()) : nil];' \
+          '[RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];'
   '';
 
   # The ELF types are incompatible with the host platform, so let's not even try

nix/mobile/android/release.nix

@@ -35,9 +35,9 @@ let
 
 
   envFileName =
-    if (elem androidAbiInclude ["x86" "x86_64" "x86;x86_64"]) then ".env.e2e"
-    else if (elem buildType ["release" "nightly"])            then ".env.${buildType}"
-    else if (elem buildType ["pr" "manual"])                  then ".env.jenkins"
+    if androidAbiInclude == "x86"                  then ".env.e2e"
+    else if (elem buildType ["release" "nightly"]) then ".env.${buildType}"
+    else if (elem buildType ["pr" "manual"])       then ".env.jenkins"
     else ".env";
 
   # There are only two types of Gradle build targets: pr and release

nix/mobile/ios/default.nix

@@ -21,7 +21,6 @@ in {
       xcodeWrapper watchman procps
       flock # used in nix/scripts/node_modules.sh
       ios-deploy # used in 'make run-ios-device'
-      xcbeautify # used in 'make run-ios'
     ];
 
     # WARNING: Executes shellHook in reverse order.

nix/mobile/jsbundle/default.nix

@@ -67,12 +67,9 @@ stdenv.mkDerivation {
   '';
   buildPhase = ''
     # Assemble CLASSPATH from available clojure dependencies.
-    # We prepend 'src' so it can find the local sources and prioritize
-    # our own namespaces over dependencies, given that indirect dependencies
-    # can also cause naming conflicts (e.g. prismatic/schema already uses
-    # namespace schema.core).
-    export CLASS_PATH="src:$(find ${deps.clojure} \
-      -iname '*.jar' | tr '\n' ':')"
+    # We append 'src' so it can find the local sources.
+    export CLASS_PATH="$(find ${deps.clojure} \
+      -iname '*.jar' | tr '\n' ':')src"
 
     # target must be one of the builds defined in shadow-cljs.edn
     java -cp "$CLASS_PATH" clojure.main \

nix/overlay.nix

@@ -63,7 +63,7 @@ in {
   };
 
   # Package version adjustments
-  gradle = super.gradle_8;
+  gradle = super.gradle_7;
   nodejs = super.nodejs-18_x;
   ruby = super.ruby_3_1;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
@@ -73,7 +73,6 @@ in {
     allowHigher = true;
   };
   go = super.go_1_19;
-  clang = super.clang_15;
   buildGoPackage = super.buildGo119Package;
   buildGoModule = super.buildGo119Module;
   gomobile = (super.gomobile.overrideAttrs (old: {
@@ -96,5 +95,4 @@ in {
   aapt2 = callPackage ./pkgs/aapt2 { };
   patchMavenSources = callPackage ./pkgs/patch-maven-srcs { };
   goMavenResolver = callPackage ./pkgs/go-maven-resolver { };
-  xcbeautify = callPackage ./pkgs/xcbeautify { };
 }

nix/pkgs/aapt2/default.nix

@@ -10,7 +10,7 @@ let
 
   pname = "aapt2";
   # Warning: This must be the same as gradlePluginVersion android/gradle.properties
-  version = "7.4.2-8841542";
+  version = "7.2.2-7984345";
 
   pkgPath = "com/android/tools/build/aapt2";
   repoUrl = "https://dl.google.com/dl/android/maven2";
@@ -29,20 +29,20 @@ let
     jar = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}";
       sha256 = getAttr platform {
-        linux = "sha256-bHKE8i7QbE0UFgn1TW4gzPj7MBV7t/PVo+Txd6jW0wE=";
-        osx = "sha256-Gmm9dnu2+OccqfqsUiKeanc4FNNkk7lCO0YAoxACjl0=";
+        linux = "sha256-BKtK5f7lxp0YdQU4AFGL933vjEAykQ1RiKpDwfc32oI=";
+        osx = "sha256-OORgWnGQS0GwqZrSg8sFQb4FM23hrYHwmarcYd8EO/0=";
       };
     };
     sha = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.jar}.sha1";
       sha256 = getAttr platform {
-        linux = "sha256-mSbHKU3snj5NTg3MN37pmVnVnYRKI9yoMVNJGuUXTso=";
-        osx = "sha256-V/t81ELdzRFoMPSD8wSgbtdQgmUkkOdqRu2iqKIeNVg=";
+        linux = "sha256-4F4REWQLj8hdnh1tIwRVgdWJjUBhvvINP56nIscwePA=";
+        osx = "sha256-n0jFUphzlFnNacolbXoNmNHs/hXfktVpYRlJ1JW9ukU=";
       };
     };
     pom = fetchurl {
       url = "${repoUrl}/${pkgPath}/${version}/${filenames.pom}";
-      sha256 = "sha256-9gY2kGJqgVcd1T3UOzYM+xoPug/eGBRUF+cA6Fu9ZRw=";
+      sha256 = "sha256-XWEn9Zvxv0hgYU2yUSlZ4OiguZy1bz+Gh0wRrm4d9GQ=";
     };
   };
 

nix/pkgs/android-sdk/compose.nix

@@ -14,10 +14,10 @@ androidenv.composeAndroidPackages {
   cmdLineToolsVersion = "9.0";
   toolsVersion = "26.1.1";
   platformToolsVersion = "33.0.3";
-  buildToolsVersions = [ "33.0.0" ];
-  platformVersions = [ "33" ];
-  cmakeVersions = [ "3.22.1" ];
-  ndkVersion = "25.2.9519653";
+  buildToolsVersions = [ "31.0.0" ];
+  platformVersions = [ "31" ];
+  cmakeVersions = [ "3.18.1" ];
+  ndkVersion = "22.1.7171670";
   includeNDK = true;
   includeExtras = [
     "extras;android;m2repository"

nix/pkgs/xcbeautify/default.nix

@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, unzip, lib }:
-
-let
-  inherit (lib) getAttr;
-in
-stdenv.mkDerivation rec {
-  pname = "xcbeautify";
-  version = "1.1.1";
-  arch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x86_64";
-
-  src = fetchurl {
-    url = "https://github.com/tuist/xcbeautify/releases/download/${version}/xcbeautify-${version}-${arch}-apple-macosx.zip";
-    sha256 = getAttr arch {
-            arm64 = "sha256-VaZBWZNx5iZxjpsVbKQA4wVsigjlhArDCsQXY/RBDx4=";
-            x86_64 = "sha256-Q1t4nHQu05mPqNRmL0KQukGRAHdkQHM7H24ar0isQTo=";
-        };
-    };
-
-  buildInputs = [ unzip ];
-
-  unpackPhase = ''
-    unzip $src
-  '';
-
-  installPhase = ''
-    install -D xcbeautify $out/bin/xcbeautify
-  '';
-
-  meta = with lib; {
-    description = "A little beautifier tool for xcodebuild";
-    homepage = "https://github.com/tuist/xcbeautify";
-    license = licenses.mit;
-    platforms = platforms.darwin;
-  };
-}

nix/scripts/node_modules.sh

@@ -45,8 +45,6 @@ copyNodeModules() {
 
   # WARNING: We can't de-reference .bin symlinks
   cp -Rf ${src}/node_modules/.bin/. "${tmp}/.bin/"
-  # Cmake called by react-native-reanimated 3.3.0 during build creates read-only temporary files.
-  chmod -R u+w node_modules/react-native-reanimated/android/ -f || true
   rm -r "${dst}"
   mv -f "${tmp}" "${dst}"
 }
@@ -78,7 +76,7 @@ nodeModulesUnchanged() {
 
   # Sentinel file holds location of the node_modules source in Nix store
   currentNixSrc="$(cat "${sentinelFile}")"
-
+  
   if [ "${currentNixSrc}" != "${src}" ]; then
     echo -e "${YLW}Yarn modules changed, copying new version over${RST}" >&2
     return 1
@@ -106,7 +104,7 @@ replaceNodeModules() {
 
   if nodeModulesUnchanged "${src}" "${dst}"; then
       return
-  fi
+  fi 
 
   # Replace node_modules if necessary
   echo "Copying node_modules from Nix store:" >&2

nix/scripts/purge.sh

@@ -25,8 +25,8 @@ nix_purge_darwin_multi_user_service() {
     cd /Library/LaunchDaemons
     NIX_SERVICES=(org.nixos.darwin-store.plist org.nixos.nix-daemon.plist)
     for NIX_SERVICE in "${NIX_SERVICES[@]}"; do
-        sudo launchctl unload "${NIX_SERVICE}" || true
-        sudo launchctl remove "${NIX_SERVICE}" || true
+        sudo launchctl unload "${NIX_SERVICE}"
+        sudo launchctl remove "${NIX_SERVICE}"
     done
 }
 
@@ -41,39 +41,15 @@ nix_purge_darwin_multi_user_users() {
 nix_purge_darwin_multi_user_volumes() {
     sudo sed -i.bkp '/nix/d' /etc/synthetic.conf
     sudo sed -i.bkp '/nix/d' /etc/fstab
-
-    # Attempt to delete the volume
-    if ! sudo diskutil apfs deleteVolume /nix; then
-        echo "Failed to unmount /nix because it is in use."
-
-        # Identify the process using the volume
-        local pid=$(lsof +D /nix | awk 'NR==2{print $2}')
-        if [ -n "$pid" ]; then
-            echo "The volume /nix is in use by process ID $pid."
-
-            # Ask the user whether to terminate the process
-            read -p "Do you want to terminate this process? (y/n): " choice
-            if [[ $choice == "y" ]]; then
-                sudo kill $pid
-                echo "Process $pid terminated."
-            else
-                echo "Process not terminated. Please close it manually and retry."
-                return 1
-            fi
-        else
-            echo "No process found using /nix. Manual intervention required."
-            return 1
-        fi
-    fi
-
+    sudo diskutil apfs deleteVolume /nix
     echo -e "${YLW}You will need to reboot your system!${RST}" >&2
 }
 
 nix_purge_multi_user() {
     if [[ $(uname -s) == "Darwin" ]]; then
-        nix_purge_darwin_multi_user_service || true
-        nix_purge_darwin_multi_user_users || true
-        nix_purge_darwin_multi_user_volumes || true
+        nix_purge_darwin_multi_user_service
+        nix_purge_darwin_multi_user_users
+        nix_purge_darwin_multi_user_volumes
     else
         nix_purge_linux_multi_user_service
         nix_purge_linux_multi_user_users

package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@babel/preset-typescript": "^7.17.12",
-    "@react-native-async-storage/async-storage": "1.19.3",
+    "@react-native-async-storage/async-storage": "^1.17.9",
     "@react-native-camera-roll/camera-roll": "git+https://github.com/status-im/react-native-camera-roll.git#refs/tags/v5.1.1.1",
     "@react-native-community/audio-toolkit": "git+https://github.com/tbenr/react-native-audio-toolkit.git#refs/tags/v2.0.3-status-v6",
     "@react-native-community/blur": "git+https://github.com/status-im/react-native-blur.git#refs/tags/v4.3.3-status",
@@ -19,47 +19,46 @@
     "@react-native-community/netinfo": "^4.4.0",
     "@react-native-community/push-notification-ios": "^1.4.1",
     "@react-native-community/slider": "^3.0.0",
-    "@react-native/metro-config": "^0.72.9",
+    "@walletconnect/client": "^2.0.0-beta.23",
     "base-64": "^1.0.0",
     "bignumber.js": "git+https://github.com/status-im/bignumber.js.git#refs/tags/v4.0.2-status",
     "chance": "^1.1.0",
     "create-react-class": "^15.6.2",
     "emojilib": "^2.4.0",
     "eth-phishing-detect": "^1.2.0",
-    "form-data": "^4.0.0",
     "functional-red-black-tree": "^1.0.1",
     "i18n-js": "^3.3.0",
-    "jsc-android": "^250231.0.0",
     "node-libs-react-native": "^1.2.1",
-    "react": "18.2.0",
+    "react": "18.0.0",
     "react-dom": "18.0.0",
-    "react-native": "0.72.5",
+    "react-native": "0.69.10",
     "react-native-background-timer": "^2.1.1",
     "react-native-blob-util": "^0.13.18",
     "react-native-camera-kit": "14.0.0-beta13",
     "react-native-config": "^1.5.0",
     "react-native-dialogs": "^1.0.4",
-    "react-native-draggable-flatlist": "4.0.1",
+    "react-native-draggable-flatlist": "^4.0.1",
     "react-native-fast-image": "^8.5.11",
     "react-native-fs": "^2.14.1",
     "react-native-gesture-handler": "2.6.1",
-    "react-native-gifted-charts": "^1.3.2",
+    "react-native-gifted-charts": "git+https://github.com/status-im/react-native-gifted-charts.git#refs/tags/1.3.2-status.1",
     "react-native-haptic-feedback": "^1.9.0",
-    "react-native-hole-view": "3.0.0-alpha3",
-    "react-native-image-crop-picker": "0.40.0",
+    "react-native-hole-view": "git+https://github.com/status-im/react-native-hole-view.git#refs/tags/v2.1.3-status",
+    "react-native-image-crop-picker": "git+https://github.com/status-im/react-native-image-crop-picker.git#refs/tags/v0.36.2-status.0",
     "react-native-image-resizer": "^1.2.3",
     "react-native-image-viewing": "git+https://github.com/status-im/react-native-image-viewing.git#refs/tags/v0.2.1.status",
-    "react-native-keychain": "8.1.2",
+    "react-native-intersection-observer": "^0.2.0",
+    "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#refs/tags/v.3.0.0-5-status",
     "react-native-languages": "^3.0.2",
     "react-native-linear-gradient": "^2.8.0",
     "react-native-lottie-splash-screen": "^1.0.1",
     "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#refs/tags/v6.1.2-status",
-    "react-native-navigation": "7.37.0",
+    "react-native-navigation": "^7.27.1",
     "react-native-orientation-locker": "^1.5.0",
-    "react-native-permissions": "3.8.0",
+    "react-native-permissions": "^2.1.5",
     "react-native-randombytes": "^3.6.1",
-    "react-native-reanimated": "3.6.1",
-    "react-native-redash": "18.1.0",
+    "react-native-reanimated": "2.11.0",
+    "react-native-redash": "^16.0.11",
     "react-native-shake": "^3.3.1",
     "react-native-share": "^8.2.2",
     "react-native-static-safe-area-insets": "^2.2.0",
@@ -67,48 +66,40 @@
     "react-native-svg": "13.10.0",
     "react-native-touch-id": "^4.4.1",
     "react-native-transparent-video": "git+https://github.com/status-im/react-native-transparent-video.git#refs/tags/0.1.1",
-    "react-native-webview": "13.6.3",
+    "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#refs/tags/v11.16.0-status",
     "react-syntax-highlighter": "^15.5.0",
     "rn-emoji-keyboard": "0.7.0",
     "tdigest": "^0.1.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.0",
-    "@babel/generator": "^7.20.0",
-    "@babel/helper-builder-react-jsx": "^7.20.0",
-    "@babel/plugin-transform-block-scoping": "^7.20.0",
-    "@babel/preset-env": "^7.20.0",
+    "@babel/generator": "7.0.0",
+    "@babel/helper-builder-react-jsx": "7.0.0",
+    "@babel/plugin-transform-block-scoping": "7.0.0",
+    "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
+    "@babel/preset-env": "7.1.0",
     "@babel/preset-react": "^7.18.6",
     "@babel/register": "7.0.0",
     "@jest/globals": "^25.1.0",
     "@mapbox/node-pre-gyp": "^1.0.9",
-    "@testing-library/jest-native": "^5.4.3",
-    "@testing-library/react-native": "^12.4.2",
-    "@tsconfig/react-native": "^3.0.0",
+    "@testing-library/jest-native": "^5.0.0",
+    "@testing-library/react-native": "^11.2.0",
     "@types/jest": "^28.1.6",
-    "@types/react": "^18.0.24",
-    "@types/react-test-renderer": "^18.0.0",
-    "babel-jest": "^29.7.0",
     "concurrently": "^7.6.0",
-    "jest": "^29.7.0",
+    "jest": "^26.6.3",
+    "jest-circus": "^26.0.0",
     "jest-image-snapshot": "^5.1.0",
-    "jest-silent-reporter": "^0.5.0",
-    "metro-react-native-babel-preset": "0.76.8",
     "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
     "prettier": "^2.8.8",
     "process": "0.11.10",
-    "react-test-renderer": "18.1.0",
+    "react-test-renderer": "18.0.0",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
-    "shadow-cljs": "2.26.2"
+    "shadow-cljs": "2.25.0"
   },
   "binary": {
     "module_name": "status_nodejs_addon",
     "module_path": "./lib/binding/",
     "host": "https://github.com/status-im/status-mobile/releases/download/",
     "remote_path": "{version}"
-  },
-  "engines": {
-    "node": ">=16"
   }
 }

react-native.config.js

@@ -5,6 +5,12 @@ module.exports = {
         ios: null,
       },
     },
+    'react-native-dialogs': {
+      platforms: {
+        android: null,
+        ios: null,
+      },
+    },
     'react-native-image-resizer': {
       platforms: {
         ios: null,