Android 11 - test

2023-04-13 02:59:43 +03:00
515 changed files with 9461 additions and 9857 deletions
@@ -12,11 +12,11 @@ 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
+status-im.native-module.core/listener
+status-im.native-module.core/multiaccount-reset
+status-im.native-module.core/extract-group-membership-signatures
+status-im.native-module.core/sign-group-membership
+status-im.native-module.core/update-mailservers
 status-im.ethereum.abi-spec/bytes-to-hex
 status-im.android.core/init
 status-im.chat.models.message/transport-keys
@@ -7,7 +7,6 @@

 # Xcode
 #
-/ios/.xcode.env.local
 /component-spec
 result/
 build/
@@ -282,17 +282,6 @@ else
 	npx react-native run-ios
 endif

-show-ios-devices: export TARGET := ios
-show-ios-devices: ##@other shows connected ios device and its name
-	xcrun xctrace list devices
-
-run-ios-device: export TARGET := ios
-run-ios-device: ##@run iOS app and start it on a connected device by its name
-ifndef DEVICE_NAME
-	$(error Usage: make run-ios-device DEVICE_NAME=your-device-name)
-endif
-	react-native run-ios --device "$(DEVICE_NAME)"
-
 #--------------
 # Tests
 #--------------
@@ -32,10 +32,7 @@
            android:theme="@style/Theme.AppSplash"
            android:name=".MainApplication"
            android:largeHeap="true"
-            android:usesCleartextTraffic="true"
-            android:extractNativeLibs="true">
-<!--        After upgrading Android Gradle Plugin to 4.2.0 and above we must get rid of `extractNativeLibs="true"`
-            and use`useLegacyPackaging` flag in our app's `build.gradle`-->
+            android:usesCleartextTraffic="true">
        <meta-data android:name="commitHash" android:value="${commitHash}"/>
        <activity
                android:name=".MainActivity"
@@ -72,7 +72,7 @@ public class MainApplication extends NavigationApplication {
        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());

        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
-        //initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+        initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
    }
    /**
     * Loads Flipper in React Native templates. Call this in the onCreate method with something like
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label 'linux' }
@@ -1,10 +1,10 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()

 pipeline {
-  agent { label 'macos && arm64 && nix-2.11 && xcode-14.3' }
+  agent { label 'macos && arm64 && nix-2.11 && xcode-14.2' }

  parameters {
    string(
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label params.AGENT_LABEL }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 /* Options section can't access functions in objects. */
 def isPRBuild = utils.isPRBuild()
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label 'macos' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent { label 'linux' }
@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.7.2'
+library 'status-jenkins-lib@v1.6.9'

 pipeline {
  agent {
@@ -23,13 +23,13 @@ setups and runs the test suite once.
 setups and runs the test suite and watches for code changes will then retrigger the test suite.

 ## Writing Tests
-New test files will need their namespace added to either the file "src/quo2/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadow-cljs config discussed below.
+New test files will need their namespace added to either the file "src/quo2/core_spec.cljs" or "src/status_im2/core_spec.cljs. These locations may update overtime but it is dependent on the entrypoint in shadowcljs config discussed below.


 ### Best practices
 For the moment we will keep best practices for tests in our other guidelines document:

-To that point these guidelines will follow the conventions of Jest and React Native Testing Library recommendations and Status mobile will just stack their preferences on top.
+To that point these guidelines will follow the conventions of Jest and React Native Testing Library recomendations and Status mobile will just stack their preferences on top.

 ### Utilities
 There is a file of utility functions defined in "src/test_helpers/component.cljs" and "src/test_helpers/component.clj". It will be great to use these utilities and to add any common testing tools to these files as it should make writing tests easier and faster.
@@ -52,4 +52,4 @@ It's worth knowing that our tests are compiled to JS and then run in the tempora
 ### Jest
 There is also further configuration for Jest in "test/jest". There is a jest config file which has some mostly standard configuration pieces, where the tests live, what environment variables are set etc. This is documented by Jest here: https://jestjs.io/docs/configuration

-There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies 
+There is also a setup file which is used to set some global and default values. Additionally this file is used to mock some of the react native (among other) dependencies 
@@ -36,50 +36,6 @@ Pay special attention to:

 ## Dos and don'ts

-### Hiccup
-
-Never use anonymous inline function in hiccup, this will lead to reinitialization of component on each render of parent component
-
-```clojure
-;; bad
-(defn checkbox-view
-  [{:keys [size]}]
-  [rn/view
-   [(fn [] [rn/view])]])
-
-;; good
-(defn comp []
-  [rn/view])
-
-(defn checkbox-view
-  [{:keys [size]}]
-  [rn/view
-   [comp]])
-```
-
-This mistake mostly happens with functional components
-
-```clojure
-;; bad
-(fn []
-  (let [atom (rf/sub [:sub])]
-    (fn []
-      [:f>
-       (fn []
-         [rn/text atom]
-
-;; good
-(defn f-comp [atom]
- [rn/text atom])
-         
-(fn []
- (let [atom (rf/sub [:sub])]
-   (fn []
-     [:f> f-comp atom]))) 
-```
-
-it's important to name functional components with `f-` prefix
-
 ### Component styles

 Prefer to define styles in a separate file named `style.cljs`, colocated with
@@ -134,38 +90,11 @@ their styles in the top-level of the properties map, prefer to add them inside t
 ]
 ```

-Also its fine to keep one liner styles in view
-
-```clojure
-;; ok
-[rn/view {:style {:flex 1 :padding-top 5}}]
-```
-
-### Don't define properties in styles ns
-
-Properties must be set on view level 
-
-```clojure
-;; bad
-{:style         {:position         :absolute
-                 :left             0
-                 :right            0
-                 :bottom           0}
- :blur-amount   30
- :blur-radius   25
- :blur-type     :transparent
- :overlay-color :transparent}
-
-;; good
-{:position         :absolute
- :left             0
- :right            0
- :bottom           0}
-```
-
-
-### Apply animated styles in the style file
+### Always apply animated styles in the style file

+When implementing styles for reanimated views, we should always define
+them in the style file and apply animations with reanimated/apply-animations-to-style
+in the style definition.

 ```clojure
 ;; bad
@@ -256,6 +256,8 @@ PODS:
    - React-Core
  - react-native-randombytes (3.6.1):
    - React-Core
+  - react-native-safe-area-context (2.0.0):
+    - React
  - react-native-shake (3.4.0):
    - React
  - react-native-slider (3.0.0):
@@ -410,8 +412,6 @@ PODS:
    - Yoga
  - RNShare (7.0.1):
    - React-Core
-  - RNStaticSafeAreaInsets (2.2.0):
-    - React-Core
  - RNSVG (9.13.6):
    - React
  - SDWebImage (5.11.1):
@@ -468,6 +468,7 @@ DEPENDENCIES:
  - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
  - react-native-orientation-locker (from `../node_modules/react-native-orientation-locker`)
  - react-native-randombytes (from `../node_modules/react-native-randombytes`)
+  - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
  - react-native-shake (from `../node_modules/react-native-shake`)
  - "react-native-slider (from `../node_modules/@react-native-community/slider`)"
  - react-native-status (from `../modules/react-native-status`)
@@ -502,7 +503,6 @@ DEPENDENCIES:
  - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
  - RNReanimated (from `../node_modules/react-native-reanimated`)
  - RNShare (from `../node_modules/react-native-share`)
-  - RNStaticSafeAreaInsets (from `../node_modules/react-native-static-safe-area-insets`)
  - RNSVG (from `../node_modules/react-native-svg`)
  - secp256k1 (from `https://github.com/status-im/secp256k1.swift.git`)
  - SQLCipher (~> 3.0)
@@ -589,6 +589,8 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-orientation-locker"
  react-native-randombytes:
    :path: "../node_modules/react-native-randombytes"
+  react-native-safe-area-context:
+    :path: "../node_modules/react-native-safe-area-context"
  react-native-shake:
    :path: "../node_modules/react-native-shake"
  react-native-slider:
@@ -657,8 +659,6 @@ EXTERNAL SOURCES:
    :path: "../node_modules/react-native-reanimated"
  RNShare:
    :path: "../node_modules/react-native-share"
-  RNStaticSafeAreaInsets:
-    :path: "../node_modules/react-native-static-safe-area-insets"
  RNSVG:
    :path: "../node_modules/react-native-svg"
  secp256k1:
@@ -682,11 +682,11 @@ SPEC CHECKSUMS:
  boost: a7c83b31436843459a1961bfd74b96033dc77234
  BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662
  FBLazyVector: d2db9d00883282819d03bbd401b2ad4360d47580
  FBReactNativeSpec: 94da4d84ba3b1acf459103320882daa481a2b62d
  fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 997518ea2aa2d8cd5df9797b641b758d52ecf2bc
+  glog: 9e3310013355e9221591364060e841c28041dfe3
  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
  Keycard: ac6df4d91525c3c82635ac24d4ddd9a80aca5fc8
  libwebp: f62cb61d0a484ba548448a4bd52aabf150ff6eef
@@ -716,6 +716,7 @@ SPEC CHECKSUMS:
  react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
  react-native-orientation-locker: 851f6510d8046ea2f14aa169b1e01fcd309a94ba
  react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
+  react-native-safe-area-context: 60f654e00b6cc416573f6d5dbfce3839958eb57a
  react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
  react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
  react-native-status: 21f75d492fd311dc111303da38a7a2b23a8a8466
@@ -750,7 +751,6 @@ SPEC CHECKSUMS:
  RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
  RNReanimated: 3ad6ec4e147462206be9d1c925df10b6ea850b0e
  RNShare: 2dc2fcac3f7321cfd6b60a23ed4bf4d549f86f5f
-  RNStaticSafeAreaInsets: 055ddbf5e476321720457cdaeec0ff2ba40ec1b8
  RNSVG: 8ba35cbeb385a52fd960fd28db9d7d18b4c2974f
  SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
  SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
@@ -763,4 +763,4 @@ SPEC CHECKSUMS:

 PODFILE CHECKSUM: c29de3b14e3275299c51aa95520622f09d084bcb

-COCOAPODS: 1.12.1
+COCOAPODS: 1.12.0
@@ -417,7 +417,9 @@
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
 					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = 8B5X2M6H2Y;
 						LastSwiftMigration = 1140;
+						ProvisioningStyle = Manual;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -542,7 +544,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			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";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\" --openssl-legacy-provider --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
 		3AAD2AD524A3A60E0075D594 /* Bundle React Native code and images */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -556,7 +558,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			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";
+			shellScript = "set -o errexit\nexport NODE_BINARY=\"${NODE_BINARY:-node}\"\nexport NODE_ARGS=\" --openssl-legacy-provider --max-old-space-size=16384 \"\n\nbash -x ../node_modules/react-native/scripts/react-native-xcode.sh > ./logs/react-native-xcode.log 2>&1";
 		};
 		3AAD2AD724A3A60E0075D594 /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -841,8 +843,9 @@
 				BUNDLE_ID_SUFFIX = .debug;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = StatusIm/StatusIm.entitlements;
-				CODE_SIGN_IDENTITY = "Apple Development";
-				CODE_SIGN_STYLE = Automatic;
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				CODE_SIGN_STYLE = Manual;
 				CUSTOM_PRODUCT_NAME = "Status Debug";
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 8B5X2M6H2Y;
@@ -896,7 +899,8 @@
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum;
 				PRODUCT_NAME = StatusIm;
-				PROVISIONING_PROFILE_SPECIFIER = "";
+				PROVISIONING_PROFILE = "9da75626-9594-43d9-a827-0f6d43c28f54";
+				PROVISIONING_PROFILE_SPECIFIER = "match Development im.status.ethereum";
 				SWIFT_OBJC_BRIDGING_HEADER = "StatusIm-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -1859,6 +1859,21 @@
    }
  },

+  {
+    "path": "com/android/databinding/baseLibrary/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "baseLibrary-3.1.4.pom": {
+        "sha1": "b48baeaef73d7763fa92b847c4140f0e0ff71d99",
+        "sha256": "16c6wpphs4b8373w7jdiynv48lgl8sj8sy5gp16cf3qgqgmai4qv"
+      },
+      "baseLibrary-3.1.4.jar": {
+        "sha1": "df1e7638ba852152abe964e86f60fa4ce12e6a6a",
+        "sha256": "0cn50bas33hndr7snlgwpj4vgr66dazkg7ybb04hgc0czdgl9adb"
+      }
+    }
+  },
+
  {
    "path": "com/android/databinding/baseLibrary/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -1949,6 +1964,21 @@
    }
  },

+  {
+    "path": "com/android/databinding/compilerCommon/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "compilerCommon-3.1.4.pom": {
+        "sha1": "0fd23d31fe5e40ac6d203734dcc6b16328ba714c",
+        "sha256": "0sb36alvbmxv05amnc02csm73cg6aib8s16fipjlgqri58cn5yd9"
+      },
+      "compilerCommon-3.1.4.jar": {
+        "sha1": "11005423fee93309c0cd512a8783647702c20c27",
+        "sha256": "0kxd2js2yk7bisiiy1j5i5zgd9h124qac10dan68y8swiddd4hlb"
+      }
+    }
+  },
+
  {
    "path": "com/android/signflinger/4.1.0",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2354,6 +2384,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/protos/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "protos-26.1.4.pom": {
+        "sha1": "0c9e7fe6c7c2b0156a87aa626f5463af34669f99",
+        "sha256": "11wnpnlb0ixck525g1qi6lgrjcsca9281kpmwkm3m3r8y1fnl86c"
+      },
+      "protos-26.1.4.jar": {
+        "sha1": "dc5876bb894d87d2088b0a4447b13fdc13ad82fc",
+        "sha256": "1dy9pd8sjkhhip8xqz681i9q66m43iigmnwhdkmk6xm33j0d6cf7"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/protos/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2444,6 +2489,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/shared/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "shared-26.1.4.pom": {
+        "sha1": "18ef89a0e8844559433bf6c085b4b86faecb87b6",
+        "sha256": "1m4g32q62mjwmg0z23fvzf40gaf4dgm0jb5cbcv4j36jpgp0yrmm"
+      },
+      "shared-26.1.4.jar": {
+        "sha1": "02a285c67f4b421145e47849d4114f7534707156",
+        "sha256": "08h7w0fwky1mr5j7v4yb4afa3kvvw56bnj4926m4zi62p1qfdxsn"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/shared/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2534,6 +2594,21 @@
    }
  },

+  {
+    "path": "com/android/tools/analytics-library/tracker/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "tracker-26.1.4.pom": {
+        "sha1": "0949ee22e49c32374aa3227b76efdf6b69a85cb0",
+        "sha256": "0077291y8qj555nwqg1ssykdg7cjqgf8866hz9y7rw6sj95h9flw"
+      },
+      "tracker-26.1.4.jar": {
+        "sha1": "fd48066d6c78b78abf5baa335dc2124060e8371c",
+        "sha256": "1yggkx8f5a3w3z924rmc01y06vn4ppz5541s88y6qkd0xbxbdmb6"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/analytics-library/tracker/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2624,6 +2699,21 @@
    }
  },

+  {
+    "path": "com/android/tools/annotations/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "annotations-26.1.4.pom": {
+        "sha1": "d5e8ea57c56cd1f5b6e1e676ab0d489d88b59826",
+        "sha256": "1i6qhh6b5nppvbc465hzjd29ip8j698cs1873yv42dhakc325cyz"
+      },
+      "annotations-26.1.4.jar": {
+        "sha1": "817d5238d9ea07b4b26d04e29e9bada2aacb7245",
+        "sha256": "102r2z2wh3pmaar7f0d3nxksk265m5plbd8cjjvbgll9jkw972k0"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/annotations/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2684,6 +2774,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/aapt2-proto/0.1.0",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "aapt2-proto-0.1.0.pom": {
+        "sha1": "d3492c6cfb99d5d556cf4840c2efd63493ce2ac1",
+        "sha256": "1h9vlambl1k51nx86qm0yfyavpf9qfrh7gja1q3qsqj10jinb8kc"
+      },
+      "aapt2-proto-0.1.0.jar": {
+        "sha1": "d1eb93a21a8d3590c3bfac574a8b6dffb2dbd21c",
+        "sha256": "1x69zbk977hyc97hpc3bxmh19yiiq3hkl3hadjmwps08z4g13990"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/aapt2-proto/0.3.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2789,6 +2894,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/apksig/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "apksig-3.1.4.pom": {
+        "sha1": "a0d953c40691088ad3336fca80b5e2cd3fbd05ec",
+        "sha256": "1jfg6giv1mkg7j72g3w7h5gjvbmpalb03ra7lbdwk350lz76jq23"
+      },
+      "apksig-3.1.4.jar": {
+        "sha1": "e0c4d0059e68e9f64606dfa01e066f86dd07c6cb",
+        "sha256": "0xa5hzkmfymz5pqnrgw7bx9h13rbfnwy3h7nmmnqcrbrlqvc7bar"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/apksig/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -2939,6 +3059,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder-model/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-model-3.1.4.pom": {
+        "sha1": "2cd8e9360a4114089d33a0ef98927f14d36c8562",
+        "sha256": "0in1yb8n7m28ppj91k5hxclq60qc9141lwm4hyllqsjl2qdns5ys"
+      },
+      "builder-model-3.1.4.jar": {
+        "sha1": "f026c31b8228a84b62bb2fe0ac0544143e9ab27d",
+        "sha256": "0gqa2immwkl4kvg4c233ndxp2bg33ypdbmp6jah5ab0c5azqr3bf"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder-model/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3029,6 +3164,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder-test-api/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-test-api-3.1.4.pom": {
+        "sha1": "e9843c965bd3ec945ad5e94feebbfe1d47aa5a3b",
+        "sha256": "0adip5p8lvbhcqxhqrpahws9ia9f9q12dkzchf5kj44vgl0r7mbf"
+      },
+      "builder-test-api-3.1.4.jar": {
+        "sha1": "e48338f64f1c8fbef8329eb6d899fb6378fca604",
+        "sha256": "1qjgvj3jmwa7gxc910vfa56rijzin33zymqpb4ikfpsvhk7g2kqz"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder-test-api/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3119,6 +3269,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/builder/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "builder-3.1.4.pom": {
+        "sha1": "d33573f1d53514989682eaf85d2c2b98f37aeae2",
+        "sha256": "064y4z05s3r7x74rlb26c8m7aq5pharw5l1yk1ca76h9k0lafslp"
+      },
+      "builder-3.1.4.jar": {
+        "sha1": "afbcd4b7002c61fe898b1b4c50ed9e62386125d8",
+        "sha256": "02wmahn5ibgnxqrk7nqzwdgc4j80iml01g17lmlghdhdmks3y9zy"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/builder/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3179,6 +3344,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/bundletool/0.1.0-alpha01",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "bundletool-0.1.0-alpha01.pom": {
+        "sha1": "834b735a36a399e2bb0276842ce97c55f6d6c072",
+        "sha256": "1271sgv8jxdgsf60chx8yjc0jsfs38xd2jhdmdv8d8h4iwrpcrvc"
+      },
+      "bundletool-0.1.0-alpha01.jar": {
+        "sha1": "f7c303e37818223bd98566fcbea29aa0964c4d06",
+        "sha256": "05bgc6sh1cz4l8mbw6jyx78pq275szq011z5cgpjdkdbpzq5dnrv"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/bundletool/0.5.0",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3269,6 +3449,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/gradle-api/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-api-3.1.4.pom": {
+        "sha1": "e18ab0b7eee6fc63e65158b4f88bf5c7ce207524",
+        "sha256": "0rjnchkvy8j8k3f12l060p4yg9c784l8j7ngdbphy6jwipvxfz2j"
+      },
+      "gradle-api-3.1.4.jar": {
+        "sha1": "eb41dfb5596afd8933c804595ca8596952fad450",
+        "sha256": "0qqsqjrgnamvzll97ylzw34f75hcp3cmh65dzksqhxgwcfcp9sni"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/gradle-api/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3359,6 +3554,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/gradle-core/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-core-3.1.4.pom": {
+        "sha1": "38efeb43831cda5d758c52cd62817c3c53ac4722",
+        "sha256": "1kiij87ybp97q5m3w81pr9gy94fpf5jm59jp67ia9h7cz9dj0kv1"
+      },
+      "gradle-core-3.1.4.jar": {
+        "sha1": "4c846d065331c2a11ed605619613833a842a7b8d",
+        "sha256": "1nhx6sjfxfqq63yr59i5j09yvkm383fim93fcfkp6s711ma54pma"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/gradle/3.0.0",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3389,6 +3599,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/gradle/3.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "gradle-3.1.4.pom": {
+        "sha1": "920f69e56d872f11136254d329ccc6825ced29a1",
+        "sha256": "1cs4sqfpwg0fhdhyqdpzq70gkyq9cy9xm11bmvpanfls2wcwyqi5"
+      },
+      "gradle-3.1.4.jar": {
+        "sha1": "08f9a726f69c0c8fa3f447566717a21e6b394ed9",
+        "sha256": "1dxp32ncbrvi8qd9pij9r0mzcn3l6qm7jr0rk86nq5xi0k06ak0g"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/gradle/3.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3599,6 +3824,21 @@
    }
  },

+  {
+    "path": "com/android/tools/build/manifest-merger/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "manifest-merger-26.1.4.pom": {
+        "sha1": "8b025ca5a54d8e27600470f841f87a77d0a93f56",
+        "sha256": "0xxjj1frb9fqyv6d6kmfhxsy7xqjas8nkv7y0hpk1726q0kqi81v"
+      },
+      "manifest-merger-26.1.4.jar": {
+        "sha1": "ddb4dcb3bb44c7053fa583967dfa9030f43f1c01",
+        "sha256": "1cccgadv0varzj48cpwbk3c0y7hpkl5nxa7v7sds9xd2smkv8q9x"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/build/manifest-merger/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3689,6 +3929,21 @@
    }
  },

+  {
+    "path": "com/android/tools/common/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "common-26.1.4.pom": {
+        "sha1": "0ba42432d38a56a205e7a5f39a67701277c6d818",
+        "sha256": "0xdgznbm17brc3x99p9y4jc082ql0svvxcm36yzlr840iywcl5iy"
+      },
+      "common-26.1.4.jar": {
+        "sha1": "b70b6ef7188fe5a6ad6186f0efb22e536e483b9b",
+        "sha256": "0irdsr5kppk7mw0wjnfpj8h5lixh2p7v4v1ly8z0np95wd6mfnrx"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/common/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3779,6 +4034,21 @@
    }
  },

+  {
+    "path": "com/android/tools/ddms/ddmlib/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "ddmlib-26.1.4.pom": {
+        "sha1": "e18f8f2897b429a9246e9a622608a8b347f73b94",
+        "sha256": "0bq9rr7zwfssz1m6f9qs39s88chqy3siq3hgbfp7f7jc4hgfi1mr"
+      },
+      "ddmlib-26.1.4.jar": {
+        "sha1": "c11fa14b583412aaa9262461299318207439156d",
+        "sha256": "0zzzhjjsrry77yksjdvv5k3a1nhccpnwh9k6vfv51i8mh9mi58x3"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/ddms/ddmlib/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -3869,6 +4139,21 @@
    }
  },

+  {
+    "path": "com/android/tools/dvlib/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "dvlib-26.1.4.pom": {
+        "sha1": "49d0672a46075d55b83d2e59e8a7c4af90c4e9f0",
+        "sha256": "1xxdi7fb5ixv850zfjd340ww8gx8vkmlx9jm18ib9w5gj77w4w2s"
+      },
+      "dvlib-26.1.4.jar": {
+        "sha1": "5d443b51ad041e9599cfdb278cd2f6c9d2ccdf28",
+        "sha256": "1kh85j1spdpbd5bwcf2155hjyv7psn3b9qxry7lw0i4cldi862n5"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/dvlib/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4064,6 +4349,21 @@
    }
  },

+  {
+    "path": "com/android/tools/layoutlib/layoutlib-api/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "layoutlib-api-26.1.4.pom": {
+        "sha1": "de645341e6b3b77554bd2510f13fd04513d66324",
+        "sha256": "09229jd3448xaci0xh740v902w1g8xgzrkq1py6949jidzfm814n"
+      },
+      "layoutlib-api-26.1.4.jar": {
+        "sha1": "dad1158a9fc38b711339960b82fd9dcf32009e46",
+        "sha256": "1a5zqp4y43jlqbdnqjw7sis2f4sqa3iixkcj31fq9s72gknwj4fr"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/layoutlib/layoutlib-api/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4214,6 +4514,21 @@
    }
  },

+  {
+    "path": "com/android/tools/lint/lint-gradle-api/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "lint-gradle-api-26.1.4.pom": {
+        "sha1": "8bc04a18da7f891ab4c13a010d422a14f99d8d6d",
+        "sha256": "0b8z7fsfpba2bhx2m0jaca297jgyasy5zhfsx61s40dcp80j89ff"
+      },
+      "lint-gradle-api-26.1.4.jar": {
+        "sha1": "cbc00782604b7d0ad50e9c50b84b074af79394f0",
+        "sha256": "0nipwpq92wvzxnn2wzdff69v8ps9rznwcrj0xagwqfwd85hdkil6"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/lint/lint-gradle-api/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4379,6 +4694,21 @@
    }
  },

+  {
+    "path": "com/android/tools/repository/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "repository-26.1.4.pom": {
+        "sha1": "1b4c88b0253140647c018cce242b688d2ff98cc3",
+        "sha256": "1yinybbnmqlkcw43bqpxi6pq5lwr7ppj8xxfwkx264jqni5phipa"
+      },
+      "repository-26.1.4.jar": {
+        "sha1": "349dfc72ae53dedc32a17f5d47440838fe2527f1",
+        "sha256": "0mskx9a3qm6499415mn0nzir9jvn807pnfwaf8wpymz4gsbfh45l"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/repository/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4469,6 +4799,21 @@
    }
  },

+  {
+    "path": "com/android/tools/sdklib/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdklib-26.1.4.pom": {
+        "sha1": "0e7ef3a225517e60891160d63467bc3572de7e58",
+        "sha256": "00bgvi6pq59js519i0xi4zsz3pvvfn1l6dmi50b6k428jhdcljzh"
+      },
+      "sdklib-26.1.4.jar": {
+        "sha1": "7424640f2bd3ca3faccb6f656e29547430cd464a",
+        "sha256": "02p8gsmqk7azzvvnmjnhpc8n49v83yf3pfia2py89j1h5fy7x2bs"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/sdklib/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -4559,6 +4904,21 @@
    }
  },

+  {
+    "path": "com/android/tools/sdk-common/26.1.4",
+    "repo": "https://dl.google.com/dl/android/maven2",
+    "files": {
+      "sdk-common-26.1.4.pom": {
+        "sha1": "03b3158f1e0d5eb281d5a6a67435b97dc2d76c21",
+        "sha256": "0a6jjz7fcbky2w2bv0v5qksppgr51nd7lhawr9lva3wg2gpk36mv"
+      },
+      "sdk-common-26.1.4.jar": {
+        "sha1": "5dbdefb2dc6cb5ba1b4b059bf11c964a830c5755",
+        "sha256": "1awy7i7q22avjs8lxys3i0k3b6qdi0kzvs03p2pxvwbm7lckv7bq"
+      }
+    }
+  },
+
  {
    "path": "com/android/tools/sdk-common/26.2.1",
    "repo": "https://dl.google.com/dl/android/maven2",
@@ -7085,6 +7445,21 @@
    }
  },

+  {
+    "path": "com/google/errorprone/error_prone_annotations/2.1.2",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "error_prone_annotations-2.1.2.pom": {
+        "sha1": "44f5d3b9781c31822991ff9f948d6cbfb8cdf055",
+        "sha256": "04894gp1inj1cpgp68cjh0rzpv0svfzhv2spak2prvdlp25mh2hq"
+      },
+      "error_prone_annotations-2.1.2.jar": {
+        "sha1": "6dcc08f90f678ac33e5ef78c3c752b6f59e63e0c",
+        "sha256": "0akq6zj7fd6i0abyz5c0q5aikp7lldrbind4lbvn0q60blxqfg6y"
+      }
+    }
+  },
+
  {
    "path": "com/google/errorprone/error_prone_annotations/2.2.0",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -7156,6 +7531,17 @@
    }
  },

+  {
+    "path": "com/google/errorprone/error_prone_parent/2.1.2",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "error_prone_parent-2.1.2.pom": {
+        "sha1": "ae2dd256d508d2ffc9d77fbec0414ee695973a8a",
+        "sha256": "0hx1cf07n7kwcl2pwiab628fm8fmymgy7bwdkvr3nswgvcfxddn6"
+      }
+    }
+  },
+
  {
    "path": "com/google/errorprone/error_prone_parent/2.2.0",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -8088,16 +8474,16 @@
  },

  {
-    "path": "com/sun/istack/istack-commons-runtime/4.2.0",
+    "path": "com/sun/istack/istack-commons-runtime/4.1.1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "istack-commons-runtime-4.2.0.pom": {
-        "sha1": "e00df2d2db8d5459e86a5ef542269ed56c278c66",
-        "sha256": "0wx5n7595af1n4a8rf5xcqmf6nwyhck0sq17yy94pr1f7pmrp20v"
+      "istack-commons-runtime-4.1.1.pom": {
+        "sha1": "35c136c863b9591c4d5374b76c724e871cbc57aa",
+        "sha256": "17nvihq7f24xrvlqkzxq23qkb4g5f9sl0pq7wsvspl78gbv4ciq1"
      },
-      "istack-commons-runtime-4.2.0.jar": {
-        "sha1": "131351109ff27c4aa0958a988bb273e879687232",
-        "sha256": "1xjzfa470birdrq8myd0b57c580gk7jip735vrs3zybf15x5n0i1"
+      "istack-commons-runtime-4.1.1.jar": {
+        "sha1": "9b3769c76235bc283b060da4fae2318c6d53f07e",
+        "sha256": "1lyw30wh3w1xazp0kzb4j5zvz01fz1rihk2kqkwfcnjxpz2li0by"
      }
    }
  },
@@ -8125,12 +8511,12 @@
  },

  {
-    "path": "com/sun/istack/istack-commons/4.2.0",
+    "path": "com/sun/istack/istack-commons/4.1.1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "istack-commons-4.2.0.pom": {
-        "sha1": "ddebb110777b1340dae08ba3779042ea5b45144e",
-        "sha256": "0z29v0lwwyy5gibffcb91ppjmikvrw90pg76m9l7pidjvcw6cwv6"
+      "istack-commons-4.1.1.pom": {
+        "sha1": "645608b459500510bd8d75686cd4b3a9e9ee36a0",
+        "sha256": "0303sa2xi5ln0ypnwpqizs6zrni8s0dr7wj0d41nkbrg6152fxnf"
      }
    }
  },
@@ -8477,16 +8863,16 @@
  },

  {
-    "path": "jakarta/activation/jakarta.activation-api/2.1.2",
+    "path": "jakarta/activation/jakarta.activation-api/2.1.1",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "jakarta.activation-api-2.1.2.pom": {
-        "sha1": "233dabc7d6b1784679925cbbfebd2e3dec692591",
-        "sha256": "1phfr3r5gy10si0k7r750fbkvg1rdhxg62c3xv5mscfri87b189c"
+      "jakarta.activation-api-2.1.1.pom": {
+        "sha1": "0c6e1dbee7b7faf7c9c8b7274a8b6279415cac6a",
+        "sha256": "006awx3sv5lc6ngsnrvgij6m9dhhrxqwy1gkkf3p9agdxzw5jck9"
      },
-      "jakarta.activation-api-2.1.2.jar": {
-        "sha1": "640c0d5aff45dbff1e1a1bc09673ff3a02b1ba12",
-        "sha256": "1fwz95v2iygy0bcmvffw4d0zparqkb2ibqm4jp0p0hgbs26mfgzm"
+      "jakarta.activation-api-2.1.1.jar": {
+        "sha1": "88c774ab863a21fb2fc4219af95379fafe499a31",
+        "sha256": "010s9784kcs97whlpyy7pd2dp71m62hh5n41zix5mfrdy7qf7fik"
      }
    }
  },
@@ -10001,16 +10387,16 @@
  },

  {
-    "path": "org/checkerframework/checker-qual/3.34.0",
+    "path": "org/checkerframework/checker-qual/3.32.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "checker-qual-3.34.0.pom": {
-        "sha1": "0e3a886c77f8027c96dcbf9516356a42d5b95dad",
-        "sha256": "0dg54xq0mjd4q2kxyg0z3kfi4d7bjnb7pf870r38qf7kqj8yjnca"
+      "checker-qual-3.32.0.pom": {
+        "sha1": "69d7d01436d892d55b202ccec8a7066f0ac41f98",
+        "sha256": "1kvxly5fpws3prsar57rmjqq6hcy2a0b5fpx60fgmpkf59jqhnkr"
      },
-      "checker-qual-3.34.0.jar": {
-        "sha1": "fd620da2920cdb0bfcbcde20e309f75940198ccf",
-        "sha256": "1p96cdclxdvsxgd2bv8lscwqc1cd2ak6mvg7llb7mgbmwf1kxl2x"
+      "checker-qual-3.32.0.jar": {
+        "sha1": "54ebd61f46b58b862c779e034073a93489ab3faf",
+        "sha256": "1k9wsy7wvh5304aaqb51hlgpfciahg5avzgmnzq8bgx6l1fh4vmn"
      }
    }
  },
@@ -10257,27 +10643,27 @@
  },

  {
-    "path": "org/eclipse/angus/angus-activation-project/2.0.1",
+    "path": "org/eclipse/angus/angus-activation-project/2.0.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "angus-activation-project-2.0.1.pom": {
-        "sha1": "24682c09b455ad140ee080bd86752f0bf1957c55",
-        "sha256": "1ddiingflsp4wdyaw1az6fm02iacn63imnkg82xnxh8ximcns5y3"
+      "angus-activation-project-2.0.0.pom": {
+        "sha1": "6fafee47a73b1ee5dc0f533bcaebc55743bbee84",
+        "sha256": "17ffihwphiw6vzwxb3gkrxbjcsby640wmadj43rbcfamn6icwrjx"
      }
    }
  },

  {
-    "path": "org/eclipse/angus/angus-activation/2.0.1",
+    "path": "org/eclipse/angus/angus-activation/2.0.0",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "angus-activation-2.0.1.pom": {
-        "sha1": "b0b59e5f8caaf5afe94cde78d4e98aa1c0a50505",
-        "sha256": "1vs0w1m3hqa0piqq144x3d9jl3bywzzdl0lg34dfl9gmyw7ypib7"
+      "angus-activation-2.0.0.pom": {
+        "sha1": "87500cdbfdcb4758ece7ca2267469a590e2d9fb9",
+        "sha256": "1sb92gyb9fk3fqysrsr021wdan191i6wgq845gkf4lnk4rbgcqsr"
      },
-      "angus-activation-2.0.1.jar": {
-        "sha1": "eaafaf4eb71b400e4136fc3a286f50e34a68ecb7",
-        "sha256": "0cf1nhrkjqz0nihp0l484y627asl5mnixmy1cj4xz3l62lc7c9mj"
+      "angus-activation-2.0.0.jar": {
+        "sha1": "72369f4e2314d38de2dcbb277141ef0226f73151",
+        "sha256": "0iwi0y1ksir12z47gc0q7y7bfxnylf9yxdprix2sjnpkl0hx64is"
      }
    }
  },
@@ -10555,12 +10941,12 @@
  },

  {
-    "path": "org/jacoco/org.jacoco.build/0.8.10",
+    "path": "org/jacoco/org.jacoco.build/0.8.8",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "org.jacoco.build-0.8.10.pom": {
-        "sha1": "a129ae2c1a5138a8bdfcfaecde3d1c74cb6d4f23",
-        "sha256": "0fvcpmk09b92985xsry4pdz2ii8jja0h68iw759i9apbipcv1mz3"
+      "org.jacoco.build-0.8.8.pom": {
+        "sha1": "b1ec2ce6fa11aa065c5c8cea04be7fa745c9fcbc",
+        "sha256": "1vrarvwmzb8gg8k7fmpxx3fh8n9ik1r8ahigfxngq97xhl90pkpl"
      }
    }
  },
@@ -10581,16 +10967,16 @@
  },

  {
-    "path": "org/jacoco/org.jacoco.core/0.8.10",
+    "path": "org/jacoco/org.jacoco.core/0.8.8",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "org.jacoco.core-0.8.10.pom": {
-        "sha1": "e4acd57d7b22eab888cf7a5bac94a2798f6a23cb",
-        "sha256": "12gaf5yl7p4328hvncsgph4ni40lg60k9gplca7b7vww2kayv84k"
+      "org.jacoco.core-0.8.8.pom": {
+        "sha1": "887670d63e8ac0302fde83422824b5e39736e262",
+        "sha256": "09g2zsc854m5qxy2byqfh20rpk384c1jcl531qybh8zqinjbbypm"
      },
-      "org.jacoco.core-0.8.10.jar": {
-        "sha1": "669a338279c3f40b154a64c624bab625664a00e6",
-        "sha256": "020fv0bdhl459nr9jqjl7gdcq6wspkxy92lpxqw3jl57jdynd2g7"
+      "org.jacoco.core-0.8.8.jar": {
+        "sha1": "fb1257ce77ec2fe326aad639b2253e76f481ea2e",
+        "sha256": "0hqnc5jh8ga60d44hxp59f80ycwxnyng1nyz2d3r524xh0pphk27"
      }
    }
  },
@@ -11795,6 +12181,36 @@
    }
  },

+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-jre7-1.2.0.pom": {
+        "sha1": "52d689e2aecf9c5ee2ca40c9512069ea77b4eb06",
+        "sha256": "0j3ka2lfxqxb37dmx4nzm07q88a77yf5wf1mrqs7gayk49y42xr0"
+      },
+      "kotlin-stdlib-jre7-1.2.0.jar": {
+        "sha1": "ec8b969e26fbcf2265a4d1a1539c4d1d4c5af380",
+        "sha256": "09i91z5r1ynll65sa6v61hqkz875q7vaz049zrx7jdyla6whz8n7"
+      }
+    }
+  },
+
+  {
+    "path": "org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0",
+    "repo": "https://repo.maven.apache.org/maven2",
+    "files": {
+      "kotlin-stdlib-jre8-1.2.0.pom": {
+        "sha1": "dd37e31bef41f48317214e93134ff54372bad406",
+        "sha256": "0f5c4jjw8rs5jgyjb2d9j6h1nf5nqcj6aq61s7p5cw6546z78ykb"
+      },
+      "kotlin-stdlib-jre8-1.2.0.jar": {
+        "sha1": "505f55b9619bbc5f5e26c77427dd24a6a441eef1",
+        "sha256": "0an8j2wwpx0mapmpl179xqf242kvjbipxaqxrgvl26ggwvp28db3"
+      }
+    }
+  },
+
  {
    "path": "org/jetbrains/kotlin/kotlin-stdlib/1.1.3-2",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -12156,12 +12572,12 @@
  },

  {
-    "path": "org/junit/junit-bom/5.9.3",
+    "path": "org/junit/junit-bom/5.9.2",
    "repo": "https://repo.maven.apache.org/maven2",
    "files": {
-      "junit-bom-5.9.3.pom": {
-        "sha1": "b1874b6a66656e4f5e4b492ab321249bcb749dc7",
-        "sha256": "1mrf6kf0y6bic98n30w8s9gnxykgzv5j8mx1bh745wkjkv6jj0sd"
+      "junit-bom-5.9.2.pom": {
+        "sha1": "645a08cbe455cad14d8bfb25a35d7f594c53cafd",
+        "sha256": "01gp6mpz7c4vcyrmm0drb05rvdan82d6qiw6d8rzacaihijpvl1f"
      }
    }
  },
@@ -12297,17 +12713,6 @@
    }
  },

-  {
-    "path": "org/ow2/asm/asm-bom/9.5",
-    "repo": "https://repo.maven.apache.org/maven2",
-    "files": {
-      "asm-bom-9.5.pom": {
-        "sha1": "2b5d6f54150ef4cbef69c3b09b281353f42e1366",
-        "sha256": "1grm2s0pqc0s2kl79mhbv3l5zcwbgq3z803gh0wbczc3vlsnnxbi"
-      }
-    }
-  },
-
  {
    "path": "org/ow2/asm/asm-commons/5.1",
    "repo": "https://repo.maven.apache.org/maven2",
@@ -118,6 +118,7 @@ com.airbnb.android:lottie:3.4.4
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
+com.android.databinding:baseLibrary:3.1.4
 com.android.databinding:baseLibrary:3.2.1
 com.android.databinding:baseLibrary:3.3.1
 com.android.databinding:baseLibrary:3.5.4
@@ -125,24 +126,28 @@ com.android.databinding:baseLibrary:4.1.0
 com.android.databinding:compilerCommon:1.0-rc5
 com.android.databinding:compilerCommon:3.0.0
 com.android.databinding:compilerCommon:3.0.1
+com.android.databinding:compilerCommon:3.1.4
 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:protos:26.0.0
 com.android.tools.analytics-library:protos:26.0.1
+com.android.tools.analytics-library:protos:26.1.4
 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:shared:26.0.0
 com.android.tools.analytics-library:shared:26.0.1
+com.android.tools.analytics-library:shared:26.1.4
 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:tracker:26.0.0
 com.android.tools.analytics-library:tracker:26.0.1
+com.android.tools.analytics-library:tracker:26.1.4
 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
@@ -155,6 +160,7 @@ com.android.tools.build.jetifier:jetifier-processor:1.0.0-alpha10
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta02
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta04
 com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09
+com.android.tools.build:aapt2-proto:0.1.0
 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
@@ -162,6 +168,7 @@ com.android.tools.build:aapt2-proto:4.1.0-alpha01-6193524
 com.android.tools.build:aaptcompiler:4.1.0
 com.android.tools.build:apksig:3.0.0
 com.android.tools.build:apksig:3.0.1
+com.android.tools.build:apksig:3.1.4
 com.android.tools.build:apksig:3.2.1
 com.android.tools.build:apksig:3.3.1
 com.android.tools.build:apksig:3.5.4
@@ -175,6 +182,7 @@ 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
 com.android.tools.build:builder-model:3.0.1
+com.android.tools.build:builder-model:3.1.4
 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
@@ -184,6 +192,7 @@ 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
 com.android.tools.build:builder-test-api:3.0.1
+com.android.tools.build:builder-test-api:3.1.4
 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
@@ -193,16 +202,19 @@ com.android.tools.build:builder:1.3.1
 com.android.tools.build:builder:1.5.0
 com.android.tools.build:builder:3.0.0
 com.android.tools.build:builder:3.0.1
+com.android.tools.build:builder:3.1.4
 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:bundletool:0.1.0-alpha01
 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:gradle-api:3.0.0
 com.android.tools.build:gradle-api:3.0.1
+com.android.tools.build:gradle-api:3.1.4
 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
@@ -212,11 +224,13 @@ 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-core:3.1.4
 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
 com.android.tools.build:gradle:3.0.1
+com.android.tools.build:gradle:3.1.4
 com.android.tools.build:gradle:3.2.1
 com.android.tools.build:gradle:3.3.1
 com.android.tools.build:gradle:3.5.4
@@ -226,6 +240,7 @@ 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
 com.android.tools.build:manifest-merger:26.0.1
+com.android.tools.build:manifest-merger:26.1.4
 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
@@ -237,6 +252,7 @@ com.android.tools.ddms:ddmlib:24.3.1
 com.android.tools.ddms:ddmlib:24.5.0
 com.android.tools.ddms:ddmlib:26.0.0
 com.android.tools.ddms:ddmlib:26.0.1
+com.android.tools.ddms:ddmlib:26.1.4
 com.android.tools.ddms:ddmlib:26.2.1
 com.android.tools.ddms:ddmlib:26.3.1
 com.android.tools.ddms:ddmlib:26.5.4
@@ -256,6 +272,7 @@ 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
 com.android.tools.layoutlib:layoutlib-api:26.0.1
+com.android.tools.layoutlib:layoutlib-api:26.1.4
 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
@@ -272,6 +289,7 @@ com.android.tools.lint:lint-checks:24.5.0
 com.android.tools.lint:lint-checks:26.0.0
 com.android.tools.lint:lint-checks:26.0.1
 com.android.tools.lint:lint-checks:27.1.0
+com.android.tools.lint:lint-gradle-api:26.1.4
 com.android.tools.lint:lint-gradle-api:26.2.1
 com.android.tools.lint:lint-gradle-api:26.3.1
 com.android.tools.lint:lint-gradle-api:26.5.4
@@ -289,6 +307,7 @@ com.android.tools:annotations:24.3.1
 com.android.tools:annotations:24.5.0
 com.android.tools:annotations:26.0.0
 com.android.tools:annotations:26.0.1
+com.android.tools:annotations:26.1.4
 com.android.tools:annotations:26.2.1
 com.android.tools:annotations:26.3.1
 com.android.tools:annotations:26.5.4
@@ -298,6 +317,7 @@ com.android.tools:common:24.3.1
 com.android.tools:common:24.5.0
 com.android.tools:common:26.0.0
 com.android.tools:common:26.0.1
+com.android.tools:common:26.1.4
 com.android.tools:common:26.2.1
 com.android.tools:common:26.3.1
 com.android.tools:common:26.5.4
@@ -307,12 +327,14 @@ com.android.tools:dvlib:24.3.1
 com.android.tools:dvlib:24.5.0
 com.android.tools:dvlib:26.0.0
 com.android.tools:dvlib:26.0.1
+com.android.tools:dvlib:26.1.4
 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:repository:26.0.0
 com.android.tools:repository:26.0.1
+com.android.tools:repository:26.1.4
 com.android.tools:repository:26.2.1
 com.android.tools:repository:26.3.1
 com.android.tools:repository:26.5.4
@@ -322,6 +344,7 @@ com.android.tools:sdklib:24.3.1
 com.android.tools:sdklib:24.5.0
 com.android.tools:sdklib:26.0.0
 com.android.tools:sdklib:26.0.1
+com.android.tools:sdklib:26.1.4
 com.android.tools:sdklib:26.2.1
 com.android.tools:sdklib:26.3.1
 com.android.tools:sdklib:26.5.4
@@ -331,6 +354,7 @@ com.android.tools:sdk-common:24.3.1
 com.android.tools:sdk-common:24.5.0
 com.android.tools:sdk-common:26.0.0
 com.android.tools:sdk-common:26.0.1
+com.android.tools:sdk-common:26.1.4
 com.android.tools:sdk-common:26.2.1
 com.android.tools:sdk-common:26.3.1
 com.android.tools:sdk-common:26.5.4
@@ -391,11 +415,13 @@ com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.2.4
 com.google.code.gson:gson:2.3
+com.google.code.gson:gson:2.7
 com.google.code.gson:gson:2.8.0
 com.google.code.gson:gson:2.8.5
 com.google.code.gson:gson:2.8.6
 com.google.crypto.tink:tink:1.3.0-rc2
 com.google.errorprone:error_prone_annotations:2.0.18
+com.google.errorprone:error_prone_annotations:2.1.2
 com.google.errorprone:error_prone_annotations:2.2.0
 com.google.errorprone:error_prone_annotations:2.3.1
 com.google.errorprone:error_prone_annotations:2.3.2
@@ -569,7 +595,10 @@ 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.10
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.0
+org.jetbrains.kotlin:kotlin-stdlib-jre8:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib:1.1.3-2
+org.jetbrains.kotlin:kotlin-stdlib:1.2.0
 org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
@@ -122,12 +122,14 @@ https://dl.google.com/dl/android/maven2/android/arch/lifecycle/common/1.0.0/comm
 https://dl.google.com/dl/android/maven2/android/arch/lifecycle/runtime/1.0.0/runtime-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.1.4/baseLibrary-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.4/baseLibrary-3.5.4.pom
 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/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/databinding/compilerCommon/3.1.4/compilerCommon-3.1.4.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/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
@@ -155,28 +157,33 @@ 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/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.1.4/protos-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.3.1/protos-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.5.4/protos-26.5.4.pom
 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/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.1.4/shared-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.3.1/shared-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.5.4/shared-26.5.4.pom
 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/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.1.4/tracker-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.3.1/tracker-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.5.4/tracker-26.5.4.pom
 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/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.1.4/annotations-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.3.1/annotations-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.5.4/annotations-26.5.4.pom
 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/build/aapt2-proto/0.1.0/aapt2-proto-0.1.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
@@ -184,6 +191,7 @@ 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/aaptcompiler/4.1.0/aaptcompiler-4.1.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.1.4/apksig-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.3.1/apksig-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.5.4/apksig-3.5.4.pom
@@ -194,36 +202,43 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.5.4/ap
 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/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.1.4/builder-model-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.3.1/builder-model-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.5.4/builder-model-3.5.4.pom
 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-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.1.4/builder-test-api-3.1.4.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
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.3.1/builder-test-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.5.4/builder-test-api-3.5.4.pom
 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/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.1.4/builder-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.3.1/builder-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.5.4/builder-3.5.4.pom
 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/bundletool/0.1.0-alpha01/bundletool-0.1.0-alpha01.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
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.14.0/bundletool-0.14.0.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.1.4/gradle-api-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.3.1/gradle-api-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.5.4/gradle-api-3.5.4.pom
 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-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-core/3.1.4/gradle-core-3.1.4.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.1.4/gradle-3.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.3.1/gradle-3.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.5.4/gradle-3.5.4.pom
@@ -238,24 +253,28 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifie
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta09/jetifier-processor-1.0.0-beta09.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.1.4/manifest-merger-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.3.1/manifest-merger-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.5.4/manifest-merger-26.5.4.pom
 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/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.1.4/common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.3.1/common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.5.4/common-26.5.4.pom
 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/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.1.4/ddmlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.3.1/ddmlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.5.4/ddmlib-26.5.4.pom
 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/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.1.4/dvlib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.3.1/dvlib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.5.4/dvlib-26.5.4.pom
@@ -269,6 +288,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/27.1.0/uast-27.1.0.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.1.4/layoutlib-api-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.3.1/layoutlib-api-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.5.4/layoutlib-api-26.5.4.pom
@@ -279,6 +299,7 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/27.1.0/l
 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/27.1.0/lint-checks-27.1.0.pom
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.1.4/lint-gradle-api-26.1.4.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
@@ -290,18 +311,21 @@ https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/27.1.0/lint-27.1.0.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.1.4/repository-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.3.1/repository-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.5.4/repository-26.5.4.pom
 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/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.1.4/sdklib-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.3.1/sdklib-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.5.4/sdklib-26.5.4.pom
 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/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.1.4/sdk-common-26.1.4.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1.pom
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.5.4/sdk-common-26.5.4.pom
@@ -472,11 +496,13 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.6/gson-2.8.6.pom
 https://repo.maven.apache.org/maven2/com/google/crypto/tink/tink/1.3.0-rc2/tink-1.3.0-rc2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.0.18/error_prone_annotations-2.0.18.pom
+https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.1.2/error_prone_annotations-2.1.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.2.0/error_prone_annotations-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.1/error_prone_annotations-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.3.2/error_prone_annotations-2.3.2.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.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.1.2/error_prone_parent-2.1.2.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
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.2/error_prone_parent-2.3.2.pom
@@ -546,10 +572,10 @@ 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/javax.activation/1.2.0/javax.activation-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/2.21/istack-commons-runtime-2.21.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/3.0.7/istack-commons-runtime-3.0.7.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.2.0/istack-commons-runtime-4.2.0.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons-runtime/4.1.1/istack-commons-runtime-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/2.21/istack-commons-2.21.pom
 https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/3.0.7/istack-commons-3.0.7.pom
-https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.2.0/istack-commons-4.2.0.pom
+https://repo.maven.apache.org/maven2/com/sun/istack/istack-commons/4.1.1/istack-commons-4.1.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.2.11/jaxb-bom-ext-2.2.11.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/2.3.1/jaxb-bom-ext-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/sun/xml/bind/jaxb-bom-ext/4.0.2/jaxb-bom-ext-4.0.2.pom
@@ -577,7 +603,7 @@ https://repo.maven.apache.org/maven2/com/tunnelvisionlabs/antlr4/4.5/antlr4-4.5.
 https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/3.4.3/gradle-download-task-3.4.3.pom
 https://repo.maven.apache.org/maven2/de/undercouch/gradle-download-task/4.0.2/gradle-download-task-4.0.2.pom
 https://repo.maven.apache.org/maven2/it/unimi/dsi/fastutil/7.2.0/fastutil-7.2.0.pom
-https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.2/jakarta.activation-api-2.1.2.pom
+https://repo.maven.apache.org/maven2/jakarta/activation/jakarta.activation-api/2.1.1/jakarta.activation-api-2.1.1.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-parent/4.0.0/jakarta.xml.bind-api-parent-4.0.0.pom
 https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api/4.0.0/jakarta.xml.bind-api-4.0.0.pom
 https://repo.maven.apache.org/maven2/javax/activation/activation/1.1/activation-1.1.pom
@@ -693,7 +719,7 @@ https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov
 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/3.34.0/checker-qual-3.34.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.32.0/checker-qual-3.32.0.pom
 https://repo.maven.apache.org/maven2/org/codehaus/codehaus-parent/4/codehaus-parent-4.pom
 https://repo.maven.apache.org/maven2/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.pom
@@ -713,8 +739,8 @@ https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/eas
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/5.1.0/easymock-parent-5.1.0.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock/5.1.0/easymock-5.1.0.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.1/angus-activation-project-2.0.1.pom
-https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.1/angus-activation-2.0.1.pom
+https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation-project/2.0.0/angus-activation-project-2.0.0.pom
+https://repo.maven.apache.org/maven2/org/eclipse/angus/angus-activation/2.0.0/angus-activation-2.0.0.pom
 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
@@ -735,9 +761,9 @@ https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-cor
 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.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.10/org.jacoco.build-0.8.10.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.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.10/org.jacoco.core-0.8.10.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.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.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
@@ -818,6 +844,8 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.10/kotlin-stdlib-jdk8-1.4.10.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.8.0/kotlin-stdlib-jdk8-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre7/1.2.0/kotlin-stdlib-jre7-1.2.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jre8/1.2.0/kotlin-stdlib-jre8-1.2.0.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
@@ -842,7 +870,7 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.4.3
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
 https://repo.maven.apache.org/maven2/org/json/json/20180813/json-20180813.pom
 https://repo.maven.apache.org/maven2/org/json/json/20230227/json-20230227.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.9.2/junit-bom-5.9.2.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/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
@@ -852,7 +880,6 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.1/asm-analysis-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/6.0/asm-analysis-6.0.pom
 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-bom/9.5/asm-bom-9.5.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
@@ -30,9 +30,9 @@ react-native-orientation-locker
 react-native-permissions
 react-native-randombytes
 react-native-reanimated
+react-native-safe-area-context
 react-native-shake
 react-native-share
-react-native-static-safe-area-insets
 react-native-status
 react-native-status-keycard
 react-native-svg
@@ -46,7 +46,7 @@ function fetch_and_template_file() {
    OBJ_URL="${REPO_URL}/${PKG_PATH}/${FILENAME}"
    if ! OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_URL}"); then
        echo " ! Failed to fetch: ${OBJ_URL}" >&2
-        return 1
+        exit 1
    fi

    OBJ_NAME="${FILENAME}"
@@ -58,10 +58,6 @@ function fetch_and_template_file() {
      }"
 }

-function fetch_and_template_file_no_fail() {
-    fetch_and_template_file "${1}" 2>/dev/null || true
-}
-
 if [[ -z "${1}" ]]; then
    echo "Required POM URL argument not given!" >&2
    exit 1
@@ -115,7 +111,7 @@ echo -ne "
      }"

 # Some deps are just POMs, in which case there is no JAR to fetch.
-[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file_no_fail "${PKG_NAME}.jar"
+[[ "${OBJ_TYPE}" == "" ]]        && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" == "jar" ]]     && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" == "bundle" ]]  && fetch_and_template_file "${PKG_NAME}.jar"
 [[ "${OBJ_TYPE}" =~ aar* ]]      && fetch_and_template_file "${PKG_NAME}.aar"
@@ -15,7 +15,6 @@ stdenv.mkDerivation {
    "patchYogaNodePackagePhase"
    "patchReactNativePhase"
    "patchPodPhase"
-    "patchReactNativeXcodeScriptPhase"
    "installPhase"
  ];

@@ -107,18 +106,6 @@ stdenv.mkDerivation {
          '[RCTConvert UIColor:options.tintColor() ? @(*options.tintColor()) : nil];'
  '';

-# Patch React Native Xcode Script that searches for nvm
-# FIXME: Remove this once we upgrade react-native to 0.69.x
-    patchReactNativeXcodeScriptPhase = ''
-      substituteInPlace ./node_modules/react-native/scripts/find-node.sh --replace \
-              '# Define NVM_DIR and source the nvm.sh setup script' \
-              '<<MULTI_LINE_COMMENT${"\n"}# Define NVM_DIR and source the nvm.sh setup script'
-
-      substituteInPlace ./node_modules/react-native/scripts/find-node.sh --replace \
-              '# Set up the nodenv node version manager if present' \
-              'MULTI_LINE_COMMENT${"\n"}# Set up the nodenv node version manager if present'
-    '';
-

  # The ELF types are incompatible with the host platform, so let's not even try
  # TODO: Use Android NDK to strip binaries manually
@@ -1,9 +1,6 @@
-{ callPackage, lib, mkShell, pkgs, stdenv
+{ callPackage, lib, mkShell, pkgs
 , status-go, fastlane }:

-assert lib.assertMsg stdenv.isDarwin
-  "iOS development shell supported only on OSX.";
-
 let
  inherit (lib) catAttrs unique;

@@ -20,7 +17,6 @@ in {
    buildInputs = with pkgs; [
      xcodeWrapper watchman procps
      flock # used in nix/scripts/node_modules.sh
-      ios-deploy # used in 'make run-ios-device'
    ];

    # WARNING: Executes shellHook in reverse order.
@@ -1,15 +1,15 @@
 { mkShell, nodejs, deps }:

 mkShell {
+  # Check if node modules changed and if so install them.
  shellHook = ''
    # Fix for ERR_OSSL_EVP_UNSUPPORTED error.
    export NODE_OPTIONS="--openssl-legacy-provider";
-    # Same fix but for Xcode React Native script.
-    export NODE_ARGS="--openssl-legacy-provider --max-old-space-size=16384";
+
    # Fix Xcode using system Node.js version.
    export NODE_BINARY="${nodejs}/bin/node";

-    # Check if node modules changed and if so install them.
+    export STATUS_MOBILE_HOME=$(git rev-parse --show-toplevel)
    "$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${deps.nodejs-patched}
  '';
 }
@@ -44,25 +44,13 @@ in {
    });
  };

-  # Fix for missing libarclite_macosx.a in Xcode 14.3.
-  # https://github.com/ios-control/ios-deploy/issues/580
-  ios-deploy = super.darwin.ios-deploy.overrideAttrs (old: rec {
-    version = "1.12.2";
-    src = super.fetchFromGitHub {
-      owner = "ios-control";
-      repo = "ios-deploy";
-      rev = version;
-      sha256 = "sha256-TVGC+f+1ow3b93CK3PhIL70le5SZxxb2ug5OkIg8XCA";
-    };
-  });
-
  # Package version adjustments
  gradle = super.gradle_6;
  nodejs = super.nodejs-18_x;
  yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
  openjdk = super.openjdk8_headless;
  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    version = "14.0";
+    version = "13.3";
    allowHigher = true;
  };
  go = super.go_1_19;
@@ -8,9 +8,6 @@ assert stdenv.isDarwin;

 stdenv.mkDerivation {
  name = "xcode-wrapper-${version}${if allowHigher then "-plus" else ""}";
-  # Fix 'xcodebuild: Operation not permitted' when 'sandbox=relaxed' is used.
-  # https://github.com/NixOS/nixpkgs/pull/228696
-  __noChroot = stdenv.isDarwin;
  buildCommand = ''
    mkdir -p $out/bin
    cd $out/bin
@@ -12,19 +12,22 @@ let
  # the default shell with most commonly used tools
  default = callPackage ./shell.nix { };

+  # Combines with many other shells
+  nodejs-sh = targets.mobile.ios.nodejs-sh;
+
  # An attrset for easier merging with default shell
  shells = {
    inherit default;

+    nodejs = nodejs-sh;
+
    # for calling clojure targets in CI or Makefile
    clojure = mkShell {
      buildInputs = with pkgs; [ clojure flock maven openjdk ];
+      inputsFrom = [ nodejs-sh ];
      # CLASSPATH from clojure deps with 'src' appended to find local sources.
      shellHook = with pkgs; ''
        export CLASS_PATH="$(find ${deps.clojure} -iname '*.jar' | tr '\n' ':')src"
-
-        # Check if node modules changed and if so install them.
-        "$STATUS_MOBILE_HOME/nix/scripts/node_modules.sh" ${pkgs.deps.nodejs-patched}
      '';
    };

@@ -63,9 +63,9 @@
    "react-native-randombytes": "^3.6.1",
    "react-native-reanimated": "2.3.3",
    "react-native-redash": "^16.0.11",
+    "react-native-safe-area-context": "^2.0.0",
    "react-native-shake": "^3.3.1",
    "react-native-share": "^7.0.1",
-    "react-native-static-safe-area-insets": "^2.2.0",
    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.39",
    "react-native-svg": "^9.8.4",
    "react-native-touch-id": "^4.4.1",
@@ -18,11 +18,11 @@ export function stackOpacity (stackId, selectedStackId) {
  );
 }

-export function stackZIndex (stackId, selectedStackId) {
+export function stackPointer (stackId, selectedStackId) {
  return useDerivedValue(
    function () {
      'worklet'
-      return selectedStackId.value == stackId ? 10 : 9;
+      return selectedStackId.value == stackId ? "auto" : "none";
    }
  );
 }
@@ -141,7 +141,6 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
   {:ClipPath #js {:render identity}
    :Circle   #js {:render identity}
    :Defs     #js {:render identity}
-    :G        #js {:render identity}
    :Path     #js {:render identity}
    :Rect     #js {:render identity}
    :SvgUri   #js {:render identity}
@@ -155,7 +154,10 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
 (def net-info #js {})
 (def touchid #js {})
 (def react-native-image-viewing #js {:default {}})
-(def react-native-static-safe-area-insets #js {:default {}})
+(def safe-area-context
+  (clj->js {:SafeAreaProvider      {:_reactNativeIphoneXHelper {:getStatusBarHeight (fn [])}}
+            :SafeAreaInsetsContext {:Consumer (fn [])}
+            :SafeAreaView          {}}))

 (def back-handler
  #js
@@ -364,7 +366,7 @@ globalThis.__STATUS_MOBILE_JS_IDENTITY_PROXY__ = new Proxy({}, {get() { return (
    "react-native-background-timer"                 background-timer
    "react-native-image-crop-picker"                image-crop-picker
    "react-native-gesture-handler"                  react-native-gesture-handler
-    "react-native-static-safe-area-insets"          react-native-static-safe-area-insets
+    "react-native-safe-area-context"                safe-area-context
    "react-native-config"                           config
    "react-native-iphone-x-helper"                  (clj->js {:getStatusBarHeight (fn [])
                                                              :getBottomSpace     (fn [])})
@@ -2,10 +2,10 @@
  (:require [oops.core :refer [oget]]
            [quo.animated :as animated]
            [quo.components.header :as header]
+            [quo.components.safe-area :as safe-area]
            [quo.design-system.colors :as colors]
            [quo.platform :as platform]
-            [reagent.core :as reagent]
-            [react-native.safe-area :as safe-area]))
+            [reagent.core :as reagent]))

 (defn header-wrapper-style
  [{:keys [value offset]}]
@@ -95,9 +95,11 @@
 (defn header
  [{:keys [use-insets] :as props} & children]
  (if use-insets
-    [header-container
-     (-> props
-         (dissoc :use-insets)
-         (assoc :insets (safe-area/get-insets)))
-     children]
+    [safe-area/consumer
+     (fn [insets]
+       [header-container
+        (-> props
+            (dissoc :use-insets)
+            (assoc :insets insets))
+        children])]
    [header-container props children]))
@@ -2,13 +2,13 @@
  (:require [cljs-bean.core :as bean]
            [quo.animated :as animated]
            [quo.components.bottom-sheet.style :as styles]
+            [quo.components.safe-area :as safe-area]
            [quo.design-system.colors :as colors]
            [quo.gesture-handler :as gesture-handler]
            [quo.platform :as platform]
            [quo.react :as react]
            [quo.react-native :as rn]
-            [reagent.core :as reagent]
-            [react-native.safe-area :as safe-area]))
+            [reagent.core :as reagent]))

 (def opacity-coeff 0.8)
 (def close-duration 150)
@@ -43,7 +43,7 @@
        (rn/use-keyboard)
        keyboard-height-android-delta
        (if (and platform/android? keyboard-shown) (+ keyboard-height 20) 0)
-        safe-area (safe-area/get-insets)
+        safe-area (safe-area/use-safe-area)
        window-height (- window-height
                         (if platform/android?
                           (+ 50 keyboard-height-android-delta) ;; TODO : remove 50 when
@@ -0,0 +1,23 @@
+(ns quo.components.safe-area
+  (:require ["react-native-safe-area-context" :as safe-area-context :refer
+             (SafeAreaView SafeAreaProvider SafeAreaInsetsContext useSafeAreaInsets)]
+            [reagent.core :as reagent]))
+
+(def provider (reagent/adapt-react-class SafeAreaProvider))
+(def ^:private consumer-raw (reagent/adapt-react-class (.-Consumer ^js SafeAreaInsetsContext)))
+(def view (reagent/adapt-react-class SafeAreaView))
+
+(defn consumer
+  [component]
+  [consumer-raw
+   (fn [insets]
+     (reagent/as-element
+      [component (js->clj insets :keywordize-keys true)]))])
+
+(defn use-safe-area
+  []
+  (let [insets (useSafeAreaInsets)]
+    {:top    (.-top ^js insets)
+     :bottom (.-bottom ^js insets)
+     :left   (.-left ^js insets)
+     :right  (.-right ^js insets)}))
@@ -8,6 +8,7 @@
            [quo.components.list.header :as list-header]
            [quo.components.list.index :as list-index]
            [quo.components.list.item :as list-item]
+            [quo.components.safe-area :as safe-area]
            [quo.components.separator :as separator]
            [quo.components.text :as text]
            [quo.components.text-input :as text-input]
@@ -28,5 +29,8 @@
 (def switch controls/switch)
 (def radio controls/radio)
 (def checkbox controls/checkbox)
+(def safe-area-provider safe-area/provider)
+(def safe-area-consumer safe-area/consumer)
+(def safe-area-view safe-area/view)
 (def separator separator/separator)
 (def get-color colors/get-color)
@@ -71,7 +71,7 @@
     {:background-color (:ui-background @colors/theme)
      :flex             1}
     [rn/flat-list
-      {:flex                         1
-       :keyboard-should-persist-taps :always
-       :header                       [cool-preview]
-       :key-fn                       str}]]))
+      {:flex                      1
+       :keyboardShouldPersistTaps :always
+       :header                    [cool-preview]
+       :key-fn                    str}]]))
@@ -79,7 +79,7 @@
   {:background-color (:ui-background @colors/theme)
    :flex             1}
   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :key-fn                       str}]])
+    {:flex                      1
+     :keyboardShouldPersistTaps :always
+     :header                    [cool-preview]
+     :key-fn                    str}]])
@@ -44,8 +44,8 @@
   {:background-color (:ui-background @colors/theme)
    :flex             1}
   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :data                         all-props
-     :render-fn                    render-item
-     :key-fn                       str}]])
+    {:flex                      1
+     :keyboardShouldPersistTaps :always
+     :data                      all-props
+     :render-fn                 render-item
+     :key-fn                    str}]])
@@ -113,9 +113,9 @@
   {:background-color (:ui-background @colors/theme)
    :flex             1}
   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :data                         all-props
-     :render-fn                    render-item
-     :key-fn                       str}]])
+    {:flex                      1
+     :keyboardShouldPersistTaps :always
+     :header                    [cool-preview]
+     :data                      all-props
+     :render-fn                 render-item
+     :key-fn                    str}]])
@@ -91,9 +91,9 @@
   {:background-color (:ui-background @colors/theme)
    :flex             1}
   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :data                         all-props
-     :render-fn                    render-item
-     :key-fn                       str}]])
+    {:flex                      1
+     :keyboardShouldPersistTaps :always
+     :header                    [cool-preview]
+     :data                      all-props
+     :render-fn                 render-item
+     :key-fn                    str}]])
@@ -83,9 +83,9 @@
   {:background-color (:ui-background @colors/theme)
    :flex             1}
   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :header                       [cool-preview]
-     :data                         all-props
-     :render-fn                    render-item
-     :key-fn                       str}]])
+    {:flex                      1
+     :keyboardShouldPersistTaps :always
+     :header                    [cool-preview]
+     :data                      all-props
+     :render-fn                 render-item
+     :key-fn                    str}]])
@@ -31,8 +31,8 @@
   {:background-color (:ui-background @colors/theme)
    :flex             1}
   [rn/flat-list
-    {:flex                         1
-     :keyboard-should-persist-taps :always
-     :data                         all-props
-     :render-fn                    render-item
-     :key-fn                       str}]])
+    {:flex                      1
+     :keyboardShouldPersistTaps :always
+     :data                      all-props
+     :render-fn                 render-item
+     :key-fn                    str}]])
@@ -30,7 +30,7 @@
    (reanimated/set-shared-value scroll-y current-y)))

 (defn header
-  [{:keys [theme-color f-display-picture-comp cover-uri title-comp]} top-inset scroll-y]
+  [{:keys [theme-color display-picture-comp cover-uri title-comp]} top-inset scroll-y]
  (let [input-range        [0 (* threshold 0.33)]
        picture-scale-down 0.4
        size-animation     (interpolate scroll-y input-range [80 (* 80 picture-scale-down)])
@@ -48,49 +48,50 @@
     [reanimated/view {:style (style/header-bottom-part border-animation)}
      [title-comp]]
     [reanimated/view {:style (style/entity-picture size-animation)}
-      [:f> f-display-picture-comp image-animation]]]))
-
-(defn- f-animated-header-list
-  [{:keys [header-comp main-comp back-button-on-press] :as params}]
-  (let [window-height           (:height (rn/get-window))
-        {:keys [top bottom]}    (safe-area/get-insets)
-        ;; view height calculation is different because window height is different on iOS and Android:
-        view-height             (if platform/ios?
-                                  (- window-height bottom)
-                                  (+ window-height top))
-        initial-y               (if platform/ios? (- top) 0)
-        scroll-y                (reanimated/use-shared-value initial-y)
-        opacity-animation       (interpolate scroll-y
-                                             [(* threshold 0.33) (* threshold 0.66)]
-                                             [0 1])
-        translate-animation     (interpolate scroll-y [(* threshold 0.66) threshold] [100 56])
-        title-opacity-animation (interpolate scroll-y [(* threshold 0.66) threshold] [0 1])]
-    [rn/view {:style (style/container-view view-height)}
-     [rn/touchable-opacity
-      {:active-opacity 1
-       :on-press       back-button-on-press
-       :style          (style/button-container {:left 20})}
-      [quo/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
-     [rn/touchable-opacity
-      {:active-opacity 1
-       :style          (style/button-container {:right 20})}
-      [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
-     [reanimated/blur-view
-      {:blurAmount   32
-       :blurType     :light
-       :overlayColor (if platform/ios? colors/white-opa-70 :transparent)
-       :style        (style/blur-view opacity-animation)}
-      [reanimated/view {:style (style/header-comp translate-animation title-opacity-animation)}
-       [header-comp]]]
-     [reanimated/flat-list
-      {:data                  [nil]
-       :render-fn             main-comp
-       :key-fn                str
-       :header                (reagent/as-element (header params top scroll-y))
-       ;; TODO: https://github.com/status-im/status-mobile/issues/14924
-       :scroll-event-throttle 8
-       :on-scroll             (fn [event] (scroll-handler event initial-y scroll-y))}]]))
+      [display-picture-comp image-animation]]]))

 (defn animated-header-list
-  [params]
-  [:f> f-animated-header-list params])
+  [{:keys [header-comp main-comp back-button-on-press] :as parameters}]
+  [safe-area/consumer
+   (fn [insets]
+     (let [window-height     (:height (rn/get-window))
+           status-bar-height (rn/status-bar-height)
+           bottom-inset      (:bottom insets)
+           ;; view height calculation is different because window height is different on iOS and Android:
+           view-height       (if platform/ios?
+                               (- window-height bottom-inset)
+                               (+ window-height status-bar-height))
+           initial-y         (if platform/ios? (- (:top insets)) 0)]
+       [:f>
+        (fn []
+          (let [scroll-y                (reanimated/use-shared-value initial-y)
+                opacity-animation       (interpolate scroll-y
+                                                     [(* threshold 0.33) (* threshold 0.66)]
+                                                     [0 1])
+                translate-animation     (interpolate scroll-y [(* threshold 0.66) threshold] [100 56])
+                title-opacity-animation (interpolate scroll-y [(* threshold 0.66) threshold] [0 1])]
+            [rn/view {:style (style/container-view view-height)}
+             [rn/touchable-opacity
+              {:active-opacity 1
+               :on-press       back-button-on-press
+               :style          (style/button-container {:left 20})}
+              [quo/icon :i/arrow-left {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
+             [rn/touchable-opacity
+              {:active-opacity 1
+               :style          (style/button-container {:right 20})}
+              [quo/icon :i/options {:size 20 :color (colors/theme-colors colors/black colors/white)}]]
+             [reanimated/blur-view
+              {:blurAmount   32
+               :blurType     :light
+               :overlayColor (if platform/ios? colors/white-opa-70 :transparent)
+               :style        (style/blur-view opacity-animation)}
+              [reanimated/view {:style (style/header-comp translate-animation title-opacity-animation)}
+               [header-comp]]]
+             [reanimated/flat-list
+              {:data                  [nil]
+               :render-fn             main-comp
+               :key-fn                str
+               :header                (reagent/as-element (header parameters (:top insets) scroll-y))
+               ;; TODO: https://github.com/status-im/status-mobile/issues/14924
+               :scroll-event-throttle 8
+               :on-scroll             (fn [event] (scroll-handler event initial-y scroll-y))}]]))]))])
@@ -11,7 +11,7 @@
            :inner                   44
            :status-indicator        12
            :status-indicator-border 2
-            :font-size               :heading-2}
+            :font-size               :paragraph-1}
   :small  {:outer                   32
            :inner                   28
            :status-indicator        12
@@ -1,20 +0,0 @@
-(ns quo2.components.buttons.predictive-keyboard.component-spec
-  (:require [quo2.components.buttons.predictive-keyboard.view :as predictive-keyboard]
-            [test-helpers.component :as h]))
-
-(h/describe "predictive-keyboard"
-  (h/test "basic render"
-    (h/render [predictive-keyboard/view {:type :error :text "Error message"}])
-    (h/is-truthy (h/get-by-label-text :predictive-keyboard)))
-  (h/test "rendered with correct text"
-    (h/render [predictive-keyboard/view {:type :info :text "Error message"}])
-    (h/is-truthy (h/get-by-text "Error message")))
-  (h/test "rendered with correct words"
-    (h/render [predictive-keyboard/view {:type :words :words ["lab" "label"]}])
-    (h/is-truthy (h/get-by-text "lab"))
-    (h/is-truthy (h/get-by-text "label")))
-  (h/test "word press event"
-    (let [event (h/mock-fn)]
-      (h/render [predictive-keyboard/view {:type :words :words ["lab" "label"] :on-press #(event %)}])
-      (h/fire-event :press (h/get-by-text "lab"))
-      (h/was-called event))))
@@ -1,11 +0,0 @@
-(ns quo2.components.buttons.predictive-keyboard.style)
-
-(defn wrapper
-  [type]
-  {:flex               1
-   :min-height         48
-   :padding-vertical   8
-   :justify-content    :center
-   :padding-horizontal (if (= type :words) 0 20)})
-
-(def word-list {:align-items :center :padding-horizontal 20})
@@ -1,71 +0,0 @@
-(ns quo2.components.buttons.predictive-keyboard.view
-  (:require [react-native.core :as rn]
-            [quo2.components.buttons.predictive-keyboard.style :as style]
-            [quo2.components.info.info-message :as info-message]
-            [react-native.linear-gradient :as linear-gradient]
-            [quo2.foundations.colors :as colors]
-            [quo2.components.buttons.button :as button]))
-
-(def ^:private gradients
-  {:light [(colors/alpha colors/neutral-40 0.05) (colors/alpha colors/neutral-40 0)]
-   :dark  [(colors/alpha colors/neutral-80 0.7) (colors/alpha colors/neutral-80 0)]
-   :blur  [colors/white-opa-5 colors/white-opa-0]})
-
-(defn- word-component
-  [word _ _ {:keys [blur? on-press]}]
-  [button/button
-   (merge {:type     :blur-bg
-           :size     32
-           :on-press #(on-press word)}
-          (when blur? {:override-theme :dark}))
-   word])
-
-(defn- separator
-  []
-  [rn/view {:style {:width 8}}])
-
-(defn view
-  "Options
-   - `type` `:words`/`:error`/`:info`/`:empty`.
-   - `blur?` Boolean to enable blur background support.
-   - `text`  error/info text.
-   - `words` List of words to display in the keyboard.
-   - `on-press` Callback called when a word is pressed `(fn [word])`."
-  [{:keys [type blur? text words on-press]}]
-  [linear-gradient/linear-gradient
-   {:style               {:flex-direction :row}
-    :accessibility-label :predictive-keyboard
-    :colors              (if blur?
-                           (gradients :blur)
-                           (colors/theme-colors (gradients :light) (gradients :dark)))}
-   [rn/view {:style (style/wrapper type)}
-    (case type
-      :words
-      [rn/flat-list
-       {:data                              words
-        :content-container-style           style/word-list
-        :render-fn                         word-component
-        :render-data                       {:blur?    blur?
-                                            :on-press on-press}
-        :shows-horizontal-scroll-indicator false
-        :separator                         [separator]
-        :horizontal                        true
-        :key-fn                            str}]
-
-      :error
-      [info-message/info-message
-       {:icon :i/info
-        :size :default
-        :type :error}
-       text]
-
-      :info
-      [info-message/info-message
-       (merge {:icon :i/info
-               :size :default
-               :type (if (= type :error) :error :default)}
-              (when blur?
-                {:text-color colors/white-opa-70
-                 :icon-color colors/white-opa-70}))
-       text]
-      nil)]])
@@ -65,10 +65,10 @@
      18 ;; ~ 9 is char width, 18 is width used in Figma.
      (* 9 max-line-digits font-scale))))

-(defn- f-native-renderer
+(defn- native-renderer
  [{:keys [rows max-lines on-copy-press]
    :or   {max-lines ##Inf}}]
-  (let [font-scale          (:font-scale (rn/get-window))
+  (let [font-scale          (:font-scale (rn/use-window-dimensions))
        total-rows          (count rows)
        number-rows-to-show (min (count rows) max-lines)
        line-number-width   (calc-line-number-width font-scale number-rows-to-show)
@@ -100,7 +100,7 @@
   {:language          language
    :renderer          (fn [^js/Object props]
                         (reagent/as-element
-                          [:f> f-native-renderer
+                          [:f> native-renderer
                           {:rows          (-> props .-rows bean/->clj)
                            :on-copy-press #(when on-copy-press (on-copy-press children))
                            :max-lines     max-lines}]))
@@ -4,7 +4,7 @@
    [quo2.foundations.colors :as colors]
    [quo2.theme :as theme]
    [react-native.core :as rn]
-    [utils.number]))
+    [utils.number :as utils-number]))

 (def themes
  {:light {:default   colors/primary-50
@@ -31,7 +31,7 @@
                            (= type :default))
                         colors/white
                         colors/neutral-100))
-        value      (utils.number/parse-int value)
+        value      (utils-number/parse-int value)
        label      (if (> value max-value)
                     (str max-value "+")
                     (str value))
@@ -1,19 +0,0 @@
-(ns quo2.components.counter.step.component-spec
-  (:require [quo2.components.counter.step.view :as step]
-            [test-helpers.component :as h]))
-
-(h/describe "step component"
-  (h/test "default render of step component"
-    (h/render [step/step {} nil])
-    (-> (h/expect (h/query-by-label-text :step-counter))
-        (h/is-truthy)))
-
-  (h/test "renders step with a string value"
-    (h/render [step/step {} "1"])
-    (-> (h/expect (h/get-by-text "1"))
-        (h/is-truthy)))
-
-  (h/test "renders step with an integer value"
-    (h/render [step/step {} 1])
-    (-> (h/expect (h/get-by-text "1"))
-        (h/is-truthy))))
@@ -1,41 +0,0 @@
-(ns quo2.components.counter.step.style
-  (:require
-    [quo2.foundations.colors :as colors]))
-
-(def container-base
-  {:align-items     :center
-   :justify-content :center
-   :border-radius   6
-   :height          20})
-
-(defn neutral-border-color
-  [in-blur-view? override-theme]
-  (if in-blur-view?
-    (colors/theme-colors colors/white-opa-10 colors/neutral-80-opa-5 override-theme)
-    (colors/theme-colors colors/neutral-20 colors/neutral-80 override-theme)))
-
-(def active-background-color (colors/custom-color :blue 50 10))
-(def complete-background-color (colors/custom-color :blue 50))
-
-(defn container
-  [size type in-blur-view? override-theme]
-  (cond-> container-base
-    (#{1 2} size) (assoc :width 20)
-    (= size 3) (assoc :width 28)
-
-    (= type :neutral)
-    (assoc :border-width 1
-           :border-color (neutral-border-color in-blur-view? override-theme))
-
-    (= type :active)
-    (assoc :background-color active-background-color)
-
-    (= type :complete)
-    (assoc :background-color complete-background-color)))
-
-(defn text-color
-  ([type] (text-color type nil))
-  ([type override-theme]
-   (case type
-     (:neutral :active) (colors/theme-colors colors/neutral-100-opa-100 colors/white override-theme)
-     :complete          colors/white)))
@@ -1,21 +0,0 @@
-(ns quo2.components.counter.step.view
-  (:require
-    [quo2.components.counter.step.style :as style]
-    [quo2.components.markdown.text :as text]
-    [react-native.core :as rn]
-    [utils.number]))
-
-(defn step
-  [{:keys [type accessibility-label override-theme in-blur-view?]} value]
-  (let [type  (or type :neutral)
-        value (utils.number/parse-int value)
-        label (str value)
-        size  (count label)]
-    [rn/view
-     {:accessible          true
-      :accessibility-label (or accessibility-label :step-counter)
-      :style               (style/container size type in-blur-view? override-theme)}
-     [text/text
-      {:weight :medium
-       :size   :label
-       :style  {:color (style/text-color type override-theme)}} label]]))
@@ -1,30 +0,0 @@
-(ns quo2.components.drawers.documentation-drawers.component-spec
-  (:require [quo2.components.drawers.documentation-drawers.view :as documentation-drawers]
-            [test-helpers.component :as h]))
-
-(h/describe "Documentation drawers component"
-  (h/test "render component without button"
-    (h/render [documentation-drawers/view {:title "Documentation"} "Content"])
-    (-> (h/expect (h/get-by-label-text :documentation-drawer-title))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-label-text :documentation-drawer-content))
-        (.toBeTruthy)))
-  (h/test "render component with button"
-    (h/render [documentation-drawers/view
-               {:title "Documentation" :show-button? true :button-label "Read more"} "Content"])
-    (-> (h/expect (h/get-by-label-text :documentation-drawer-title))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-label-text :documentation-drawer-content))
-        (.toBeTruthy))
-    (-> (h/expect (h/get-by-label-text :documentation-drawer-button))
-        (.toBeTruthy)))
-  (h/test "button is pressed"
-    (let [event (h/mock-fn)]
-      (h/render
-       [documentation-drawers/view
-        {:title "Documentation" :show-button? true :button-label "Read more" :on-press-button event}
-        "Content"])
-      (h/fire-event :press (h/get-by-label-text :documentation-drawer-button))
-      (-> (h/expect event)
-          (.toHaveBeenCalled)))))
-
@@ -1,10 +0,0 @@
-(ns quo2.components.drawers.documentation-drawers.style)
-
-(def container
-  {:align-items :flex-start
-   :padding     20})
-
-(def content
-  {:margin-top    12
-   :margin-bottom 16})
-
@@ -1,40 +0,0 @@
-(ns quo2.components.drawers.documentation-drawers.view
-  (:require [quo2.components.markdown.text :as text]
-            [quo2.components.drawers.documentation-drawers.style :as style]
-            [react-native.core :as rn]
-            [react-native.gesture :as gesture]
-            [quo2.components.buttons.button :as button]
-            [quo2.foundations.colors :as colors]))
-
-(defn view
-  "Options
-   - `title` Title text
-   - `show-button?` Show button
-   - `button-label` button label
-   - `button-icon` button icon
-   - `on-press-button` On press handler for the button
-   - `shell?` use shell theme
-
-   `content` Content of the drawer
-   "
-  [{:keys [title show-button? on-press-button button-label button-icon shell?]} content]
-  [gesture/scroll-view
-   [rn/view {:style style/container}
-    [text/text
-     {:size                :heading-2
-      :accessibility-label :documentation-drawer-title
-      :style               {:color (colors/theme-colors colors/neutral-100
-                                                        colors/white
-                                                        (when shell? :dark))}
-      :weight              :semi-bold} title]
-    [rn/view {:style style/content :accessibility-label :documentation-drawer-content}
-     content]
-    (when show-button?
-      [button/button
-       (merge {:size                24
-               :type                (if shell? :blur-bg-outline :outline)
-               :on-press            on-press-button
-               :accessibility-label :documentation-drawer-button
-               :after               button-icon}
-              (when shell? {:override-theme :dark})) button-label])]])
-
@@ -43,7 +43,7 @@
  (colors/alpha color 0.6))

 (defn dropdown-comp
-  [{:keys [icon dd-height size disabled? dd-color use-border? border-color]}]
+  [{:keys [icon open? dd-height size disabled? dd-color use-border? border-color]}]
  (let [dark?                                                         (colors/dark?)
        {:keys [width height width-with-icon padding font icon-size]} (size sizes)
        {:keys [padding-with-icon padding-with-no-icon]}              padding
@@ -51,75 +51,74 @@
        spacing                                                       (case size
                                                                        :big    4
                                                                        :medium 2
-                                                                        :small  2)
-        open?                                                         (reagent/atom false)]
-    (fn []
-      [rn/touchable-opacity
-       (cond->
-         {:on-press (fn []
-                      (if (swap! open? not)
-                        (apply-anim dd-height 120)
-                        (apply-anim dd-height 0)))
-          :style    (cond->
-                      (merge
-                       (if icon
-                         padding-with-icon
-                         padding-with-no-icon)
-                       {:width            (if icon
-                                            width-with-icon
-                                            width)
-                        :height           height
-                        :border-radius    (case size
-                                            :big    12
-                                            :medium 10
-                                            :small  8)
-                        :flex-direction   :row
-                        :align-items      :center
-                        :background-color (if @open?
-                                            dd-color
-                                            (color-by-10 dd-color))})
-                      use-border? (assoc :border-width 1
-                                         :border-color (if @open?
-                                                         border-color
-                                                         (color-by-10 border-color))))}
-         disabled? (assoc-in [:style :opacity] 0.3)
-         disabled? (assoc :disabled true))
-       (when icon
-         [icons/icon icon
-          {:no-color        true
-           :size            20
-           :container-style {:margin-right spacing
-                             :margin-top   1
-                             :width        icon-size
-                             :height       icon-size}}])
-       [text/text
-        {:size   font-size
-         :weight :medium
-         :font   :font-medium
-         :color  :main} "Dropdown"]
-       [icons/icon
-        (if @open?
-          (if dark?
-            :main-icons/pullup-dark
-            :main-icons/pullup)
-          (if dark?
-            :main-icons/dropdown-dark
-            :main-icons/dropdown))
-        {:size            20
-         :no-color        true
-         :container-style {:width         (+ icon-size 3)
-                           :border-radius 20
-                           :margin-left   (if (= :small size)
-                                            2
-                                            4)
-                           :margin-top    1
-                           :height        (+ icon-size 4)}}]])))
+                                                                        :small  2)]
+    [rn/touchable-opacity
+     (cond->
+       {:on-press (fn []
+                    (if (swap! open? not)
+                      (apply-anim dd-height 120)
+                      (apply-anim dd-height 0)))
+        :style    (cond->
+                    (merge
+                     (if icon
+                       padding-with-icon
+                       padding-with-no-icon)
+                     {:width            (if icon
+                                          width-with-icon
+                                          width)
+                      :height           height
+                      :border-radius    (case size
+                                          :big    12
+                                          :medium 10
+                                          :small  8)
+                      :flex-direction   :row
+                      :align-items      :center
+                      :background-color (if @open?
+                                          dd-color
+                                          (color-by-10 dd-color))})
+                    use-border? (assoc :border-width 1
+                                       :border-color (if @open?
+                                                       border-color
+                                                       (color-by-10 border-color))))}
+       disabled? (assoc-in [:style :opacity] 0.3)
+       disabled? (assoc :disabled true))
+     (when icon
+       [icons/icon icon
+        {:no-color        true
+         :size            20
+         :container-style {:margin-right spacing
+                           :margin-top   1
+                           :width        icon-size
+                           :height       icon-size}}])
+     [text/text
+      {:size   font-size
+       :weight :medium
+       :font   :font-medium
+       :color  :main} "Dropdown"]
+     [icons/icon
+      (if @open?
+        (if dark?
+          :main-icons/pullup-dark
+          :main-icons/pullup)
+        (if dark?
+          :main-icons/dropdown-dark
+          :main-icons/dropdown))
+      {:size            20
+       :no-color        true
+       :container-style {:width         (+ icon-size 3)
+                         :border-radius 20
+                         :margin-left   (if (= :small size)
+                                          2
+                                          4)
+                         :margin-top    1
+                         :height        (+ icon-size 4)}}]]))

 (defn items-comp
  [{:keys [items on-select]}]
  (let [items-count (count items)]
    [rn/scroll-view
-     {:horizontal          false
+     {:style               {:height "100%"}
+      :horizontal          false
      :nestedScrollEnabled true}
     (doall
      (map-indexed (fn [index item]
@@ -137,29 +136,29 @@
                      [text/text {:style {:text-align :center}} item]])
                   items))]))

-(defn- f-dropdown
-  [{:keys [items icon text default-item on-select size disabled? border-color use-border? dd-color]}]
-  (let [dd-height (reanimated/use-shared-value 0)]
-    [rn/view {:style {:flex-grow 1}}
-     [dropdown-comp
-      {:items        items
-       :icon         icon
-       :disabled?    disabled?
-       :size         size
-       :dd-color     dd-color
-       :text         text
-       :border-color (colors/custom-color-by-theme border-color 50 60)
-       :use-border?  use-border?
-       :default-item default-item
-       :dd-height    dd-height}]
-     [reanimated/view
-      {:style (reanimated/apply-animations-to-style
-               {:height dd-height}
-               {})}
-      [items-comp
-       {:items     items
-        :on-select on-select}]]]))
-
 (defn dropdown
-  [params]
-  [:f> f-dropdown params])
+  [{:keys [items icon text default-item on-select size disabled? border-color use-border? dd-color]}]
+  [:f>
+   (fn []
+     (let [open?     (reagent/atom false)
+           dd-height (reanimated/use-shared-value 0)]
+       [rn/view {:style {:flex-grow 1}}
+        [dropdown-comp
+         {:items        items
+          :icon         icon
+          :disabled?    disabled?
+          :size         size
+          :dd-color     dd-color
+          :text         text
+          :border-color (colors/custom-color-by-theme border-color 50 60)
+          :use-border?  use-border?
+          :default-item default-item
+          :open?        open?
+          :dd-height    dd-height}]
+        [reanimated/view
+         {:style (reanimated/apply-animations-to-style
+                  {:height dd-height}
+                  {:height dd-height})}
+         [items-comp
+          {:items     items
+           :on-select on-select}]]]))])
@@ -1,43 +1,29 @@
 (ns quo2.components.icon
  (:require [clojure.string :as string]
            [quo2.components.icons.icons :as icons]
-            [quo2.components.icons.svg :as icons.svg]
            [quo2.foundations.colors :as colors]
            [react-native.core :as rn]))

-(defn- valid-color?
-  [color]
-  (or (keyword? color)
-      (and (string? color)
-           (not (string/blank? color)))))
-
 (defn memo-icon-fn
  ([icon-name] (memo-icon-fn icon-name nil))
  ([icon-name
-    {:keys [color color-2 no-color
-            container-style size accessibility-label]
+    {:keys [color container-style size
+            accessibility-label no-color]
     :or   {accessibility-label :icon}}]
   (let [size (or size 20)]
     ^{:key icon-name}
-     (if-let [svg-icon (icons.svg/get-icon icon-name size)]
-       [svg-icon
-        {:size                size
-         :color               (when (valid-color? color) color)
-         :color-2             (when (valid-color? color-2) color-2)
-         :accessibility-label accessibility-label
-         :style               container-style}]
-       [rn/image
-        {:style
-         (merge {:width  size
-                 :height size}
+     [rn/image
+      {:style
+       (merge {:width  size
+               :height size}

-                (when (not no-color)
-                  {:tint-color (if (and (string? color) (not (string/blank? color)))
-                                 color
-                                 (colors/theme-colors colors/neutral-100 colors/white))})
+              (when (not no-color)
+                {:tint-color (if (and (string? color) (not (string/blank? color)))
+                               color
+                               (colors/theme-colors colors/neutral-100 colors/white))})

-                container-style)
-         :accessibility-label accessibility-label
-         :source (icons/icon-source (str (name icon-name) size))}]))))
+              container-style)
+       :accessibility-label accessibility-label
+       :source (icons/icon-source (str (name icon-name) size))}])))

 (def icon (memoize memo-icon-fn))
@@ -2,9 +2,9 @@
  (:require [clojure.java.io :as io]
            [clojure.string :as string]))

-(def ^:private icon-path "./resources/images/icons2/")
+(def icon-path "./resources/images/icons2/")

-(defn- require-icon
+(defn require-icon
  [size path]
  (fn [el]
    (let [s (str "." path el ".png")
@@ -15,7 +15,7 @@
                (str size))]
      [k `(js/require ~s)])))

-(defn- get-files
+(defn get-files
  [path]
  (->> (io/file path)
       file-seq
@@ -23,7 +23,7 @@
       (map #(first (string/split (.getName %) #"@")))
       distinct))

-(defn- get-icons
+(defn get-icons
  [size]
  (let [path (str icon-path size "x" size "/")]
    (into {} (map (require-icon size path) (get-files path)))))
@@ -2,7 +2,7 @@
  (:require-macros [quo2.components.icons.icons :as icons])
  (:require [taoensso.timbre :as log]))

-(def ^:private icons (icons/resolve-icons))
+(def icons (icons/resolve-icons))

 (defn icon-source
  [icon]
@@ -1,48 +0,0 @@
-(ns quo2.components.icons.svg
-  "Declare icons in this namespace when they have two possible colors, because the
-  ReactNative `:tint-color` prop affects all non-transparent pixels of PNGs. If
-  the icon has only one color, prefer a PNG.
-
-  Keep all SVG components private and expose them by name in the `icons` var."
-  (:require [react-native.svg :as svg]
-            [quo2.foundations.colors :as colors]))
-
-(defn- container
-  [{:keys [size accessibility-label style]
-    :or   {size 20}}
-   & children]
-  (into [svg/svg
-         {:accessibility-label accessibility-label
-          :style               style
-          :width               size
-          :height              size
-          :view-box            (str "0 0 " size " " size)
-          :fill                :none}]
-        children))
-
-(defn- clear-20
-  [{:keys [color color-2] :as props}]
-  (let [color   (or color colors/neutral-100)
-        color-2 (or color-2 colors/white)]
-    [container props
-     [svg/path
-      {:d
-       "M3 10C3 6.13401 6.13401 3 10 3C13.866 3 17 6.13401 17 10C17 13.866 13.866 17 10 17C6.13401 17 3 13.866 3 10Z"
-       :fill color}]
-     [svg/path
-      {:d
-       "M9.15142 9.99998L7.07566 12.0757L7.9242 12.9243L9.99994 10.8485L12.0757 12.9242L12.9242 12.0757L10.8485 9.99998L12.9242 7.92421L12.0757 7.07568L9.99994 9.15145L7.92421 7.07572L7.07568 7.92425L9.15142 9.99998Z"
-       :fill color-2}]]))
-
-(def ^:private icons
-  {:i/clear-20 clear-20})
-
-(defn- append-to-keyword
-  [k & xs]
-  (keyword (apply str
-                  (subs (str k) 1)
-                  xs)))
-
-(defn get-icon
-  [icon-name size]
-  (get icons (append-to-keyword icon-name "-" size)))
@@ -6,10 +6,10 @@
            [react-native.core :as rn]))

 (def themes
-  {:light {:default colors/neutral-50
+  {:light {:default colors/neutral-40
           :success colors/success-50
           :error   colors/danger-50}
-   :dark  {:default colors/neutral-40
+   :dark  {:default colors/neutral-60
           :success colors/success-60
           :error   colors/danger-60}})

@@ -27,20 +27,18 @@
   :icon-color     colors/white    ;; icon color override
   :no-icon-color? false       ;; disable tint color for icon"
  [{:keys [type size icon text-color icon-color no-icon-color? style]} message]
-  (let [weight          (if (= size :default) :regular :medium)
-        icon-size       (if (= size :default) 16 12)
-        icon-margin-top (if (= size :default) 2 3)
-        size            (if (= size :default) :paragraph-2 :label)
-        text-color      (or text-color (get-color type))
-        icon-color      (or icon-color text-color)]
+  (let [weight     (if (= size :default) :regular :medium)
+        size       (if (= size :default) :paragraph-2 :label)
+        text-color (or text-color (get-color type))
+        icon-color (or icon-color text-color)]
    [rn/view
     {:style (merge {:flex-direction :row}
                    style)}
     [quo2.icons/icon icon
      {:color           icon-color
       :no-color        no-icon-color?
-       :size            icon-size
-       :container-style {:margin-top icon-margin-top}}]
+       :size            12
+       :container-style {:margin-top 3}}]
     [text/text
      {:size   size
       :weight weight
@@ -132,9 +132,8 @@
              :text             text}])]]))))

 (defn- password-input
-  [{:keys [default-shown?]
-    :or   {default-shown? false}}]
-  (let [password-shown? (reagent/atom default-shown?)]
+  [_]
+  (let [password-shown? (reagent/atom false)]
    (fn [props]
      [base-input
       (assoc props
@@ -162,7 +161,6 @@
  - :label - A string to set as label for this input.
  - :char-limit - A number to set a maximum char limit for this input.
  - :on-char-limit-reach - Function executed each time char limit is reached or exceeded.
-  - :default-shown? - boolean to show password input initially
  and supports the usual React Native's TextInput properties to control its behaviour:
  - :value
  - :default-value
@@ -1,8 +0,0 @@
-(ns quo2.components.inputs.recovery-phrase.component-spec
-  (:require [quo2.components.inputs.recovery-phrase.view :as recovery-phrase]
-            [test-helpers.component :as h]))
-
-(h/describe "Recovery phrase input"
-  (h/test "Default render"
-    (h/render [recovery-phrase/recovery-phrase-input {}])
-    (h/is-truthy (h/get-by-label-text :recovery-phrase-input))))
@@ -1,45 +0,0 @@
-(ns quo2.components.inputs.recovery-phrase.style
-  (:require [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
-
-(def container
-  {:min-height         40
-   :flex               1
-   :padding-vertical   4
-   :padding-horizontal 20})
-
-(defn input
-  []
-  (assoc (text/text-style {})
-         :height              32
-         :flex-grow           1
-         :padding-vertical    5
-         :text-align-vertical :top))
-
-(defn placeholder-color
-  [input-state override-theme blur?]
-  (cond
-    (and (= input-state :focused) blur?)
-    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
-
-    (= input-state :focused) ; Not blur
-    (colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme)
-
-    blur? ; :default & blur
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
-
-    :else ; :default & not blur
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
-
-(defn cursor-color
-  [customization-color override-theme]
-  (colors/theme-colors (colors/custom-color customization-color 50)
-                       (colors/custom-color customization-color 60)
-                       override-theme))
-
-(defn error-word
-  []
-  {:height             22
-   :padding-horizontal 20
-   :background-color   colors/danger-50-opa-10
-   :color              (colors/theme-colors colors/danger-50 colors/danger-60)})
@@ -1,54 +0,0 @@
-(ns quo2.components.inputs.recovery-phrase.view
-  (:require [clojure.string :as string]
-            [quo2.components.inputs.recovery-phrase.style :as style]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]))
-
-(def ^:private custom-props
-  [:customization-color :override-theme :blur? :cursor-color :multiline :on-focus :on-blur
-   :placeholder-text-color :mark-errors? :error-pred :word-limit])
-
-(defn- error-word
-  [text]
-  [rn/text {:style (style/error-word)}
-   text])
-
-(defn- mark-error-words
-  [pred text word-limit]
-  (let [word-limit (or word-limit ##Inf)]
-    (into [:<>]
-          (comp (map-indexed (fn [idx word]
-                               (if (or (pred word) (>= idx word-limit))
-                                 [error-word word]
-                                 word)))
-                (interpose " "))
-          (string/split text #" "))))
-
-(defn recovery-phrase-input
-  [_ _]
-  (let [state       (reagent/atom :default)
-        set-focused #(reset! state :focused)
-        set-default #(reset! state :default)]
-    (fn [{:keys [customization-color override-theme blur? on-focus on-blur mark-errors?
-                 error-pred word-limit]
-          :or   {customization-color :blue}
-          :as   props}
-         text]
-      (let [extra-props (apply dissoc props custom-props)]
-        [rn/view {:style style/container}
-         [rn/text-input
-          (merge {:accessibility-label    :recovery-phrase-input
-                  :style                  (style/input)
-                  :placeholder-text-color (style/placeholder-color @state override-theme blur?)
-                  :cursor-color           (style/cursor-color customization-color override-theme)
-                  :multiline              true
-                  :on-focus               (fn []
-                                            (set-focused)
-                                            (when on-focus (on-focus)))
-                  :on-blur                (fn []
-                                            (set-default)
-                                            (when on-blur (on-blur)))}
-                 extra-props)
-          (if mark-errors?
-            (mark-error-words error-pred text word-limit)
-            text)]]))))
@@ -1,68 +0,0 @@
-(ns quo2.components.inputs.search-input.style
-  (:require [quo2.components.markdown.text :as text]
-            [quo2.foundations.colors :as colors]))
-
-(defn placeholder-color
-  [state blur? override-theme]
-  (cond
-    (and blur? (= state :active))
-    (colors/theme-colors colors/neutral-80-opa-20 colors/white-opa-20 override-theme)
-
-    blur? ; state is default
-    (colors/theme-colors colors/neutral-80-opa-40 colors/white-opa-30 override-theme)
-
-    (= state :active)
-    (colors/theme-colors colors/neutral-30 colors/neutral-60 override-theme)
-
-    :else ; Not blur and state is default
-    (colors/theme-colors colors/neutral-40 colors/neutral-50 override-theme)))
-
-(def clear-icon-container
-  {:justify-content :center
-   :align-items     :center
-   :margin-left     8
-   :height          20
-   :width           20})
-
-(defn clear-icon
-  [blur? override-theme]
-  (if blur?
-    (colors/theme-colors colors/neutral-80-opa-30 colors/white-opa-10 override-theme)
-    (colors/theme-colors colors/neutral-40 colors/neutral-60 override-theme)))
-
-(defn cursor
-  [customization-color override-theme]
-  (colors/theme-colors (colors/custom-color customization-color 50)
-                       (colors/custom-color customization-color 60)
-                       override-theme))
-
-(def tag-separator {:width 8})
-
-(def tag-container
-  {:flex-direction :row
-   :margin-right   8})
-
-(def container
-  {:flex           1
-   :flex-direction :row
-   :align-items    :center})
-
-(def scroll-container
-  {:flex-direction :row
-   :flex           1
-   :height         32})
-
-(def scroll-content
-  {:flex-grow       1
-   :align-items     :center
-   :justify-content :flex-start})
-
-(defn input-text
-  [disabled?]
-  (assoc (text/text-style {:size   :paragraph-1
-                           :weight :regular})
-         :flex             1
-         :padding-vertical 5
-         :min-width        120
-         :opacity          (if disabled? 0.3 1)
-         :min-height       32))
@@ -1,89 +0,0 @@
-(ns quo2.components.inputs.search-input.view
-  (:require [oops.core :as oops]
-            [quo2.components.icon :as icon]
-            [quo2.components.inputs.search-input.style :as style]
-            [react-native.core :as rn]
-            [reagent.core :as reagent]))
-
-(def ^:private tag-separator [rn/view {:style style/tag-separator}])
-
-(defn- inner-tags
-  [tags-coll]
-  (into [rn/view {:style style/tag-container}]
-        (interpose tag-separator)
-        tags-coll))
-
-(defn- clear-button
-  [{:keys [on-press blur? override-theme]}]
-  [rn/touchable-opacity
-   {:style    style/clear-icon-container
-    :on-press on-press}
-   [icon/icon :i/clear
-    {:color (style/clear-icon blur? override-theme)
-     :size  20}]])
-
-(defn- handle-backspace
-  [event ^js/Object scroll-view-ref]
-  (when (and (= (oops/oget event "nativeEvent.key") "Backspace")
-             scroll-view-ref)
-    (.scrollToEnd scroll-view-ref #js {:animated false})))
-
-(def ^:private props-to-remove
-  [:cursor-color :placeholder-text-color :editable :on-change-text :on-focus
-   :on-blur :on-clear :value :tags :disabled? :blur? :customization-color :override-theme])
-
-(defn- add-children
-  [text-input children]
-  (if (seq children)
-    (into text-input children)
-    text-input))
-
-(defn search-input
-  [{:keys [value]}]
-  (let [state           (reagent/atom :default)
-        set-active      #(reset! state :active)
-        set-default     #(reset! state :default)
-        scroll-view-ref (atom nil)
-        use-value?      (boolean value)]
-    (fn [{:keys [value tags disabled? blur? on-change-text customization-color
-                 on-clear on-focus on-blur override-theme]
-          :or   {customization-color :blue}
-          :as   props}
-         & children]
-      (let [clean-props (apply dissoc props props-to-remove)]
-        [rn/view {:style style/container}
-         [rn/scroll-view
-          {:ref                               #(reset! scroll-view-ref %)
-           :style                             style/scroll-container
-           :content-container-style           style/scroll-content
-           :horizontal                        true
-           :shows-horizontal-scroll-indicator false}
-          (when (seq tags)
-            [inner-tags tags])
-
-          (add-children
-           [rn/text-input
-            (cond-> {:style                  (style/input-text disabled?)
-                     :cursor-color           (style/cursor customization-color override-theme)
-                     :placeholder-text-color (style/placeholder-color @state blur? override-theme)
-                     :editable               (not disabled?)
-                     :on-key-press           #(handle-backspace % @scroll-view-ref)
-                     :on-change-text         (fn [new-text]
-                                               (when on-change-text
-                                                 (on-change-text new-text))
-                                               (reagent/flush))
-                     :on-focus               (fn []
-                                               (set-active)
-                                               (when on-focus (on-focus)))
-                     :on-blur                (fn []
-                                               (set-default)
-                                               (when on-blur (on-blur)))}
-              use-value?        (assoc :value value)
-              (seq clean-props) (merge clean-props))]
-           (when-not use-value? children))]
-
-         (when (or (seq value) (seq children))
-           [clear-button
-            {:on-press       on-clear
-             :blur?          blur?
-             :override-theme override-theme}])]))))
@@ -1,6 +1,5 @@
 (ns quo2.components.inputs.title-input.style
-  (:require [quo2.foundations.colors :as colors]
-            [react-native.platform :as platform]))
+  (:require [quo2.foundations.colors :as colors]))

 (defn get-focused-placeholder-color
  [blur? override-theme]
@@ -29,11 +28,9 @@

 (defn get-selection-color
  [customization-color blur? override-theme]
-  (colors/alpha (if blur?
-                  (colors/theme-colors colors/neutral-100 colors/white override-theme)
-                  (colors/custom-color customization-color
-                                       (if (or (= :dark override-theme) colors/dark?) 60 50)))
-                (if platform/ios? 1 0.2)))
+  (if blur?
+    (colors/theme-colors colors/neutral-100 colors/white override-theme)
+    (colors/custom-color customization-color (if (or (= :dark override-theme) colors/dark?) 60 50))))

 (def text-input-container {:flex 1})

@@ -1,43 +0,0 @@
-(ns quo2.components.links.link-preview.component-spec
-  (:require [quo2.components.links.link-preview.view :as view]
-            [test-helpers.component :as h]))
-
-(def props
-  {:title       "Some title"
-   :description "Some description"
-   :link        "status.im"
-   :thumbnail   "data:image/png,whatever"})
-
-(h/describe "Links - Link Preview"
-  (h/test "default render"
-    (h/render [view/view])
-    (h/is-truthy (h/query-by-label-text :link-preview))
-    (h/is-null (h/query-by-label-text :button-enable-preview)))
-
-  (h/test "renders with most common props"
-    (h/render [view/view props])
-    (h/is-truthy (h/query-by-text (:title props)))
-    (h/is-truthy (h/query-by-text (:description props)))
-    (h/is-truthy (h/query-by-text (:link props)))
-    (h/is-truthy (h/query-by-label-text :thumbnail)))
-
-  (h/test "does not render thumbnail if prop is not present"
-    (h/render [view/view (dissoc props :thumbnail)])
-    (h/is-null (h/query-by-label-text :thumbnail)))
-
-  (h/test "shows button to enable preview when preview is disabled"
-    (h/render [view/view
-               (assoc props
-                      :enabled?      false
-                      :disabled-text "I'm disabled")])
-    (h/is-truthy (h/query-by-label-text :button-enable-preview))
-    (h/is-truthy (h/query-by-text "I'm disabled")))
-
-  (h/test "on-enable event"
-    (let [on-enable (h/mock-fn)]
-      (h/render [view/view
-                 (assoc props
-                        :enabled?  false
-                        :on-enable on-enable)])
-      (h/fire-event :press (h/get-by-label-text :button-enable-preview))
-      (h/was-called on-enable))))
@@ -1,43 +0,0 @@
-(ns quo2.components.links.link-preview.style
-  (:require
-    [quo2.foundations.colors :as colors]))
-
-(defn container
-  [preview-enabled?]
-  (merge {:border-width       1
-          :border-color       (colors/theme-colors colors/neutral-20 colors/neutral-80)
-          :background-color   (colors/theme-colors colors/white colors/neutral-80-opa-40)
-          :border-radius      16
-          :padding-horizontal 12
-          :padding-top        10
-          :padding-bottom     12}
-         (when-not preview-enabled?
-           {:height          139
-            :align-items     :center
-            :justify-content :center})))
-
-(def header-container
-  {:flex-direction :row
-   :align-items    :center})
-
-(def title
-  {:flex          1
-   :margin-bottom 2})
-
-(defn link
-  []
-  {:margin-top 8
-   :color      (colors/theme-colors colors/neutral-50 colors/neutral-40)})
-
-(defn thumbnail
-  [size]
-  {:width         "100%"
-   :height        (if (= size :large) 271 139)
-   :margin-top    12
-   :border-radius 12})
-
-(def logo
-  {:margin-right  6
-   :width         16
-   :height        16
-   :border-radius 8})
@@ -1,77 +0,0 @@
-(ns quo2.components.links.link-preview.view
-  (:require [quo2.components.buttons.button :as button]
-            [quo2.components.links.link-preview.style :as style]
-            [quo2.components.markdown.text :as text]
-            [react-native.core :as rn]))
-
-(defn- button-disabled
-  [disabled-text on-enable]
-  [button/button
-   {:before              :i/reveal
-    :size                32
-    :type                :grey
-    :on-press            on-enable
-    :accessibility-label :button-enable-preview}
-   disabled-text])
-
-(defn- description-comp
-  [description]
-  [text/text
-   {:size                :paragraph-2
-    :number-of-lines     3
-    :accessibility-label :description}
-   description])
-
-(defn- link-comp
-  [link]
-  [text/text
-   {:size                :paragraph-2
-    :weight              :medium
-    :style               (style/link)
-    :accessibility-label :link}
-   link])
-
-(defn- title-comp
-  [title]
-  [text/text
-   {:size                :paragraph-1
-    :number-of-lines     1
-    :weight              :semi-bold
-    :style               style/title
-    :accessibility-label :title}
-   title])
-
-(defn- thumbnail-comp
-  [thumbnail size]
-  [rn/image
-   {:style               (style/thumbnail size)
-    :source              (if (string? thumbnail)
-                           {:uri thumbnail}
-                           thumbnail)
-    :accessibility-label :thumbnail}])
-
-(defn- logo-comp
-  [logo]
-  [rn/image
-   {:accessibility-label :logo
-    :source              logo
-    :style               style/logo}])
-
-(defn view
-  [{:keys [title logo description link thumbnail
-           enabled? on-enable disabled-text
-           container-style thumbnail-size]
-    :or   {enabled? true}}]
-  [rn/view
-   {:style               (merge (style/container enabled?) container-style)
-    :accessibility-label :link-preview}
-   (if enabled?
-     [:<>
-      [rn/view {:style style/header-container}
-       [logo-comp logo]
-       [title-comp title]]
-      [description-comp description]
-      [link-comp link]
-      (when thumbnail
-        [thumbnail-comp thumbnail thumbnail-size])]
-     [button-disabled disabled-text on-enable])])
@@ -48,6 +48,10 @@
  {:text-transform :lowercase
   :color          (colors/theme-colors colors/neutral-50 colors/neutral-40)})

+(def clear-button
+  {:border-color colors/danger-50
+   :border-width 1})
+
 (def clear-button-container
  {:width       20
   :height      20
--- a/Show More
+++ b/Show More