Changed tests run

.env

@@ -2,6 +2,7 @@ CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
@@ -21,14 +22,15 @@ STATUS_GO_ENABLE_NIMBUS=0
 KEYCARD_TEST_MENU=0
 QR_READ_TEST_MENU=1
 ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=1
 ENABLE_QUO_PREVIEW=1
 MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1
 COMMANDS_ENABLED=1
 TWO_MINUTES_SYNCING=1
 SWAP_ENABLED=1
-STICKERS_TEST_ENABLED=1

.env.e2e

@@ -1,5 +1,6 @@
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=testnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.staging
@@ -21,6 +22,7 @@ COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=1
 QR_READ_TEST_MENU=1
 ENABLE_ROOT_ALERT=0
+ENABLE_REFERRAL_INVITE=1
 MAX_IMAGES_BATCH=5
 APN_TOPIC=im.status.ethereum.pr
 VERIFY_TRANSACTION_CHAIN_ID=3
@@ -29,6 +31,6 @@ TEST_STATEOFUS=1
 DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
-STICKERS_TEST_ENABLED=1

.env.jenkins

@@ -1,6 +1,7 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=testnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
@@ -20,6 +21,7 @@ STATUS_GO_ENABLE_NIMBUS=0
 COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=0
 ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=1
 DISABLE_WALLET_ON_MOBILE_NETWORK=1
 APN_TOPIC=im.status.ethereum.pr
 VERIFY_TRANSACTION_CHAIN_ID=3
@@ -27,10 +29,11 @@ VERIFY_ENS_CHAIN_ID=3
 TEST_STATEOFUS=1
 BLANK_PREVIEW=0
 MAX_IMAGES_BATCH=5
+GOOGLE_FREE=0
 DATABASE_MANAGEMENT_ENABLED=1
 COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 TWO_MINUTES_SYNCING=1
 ENABLE_QUO_PREVIEW=1
-STICKERS_TEST_ENABLED=1

.env.nightly

@@ -1,5 +1,6 @@
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
@@ -12,13 +13,14 @@ PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
 POW_TIME=1
 SNOOPY=0
-KEYCARD_TEST_MENU=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
 ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=0
 MAX_IMAGES_BATCH=5
 BLANK_PREVIEW=0
 COMMUNITIES_ENABLED=1
 DATABASE_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1

.env.release

@@ -1,5 +1,6 @@
 DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 FLEET=eth.prod
@@ -12,10 +13,11 @@ PFS_TOGGLE_VISIBLE=0
 POW_TARGET=0.002
 POW_TIME=1
 SNOOPY=0
-KEYCARD_TEST_MENU=0
 RPC_NETWORKS_ONLY=1
 PARTITIONED_TOPIC=0
 ENABLE_ROOT_ALERT=1
 MAX_IMAGES_BATCH=1
+ENABLE_REFERRAL_INVITE=0
+METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1

.envrc

@@ -1 +1 @@
-layout node
+layout node

.gitignore

@@ -41,7 +41,6 @@ local.properties
 # VS Code
 .vscode/ipch/
 .vscode/settings.json
-workspace.code-workspace
 
 # node.js
 #
@@ -170,8 +169,4 @@ project.clj
 ##appium
 test/appium/report/
 result.xml
-test/appium/tests/users.py
-
-##node bindings
-/bin/
-/lib/
+test/appium/tests/users.py

Makefile

@@ -32,12 +32,10 @@ ifndef BUILD_TAG
 export BUILD_TAG := $(shell git rev-parse --short HEAD)
 endif
 
-# We don't want to use /run/user/$UID because it runs out of space too easilly.
+# We don't want to use /run/user/$UID because it runs out of space too easilly
 export TMPDIR = /tmp/tmp-status-react-$(BUILD_TAG)
-# This has to be specified for both the Node.JS server process and the Qt process.
+# this has to be specified for both the Node.JS server process and the Qt process
 export REACT_SERVER_PORT ?= 5001
-# The path can be anything, but home is usually safest.
-export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 
 # Our custom config is located in nix/nix.conf
 export NIX_CONF_DIR = $(PWD)/nix
@@ -155,12 +153,11 @@ update-fleets: ##@prepare Download up-to-date JSON file with current fleets stat
 		| jq --indent 4 --sort-keys . \
 		> resources/config/fleets.json
 
-$(KEYSTORE_PATH): export TARGET := keytool
-$(KEYSTORE_PATH):
+keystore: export TARGET := keytool
+keystore: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
+keystore: ##@prepare Generate a Keystore for signing Android APKs
 	@./scripts/generate-keystore.sh
 
-keystore: $(KEYSTORE_PATH) ##@prepare Generate a Keystore for signing Android APKs
-
 fdroid-max-watches: SHELL := /bin/sh
 fdroid-max-watches: ##@prepare Bump max_user_watches to avoid ENOSPC errors
 	sysctl fs.inotify.max_user_watches=524288
@@ -193,25 +190,25 @@ xcode-clean: ##@prepare Clean XCode derived data and archives
 #----------------
 release: release-android release-ios ##@build Build release for Android and iOS
 
-build-fdroid: export BUILD_ENV = prod
-build-fdroid: export BUILD_TYPE = release
-build-fdroid: export ANDROID_ABI_SPLIT = false
-build-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
-build-fdroid: ##@build Build release for F-Droid
-	@scripts/build-android.sh
-
-build-android: export BUILD_ENV ?= prod
-build-android: export BUILD_TYPE ?= nightly
-build-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
-build-android: export ANDROID_ABI_SPLIT ?= false
-build-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
-build-android: ##@build Build unsigned Android APK
-	@scripts/build-android.sh
-
-release-android: export TARGET := keytool
+release-android: export BUILD_ENV ?= prod
+release-android: export BUILD_TYPE ?= nightly
+release-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
-release-android: keystore build-android ##@build Build signed Android APK
-	@scripts/sign-android.sh result/app-release-unsigned.apk
+release-android: export ANDROID_APK_SIGNED ?= true
+release-android: export ANDROID_ABI_SPLIT ?= false
+release-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
+release-android: keystore ##@build Build release for Android
+	scripts/release-android.sh
+
+release-fdroid: export BUILD_ENV = prod
+release-fdroid: export BUILD_TYPE = release
+release-fdroid: export ANDROID_APK_SIGNED = false
+release-fdroid: export ANDROID_ABI_SPLIT = false
+release-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
+release-fdroid: export READER_FEATURES = google-free
+release-fdroid: ##@build Build release for F-Droid
+	scripts/google-free.sh
+	scripts/release-android.sh
 
 release-ios: export TARGET := ios
 release-ios: export BUILD_ENV ?= prod
@@ -226,7 +223,7 @@ jsbundle-android: export BUILD_ENV ?= prod
 jsbundle-android: ##@jsbundle Compile JavaScript and Clojurescript into app directory
 	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the.js files to the project root
 	nix/scripts/build.sh targets.mobile.android.jsbundle && \
-	mv result/*.js ./
+	mv result/* ./
 
 jsbundle-ios: export TARGET := ios
 jsbundle-ios: export BUILD_ENV ?= prod
@@ -245,10 +242,6 @@ status-go-ios: SHELL := /bin/sh
 status-go-ios: ##@status-go Compile status-go for iOS app
 	nix/scripts/build.sh targets.status-go.mobile.ios
 
-status-go-library: SHELL := /bin/sh
-status-go-library: ##@status-go Compile status-go for node-js
-	nix/scripts/build.sh targets.status-go.library
-
 #--------------
 # Watch, Build & Review changes
 #--------------
@@ -293,25 +286,12 @@ lint-fix: export TARGET := clojure
 lint-fix: ##@test Run code style checks and fix issues
 	clojure -Scp "$$CLASS_PATH" -m cljfmt.main fix src --indents indentation.edn
 
-shadow-server: export TARGET := clojure
-shadow-server:##@ Start shadow-cljs in server mode for watching
-	yarn shadow-cljs server
-
-test-watch: export TARGET := clojure
-test-watch: status-go-library
-test-watch: ##@ Watch tests and re-run no changes to cljs files
-	yarn install
-	nodemon --exec 'yarn shadow-cljs compile mocks && yarn shadow-cljs compile test && node --require ./test-resources/override.js target/test/test.js' -e cljs
-
 test: export TARGET := clojure
-test: status-go-library ##@test Run tests once in NodeJS
-	# Here we creates the gyp bindings for nodejs
-	yarn install
+test: ##@test Run tests once in NodeJS
 	yarn shadow-cljs compile mocks && \
 	yarn shadow-cljs compile test && \
 	node --require ./test-resources/override.js target/test/test.js
 
-
 coverage: ##@test Run tests once in NodeJS generating coverage
 	@scripts/run-coverage.sh
 

android/app/build.gradle

@@ -123,6 +123,11 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+/**
+ * Exclude google library so we can publish to external android stores
+ */
+def googleFree = project.env.get("GOOGLE_FREE", 0) == '1'
+
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
         return project.commitHash
@@ -229,6 +234,23 @@ android {
         jumboMode true
         javaMaxHeapSize "8g"
     }
+    signingConfigs {
+        debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
+        /* Caution! In production, you need to generate your own keystore file.
+         * See: https://facebook.github.io/react-native/docs/signed-apk-android */
+        release {
+            /* environment variables take precedence over gradle.properties file */
+            storeFile     file(getEnvOrConfig('KEYSTORE_PATH').replaceAll("~", System.properties['user.home']))
+            storePassword getEnvOrConfig('KEYSTORE_PASSWORD')
+            keyAlias      getEnvOrConfig('KEYSTORE_ALIAS')
+            keyPassword   getEnvOrConfig('KEYSTORE_KEY_PASSWORD')
+        }
+    }
     splits {
         abi {
             reset()
@@ -237,26 +259,20 @@ android {
             universalApk true
         }
     }
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-    }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
             debuggable          true
             versionNameSuffix   "-SNAPSHOT"
-            resValue "string", "build_config_package", "im.status.ethereum"
             signingConfig signingConfigs.debug
+            resValue "string", "build_config_package", "im.status.ethereum"
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig null
+            if (getEnvOrConfig('ANDROID_APK_SIGNED').toBoolean()) {
+                signingConfig signingConfigs.release
+            }
         }
         pr {
             initWith release
@@ -319,6 +335,16 @@ dependencies {
       implementation jscFlavor
     }
 
+    if (googleFree) {
+        implementation(project(':react-native-device-info')) {
+            exclude group: 'com.google.firebase'
+            exclude group: 'com.google.android.gms'
+            exclude group: 'com.android.installreferrer'
+        }
+    } else {
+	implementation 'com.google.firebase:firebase-messaging:23.0.0'
+    }
+
     // react-native-screens
     implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
@@ -370,3 +396,7 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+if (!googleFree) {
+	apply plugin: "com.google.gms.google-services"
+}

android/app/google-services.json

@@ -0,0 +1,119 @@
+{
+  "project_info": {
+    "project_number": "854811651919",
+    "firebase_url": "https://status-react-app.firebaseio.com",
+    "project_id": "status-react-app",
+    "storage_bucket": "status-react-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:11ee7444ded8a00a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:15dbe4af1e06ca3e005f3a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:1d0d69fe8c1bb89b005f3a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.pr"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -81,6 +81,12 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider_paths" />
         </provider>
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/notification_icon" />
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/notification_icon_color" />
     </application>
 
 </manifest>

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

@@ -125,15 +125,13 @@ public class MainActivity extends NavigationActivity
         switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
             case Configuration.UI_MODE_NIGHT_YES:
                 setTheme(R.style.DarkTheme);
-                SplashScreen.show(this, R.style.DarkTheme, false);
+
                 break;
             case Configuration.UI_MODE_NIGHT_NO:
                 setTheme(R.style.LightTheme);
-                SplashScreen.show(this, R.style.LightTheme, false);
                 break;
             default:
                 setTheme(R.style.LightTheme);
-                SplashScreen.show(this, R.style.LightTheme, false);
         }
         // Make sure we get an Alert for every uncaught exceptions
         registerUncaughtExceptionHandler(MainActivity.this);
@@ -143,7 +141,7 @@ public class MainActivity extends NavigationActivity
         Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
 
         setSecureFlag();
-
+        SplashScreen.show(this, true);
         // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
         super.onCreate(null);
 

android/app/src/main/res/values-night/colors.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="alert_background">#141414</color>
-    <color name="alert_text">#ffffff</color>
+  <color name="alert_background">#141414</color>
+  <color name="alert_text">#ffffff</color>
 </resources>

android/app/src/main/res/values/colors.xml

@@ -2,4 +2,5 @@
 <resources>
   <color name="alert_background">#ffffff</color>
   <color name="alert_text">#000000</color>
+  <color name="notification_icon_color">#4360DF</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -24,8 +24,8 @@
     </style>
 
     <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
-        <item name="android:textColor">@color/alert_text</item>
-        <item name="android:textColorPrimary">@color/alert_text</item>
-        <item name="android:background">@color/alert_background</item>
+      <item name="android:textColor">@color/alert_text</item>
+      <item name="android:textColorPrimary">@color/alert_text</item>
+      <item name="android:background">@color/alert_background</item>
     </style>
 </resources>

android/build.gradle

@@ -17,11 +17,12 @@ buildscript {
     repositories {
         flatDir { dirs "libs", "${rootDir}/app/libs" }
         google()
-        mavenCentral()
+        jcenter()
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
         classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
+	classpath "com.google.gms:google-services:4.3.10"
         // WARNING: Do not place your application dependencies here!
         //          They belong in the individual module build.gradle files.
     }
@@ -44,22 +45,27 @@ subprojects {
 
 allprojects {
     beforeEvaluate {
-        if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {
-            throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!')
-        }
+      if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {
+        throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!')
+      }
     }
 
     repositories {
         mavenLocal()
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        maven { url("$rootDir/../node_modules/react-native/android") }
-        // Android JSC is installed from npm
-        maven { url("$rootDir/../node_modules/jsc-android/dist") }
-        // For geth, function, and status-go
-        flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR }
-        // Everything Else
+        maven {
+            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+            url("$rootDir/../node_modules/react-native/android")
+        }
+        maven {
+            // Android JSC is installed from npm
+            url("$rootDir/../node_modules/jsc-android/dist")
+        }
+
         google()
-        mavenCentral()
+        jcenter()
+
+        // for geth, function, and status-go
+        flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR }
         maven { url "https://www.jitpack.io" }
     }
 }

android/gradle.properties

@@ -42,6 +42,8 @@ KEYSTORE_KEY_PASSWORD=password
 ANDROID_ABI_SPLIT=false
 # Some platforms are excluded though
 ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86
+# F-Droid builds need to be unsigned
+ANDROID_APK_SIGNED=true
 
 org.gradle.jvmargs=-Xmx8704M
 

binding.gyp

@@ -1,38 +0,0 @@
-{
-  "variables": {
-    "module_name%": "status_nodejs_addon",
-    "module_path%": "./lib/binding/"
-  },
-  "targets": [{
-    "target_name": "<(module_name)",
-    "sources": [
-      "./modules/react-native-status/nodejs/status.cpp"
-    ],
-    "xcode_settings": {
-      "MACOSX_DEPLOYMENT_TARGET": "10.7"
-    },
-    "libraries": [
-      "<!(pwd)/result/libstatus.a"
-    ],
-    "conditions": [
-      ["OS=='mac'", {
-        "libraries": [
-          "-framework IOKit",
-          "-framework CoreFoundation",
-          "-framework CoreServices",
-          "-framework Security"
-        ]
-      }]
-    ]
-  }, {
-    "target_name": "action_after_build",
-    "type": "none",
-    "dependencies": ["<(module_name)"],
-    "copies": [
-      {
-        "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
-        "destination": "<(module_path)"
-      }
-    ]
-  }]
-}

ci/Jenkinsfile.android

@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.4.3'
+library 'status-jenkins-lib@v1.4.1'
 
 pipeline {
-  agent { label 'linux && x86_64 && nix-2.8' }
+  agent { label 'linux && x86_64 && nix-2.6' }
 
   options {
     timestamps()
@@ -81,11 +81,6 @@ pipeline {
               script { apks = android.bundle() }
             }
           }
-          stage('Sign') {
-            steps {
-              script { apks = android.sign(apks) }
-            }
-          }
         } }
       }
     }

ci/Jenkinsfile.combined

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

ci/Jenkinsfile.ios

@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.4.3'
+library 'status-jenkins-lib@v1.4.1'
 
 pipeline {
-  agent { label 'macos && x86_64 && nix-2.8 && xcode-13.3' }
+  agent { label 'macos && x86_64 && nix-2.6 && xcode-12.5' }
 
   parameters {
     string(

ci/Jenkinsfile.nix-cache

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.4.3'
+library 'status-jenkins-lib@v1.4.1'
 
 pipeline {
   agent { label params.AGENT_LABEL }
@@ -98,8 +98,8 @@ pipeline {
           nix.shell("""
               find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
                 -not -name '*.links' -and -not -name '*-status-react-*' \
-                | xargs nix copy \
-                  --to ssh-ng://${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST}
+                | xargs nix-copy-closure -v \
+                  --to ${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST}
             """,
             pure: false
           )

ci/tests/Jenkinsfile.e2e-nightly

@@ -58,7 +58,7 @@ pipeline {
             sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
-                --numprocesses 9 \
+                --numprocesses 15 \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \

ci/tests/Jenkinsfile.e2e-prs

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.4.3'
+library 'status-jenkins-lib@v1.4.1'
 
 pipeline {
 
@@ -61,8 +61,6 @@ pipeline {
         def extraPytestOpts = ''
         if (params.TR_CASE_IDS != '') {
           extraPytestOpts = "--run_testrail_ids='${params.TR_CASE_IDS}'"
-        } else {
-          extraPytestOpts = "-m \"${params.TEST_MARKERS}\""
         }
 
         withCredentials([
@@ -102,6 +100,7 @@ pipeline {
                 --numprocesses 9 \
                 --rerun_count=2 \
                 --testrail_report=True \
+                -m \"${params.TEST_MARKERS}\" \
                 -k \"${params.KEYWORD_EXPRESSION}\" \
                 --apk=${params.APK_NAME} \
                 --build=PR-${params.PR_ID}-${utils.timestamp()} \

ci/tools/Jenkinsfile.fastlane-clean

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

ci/tools/Jenkinsfile.playstore-meta

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

doc/TESTING.md

@@ -1,19 +0,0 @@
-# Testing
-
-### Unit & integration tests
-
-To run tests:
-
-```
-   make test
-```
-
-
-To watch the tests:
-
-```
-   make test-watch
-```
-  
-
-Tests will use the bindings in `modules/react-native-status/nodejs`, if you make any changes to these you will need to restart the watcher.

ios/Podfile.lock

@@ -2,7 +2,7 @@ PODS:
   - boost-for-react-native (1.63.0)
   - BVLinearGradient (2.5.6):
     - React
-  - CryptoSwift (1.4.3)
+  - CryptoSwift (1.5.1)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.63.4)
   - FBReactNativeSpec (0.63.4):
@@ -22,7 +22,6 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - HMSegmentedControl (1.5.6)
   - Keycard (3.0.5):
     - CryptoSwift
     - secp256k1
@@ -226,6 +225,8 @@ PODS:
     - React-Core
   - react-native-netinfo (4.7.0):
     - React
+  - react-native-notifications (4.1.3):
+    - React-Core
   - react-native-randombytes (3.6.1):
     - React-Core
   - react-native-safe-area-context (2.0.0):
@@ -234,8 +235,8 @@ PODS:
     - React
   - react-native-slider (3.0.0):
     - React
-  - react-native-splash-screen (3.3.0):
-    - React-Core
+  - react-native-splash-screen (3.2.0):
+    - React
   - react-native-status (1.0.0):
     - React
   - react-native-status-keycard (2.5.37):
@@ -305,14 +306,12 @@ PODS:
     - React-jsi (= 0.63.4)
   - ReactNativeAudioToolkit (2.0.3):
     - React
-  - ReactNativeNavigation (7.27.1):
-    - HMSegmentedControl
+  - ReactNativeNavigation (7.13.0):
     - React-Core
     - React-RCTImage
     - React-RCTText
-    - ReactNativeNavigation/Core (= 7.27.1)
-  - ReactNativeNavigation/Core (7.27.1):
-    - HMSegmentedControl
+    - ReactNativeNavigation/Core (= 7.13.0)
+  - ReactNativeNavigation/Core (7.13.0):
     - React-Core
     - React-RCTImage
     - React-RCTText
@@ -324,6 +323,8 @@ PODS:
     - React
   - RNCPushNotificationIOS (1.4.1):
     - React
+  - RNDeviceInfo (7.4.0):
+    - React-Core
   - RNFastImage (8.5.11):
     - React-Core
     - SDWebImage (~> 5.11.1)
@@ -432,6 +433,7 @@ DEPENDENCIES:
   - react-native-image-resizer (from `../node_modules/react-native-image-resizer`)
   - react-native-mail (from `../node_modules/react-native-mail`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
+  - react-native-notifications (from `../node_modules/react-native-notifications`)
   - 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`)
@@ -456,6 +458,7 @@ DEPENDENCIES:
   - "RNCClipboard (from `../node_modules/@react-native-community/clipboard`)"
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
   - "RNCPushNotificationIOS (from `../node_modules/@react-native-community/push-notification-ios`)"
+  - RNDeviceInfo (from `../node_modules/react-native-device-info`)
   - RNFastImage (from `../node_modules/react-native-fast-image`)
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
@@ -477,7 +480,6 @@ SPEC REPOS:
   trunk:
     - boost-for-react-native
     - CryptoSwift
-    - HMSegmentedControl
     - libwebp
     - SDWebImage
     - SDWebImageWebPCoder
@@ -543,6 +545,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-mail"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
+  react-native-notifications:
+    :path: "../node_modules/react-native-notifications"
   react-native-randombytes:
     :path: "../node_modules/react-native-randombytes"
   react-native-safe-area-context:
@@ -591,6 +595,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/@react-native-community/masked-view"
   RNCPushNotificationIOS:
     :path: "../node_modules/@react-native-community/push-notification-ios"
+  RNDeviceInfo:
+    :path: "../node_modules/react-native-device-info"
   RNFastImage:
     :path: "../node_modules/react-native-fast-image"
   RNFS:
@@ -633,13 +639,12 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
   BVLinearGradient: e3aad03778a456d77928f594a649e96995f1c872
-  CryptoSwift: a0799ee936271bd2253a006f1e4523df21845000
+  CryptoSwift: c4f2debceb38bf44c80659afe009f71e23e4a082
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
   FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 2d7c14bbcd0c3139c6258f813895cb61d7860fcc
-  HMSegmentedControl: 34c1f54d822d8308e7b24f5d901ec674dfa31352
+  glog: 61334f8bdb4deea07543d4fbac3fb5948e78a7a5
   Keycard: 07f1b4d4fadcf1218084cb3e1bb3a8bac3870c5a
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   Permission-Camera: afad27bf90337684d4a86f3825112d648c8c4d3b
@@ -663,11 +668,12 @@ SPEC CHECKSUMS:
   react-native-image-resizer: 2f1577efa3bc762597681f530c8e8d05ce0ceeb3
   react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
   react-native-netinfo: ddaca8bbb9e6e914b1a23787ccb879bc642931c9
+  react-native-notifications: 805108822ceff3440644d5701944f0cda35f5b4b
   react-native-randombytes: 421f1c7d48c0af8dbcd471b0324393ebf8fe7846
   react-native-safe-area-context: 60f654e00b6cc416573f6d5dbfce3839958eb57a
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
   react-native-slider: 12bd76d3d568c9c5500825db54123d44b48e4ad4
-  react-native-splash-screen: 4312f786b13a81b5169ef346d76d33bc0c6dc457
+  react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
   react-native-status: 45dbf1302ce3c258b459dfab137cd1c2c68c295d
   react-native-status-keycard: 961d01ca190889ddf220206822fd752f8f4f3f7a
   react-native-webview: 28a8636d97ee641f2ee8f20492d7a6c269c1d703
@@ -682,11 +688,12 @@ SPEC CHECKSUMS:
   React-RCTVibration: ae4f914cfe8de7d4de95ae1ea6cc8f6315d73d9d
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   ReactNativeAudioToolkit: de9610f323e855ac6574be8c99621f3d57c5df06
-  ReactNativeNavigation: 94979dd1572a3f093fc85d4599360530a1bed8c8
+  ReactNativeNavigation: 4c4ca87edc0da4ee818158a62cb6188088454e5c
   RNCAsyncStorage: d059c3ee71738c39834a627476322a5a8cd5bf36
   RNCClipboard: 8148e21ac347c51fd6cd4b683389094c216bb543
   RNCMaskedView: 71fc32d971f03b7f03d6ab6b86b730c4ee64f5b6
   RNCPushNotificationIOS: c145c6253ea016e5efeff604f2720736b4a596f7
+  RNDeviceInfo: 9538a884f862fe4aa0d7cead9f34e292d41ba8f6
   RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7
   RNFS: 2bd9eb49dc82fa9676382f0585b992c424cd59df
   RNGestureHandler: 7a5833d0f788dbd107fbb913e09aa0c1ff333c39

ios/launch-image-universal.storyboard

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -20,11 +19,11 @@
                             <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="launch_image" translatesAutoresizingMaskIntoConstraints="NO" id="cqW-9w-FC0">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </imageView>
                         </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="2aN-f8-qiu"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="hOp-FG-FML" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -34,8 +33,5 @@
     </scenes>
     <resources>
         <image name="launch_image" width="90" height="101"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
     </resources>
 </document>

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

@@ -370,18 +370,6 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
         }
     }
 
-    @ReactMethod
-    public void loginWithConfig(final String accountData, final String password, final String configJSON) {
-        Log.d(TAG, "loginWithConfig");
-        this.migrateKeyStoreDir(accountData, password);
-        String result = Statusgo.loginWithConfig(accountData, password, configJSON);
-        if (result.startsWith("{\"error\":\"\"")) {
-            Log.d(TAG, "LoginWithConfig result: " + result);
-        } else {
-            Log.e(TAG, "LoginWithConfig failed: " + result);
-        }
-    }
-
     @ReactMethod
     public void exportUnencryptedDatabase(final String accountData, final String password, final Callback callback) {
         Log.d(TAG, "login");
@@ -415,24 +403,12 @@ class StatusModule extends ReactContextBaseJavaModule implements LifecycleEventL
     @ReactMethod
     public void logout() {
         Log.d(TAG, "logout");
-        if (!checkAvailability()) {
-            System.exit(0);
-            return;
+        String result = Statusgo.logout();
+        if (result.startsWith("{\"error\":\"\"")) {
+            Log.d(TAG, "Logout result: " + result);
+        } else {
+            Log.e(TAG, "Logout failed: " + result);
         }
-
-        Runnable r = new Runnable() {
-            @Override
-            public void run() {
-                String result = Statusgo.logout();
-                if (result.startsWith("{\"error\":\"\"")) {
-                    Log.d(TAG, "Logout result: " + result);
-                } else {
-                    Log.e(TAG, "Logout failed: " + result);
-                }
-            }
-        };
-
-        StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
     private void deleteDirectory(File folder) {

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotification.java

@@ -126,7 +126,7 @@ public class PushNotification extends ReactContextBaseJavaModule implements Acti
 
     @ReactMethod
     public void clearAllMessageNotifications() {
-        pushNotificationHelper.clearAllMessageNotifications();
+	pushNotificationHelper.clearAllMessageNotifications();
     }
 
     @ReactMethod

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java

@@ -200,7 +200,7 @@ public class PushNotificationHelper {
     }
 
     public void clearAllMessageNotifications() {
-        notificationManager.cancelAll();
+	notificationManager.cancelAll();
     }
 
     public void sendToNotificationCentreWithPicture(final Bundle bundle, Bitmap largeIconBitmap, Bitmap bigPictureBitmap) {

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

@@ -542,19 +542,6 @@ RCT_EXPORT_METHOD(login:(NSString *)accountData
     NSLog(@"%@", result);
 }
 
-//////////////////////////////////////////////////////////////////// loginWithConfig
-RCT_EXPORT_METHOD(loginWithConfig:(NSString *)accountData
-                  password:(NSString *)password
-                  configJSON:(NSString *)configJSON) {
-#if DEBUG
-    NSLog(@"LoginWithConfig() method called");
-#endif
-    [self getExportDbFilePath];
-    [self migrateKeystore:accountData password:password];
-    NSString *result = StatusgoLoginWithConfig(accountData, password, configJSON);
-    NSLog(@"%@", result);
-}
-
 //////////////////////////////////////////////////////////////////// loginWithKeycard
 RCT_EXPORT_METHOD(loginWithKeycard:(NSString *)accountData
                   password:(NSString *)password

modules/react-native-status/nodejs/bindings.js

@@ -1,6 +0,0 @@
-var binary = require('@mapbox/node-pre-gyp');
-var path = require('path');
-var binding_path = binary.find(path.resolve(path.join(__dirname,'./../../../package.json')));
-
-module.exports = require(binding_path);
-

nix/README.md

@@ -19,6 +19,7 @@ Here is a sample structure of the `config` attribute set:
     build-number = 9999;   # Used for versionCode and CFBundleVersion in Android and iOS respectively
     android = {
       gradle-opts = "";    # Gradle options passed for Android builds
+      keystore-path = "";  # Path to keystore for signing the APK
       abi-split = false;   # If APKs should be split based on architectures
       abi-include = "x86"; # Android architectures to build for
     };

nix/config.nix

@@ -7,6 +7,7 @@
 
     android = {
       gradle-opts = null;    # Gradle options passed for Android builds
+      keystore-path = null;  # Path to keystore for signing the APK
       apk-signed = true;     # F-Droid builds aren't signed by us
       abi-split = false;     # If APKs should be split based on architectures
       abi-include = "armeabi-v7a;arm64-v8a;x86"; # Android architectures to build for

nix/deps/gradle/README.md

@@ -45,7 +45,7 @@ One dependency these scripts require is the [go-maven-resolver](https://github.c
 
 # Known Issues
 
-One edge case that is currently not automatically handled by this setup is an addition of a new dependency that requires a version of Gradle we don't have. In that case running `make nix-update-gradle` would fail with:
+One edge case that is currently not handled by this setup is an addition of a new dependency that requires a version of Gradle we don't have. In that case running `make nix-update-gradle` would fail with:
 ```
 AILURE: Build failed with an exception.
 
@@ -61,14 +61,16 @@ A problem occurred configuring project ':react-native-example-project'.
 ```
 This happens because `get_projects.sh` and `get_deps.sh` depend on running Gradle to generate their output, and that will not work because Gradle cannot find the matching JAR for the new dependency.
 
-You can use the `add_package.sh` script to add missing Gradle dependencies:
+A manual solution would involve adding that specific Gradle version into `deps.urls`:
 ```
- > make shell TARGET=gradle
-Configuring Nix shell for target 'gradle'...
-
-[nix-shell:~/status-react]$ nix/deps/gradle/add_package.sh com.android.tools.build:gradle:3.4.0
-Regenerating Nix files...
-Found 548 direct dependencies...
-Successfully added: com.android.tools.build:gradle:3.4.0
+echo com.android.tools.build:gradle:3.4.0 | go-maven-resolver >> nix/deps/gradle/deps.urls
 ```
-This may take a bit longer than normal `make nix-update-gradle` but should add the missing package.
+Then you'll need to remove duplicates and sort `deps.urls`:
+```
+sort -uo nix/deps/gradle/deps.urls nix/deps/gradle/deps.urls
+```
+And finally generate the `deps.json` for Nix using:
+```
+nix/deps/gradle/generate.sh gen_deps_json
+```
+After run `make nix-update-gradle` and it should work just fine.

nix/deps/gradle/add_package.sh

@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-set -Eeu
-
-if [[ $# -ne 1 ]]; then
-    echo "Usage: add_package.sh <package>" >&2
-    exit 1
-fi
-if ! command -v go-maven-resolver &> /dev/null; then
-   echo "Use 'make shell TARGET=gradle' for this script" >&2
-    exit 1
-fi
-
-GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/scripts/colors.sh"
-
-# Add missing package to dependencies.
-echo "${1}" | go-maven-resolver >> nix/deps/gradle/deps.urls
-
-# Remove duplicates and sort.
-sort -uo nix/deps/gradle/deps.urls nix/deps/gradle/deps.urls
-
-# Re-generate dependencies JSON.
-${GIT_ROOT}/nix/deps/gradle/generate.sh gen_deps_json
-
-# Re-generate dependencies list.
-${GIT_ROOT}/nix/deps/gradle/generate.sh gen_deps_list
-
-echo -e "${GRN}Successfully added:${RST} ${BLD}${1}${RST}" >&2

nix/deps/gradle/deps.list

@@ -1,18 +1,15 @@
 androidx.activity:activity:1.0.0
-androidx.activity:activity:1.2.4
-androidx.annotation:annotation-experimental:1.1.0
+androidx.annotation:annotation-experimental:1.0.0
 androidx.annotation:annotation:1.0.0
 androidx.annotation:annotation:1.1.0
-androidx.annotation:annotation:1.2.0
 androidx.appcompat:appcompat-resources:1.1.0
-androidx.appcompat:appcompat-resources:1.3.1
+androidx.appcompat:appcompat-resources:1.2.0
 androidx.appcompat:appcompat:1.0.2
 androidx.appcompat:appcompat:1.1.0
-androidx.appcompat:appcompat:1.3.1
+androidx.appcompat:appcompat:1.2.0
 androidx.arch.core:core-common:2.0.0
 androidx.arch.core:core-common:2.1.0
 androidx.arch.core:core-runtime:2.0.0
-androidx.arch.core:core-runtime:2.1.0
 androidx.asynclayoutinflater:asynclayoutinflater:1.0.0
 androidx.cardview:cardview:1.0.0
 androidx.collection:collection:1.0.0
@@ -21,10 +18,10 @@ androidx.constraintlayout:constraintlayout-solver:2.0.4
 androidx.constraintlayout:constraintlayout:2.0.4
 androidx.coordinatorlayout:coordinatorlayout:1.0.0
 androidx.coordinatorlayout:coordinatorlayout:1.1.0
-androidx.core:core-ktx:1.6.0
+androidx.core:core-ktx:1.3.2
 androidx.core:core:1.0.1
 androidx.core:core:1.1.0
-androidx.core:core:1.6.0
+androidx.core:core:1.3.2
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview:1.0.0
 androidx.databinding:databinding-common:3.2.1
@@ -40,24 +37,18 @@ androidx.exifinterface:exifinterface:1.1.0-rc01
 androidx.exifinterface:exifinterface:1.2.0
 androidx.fragment:fragment:1.0.0
 androidx.fragment:fragment:1.1.0
-androidx.fragment:fragment:1.3.6
 androidx.interpolator:interpolator:1.0.0
 androidx.legacy:legacy-support-core-ui:1.0.0
 androidx.legacy:legacy-support-core-utils:1.0.0
 androidx.legacy:legacy-support-v4:1.0.0
 androidx.lifecycle:lifecycle-common:2.0.0
 androidx.lifecycle:lifecycle-common:2.1.0
-androidx.lifecycle:lifecycle-common:2.3.1
 androidx.lifecycle:lifecycle-livedata-core:2.0.0
-androidx.lifecycle:lifecycle-livedata-core:2.3.1
 androidx.lifecycle:lifecycle-livedata:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.0.0
 androidx.lifecycle:lifecycle-runtime:2.1.0
-androidx.lifecycle:lifecycle-runtime:2.3.1
-androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1
 androidx.lifecycle:lifecycle-viewmodel:2.0.0
 androidx.lifecycle:lifecycle-viewmodel:2.1.0
-androidx.lifecycle:lifecycle-viewmodel:2.3.1
 androidx.loader:loader:1.0.0
 androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
 androidx.media:media:1.0.0
@@ -66,11 +57,11 @@ androidx.print:print:1.0.0
 androidx.recyclerview:recyclerview:1.0.0
 androidx.recyclerview:recyclerview:1.1.0
 androidx.savedstate:savedstate:1.0.0
-androidx.savedstate:savedstate:1.1.0
 androidx.slidingpanelayout:slidingpanelayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.0.0
 androidx.swiperefreshlayout:swiperefreshlayout:1.1.0
-androidx.tracing:tracing:1.0.0
+androidx.test:monitor:1.2.0
+androidx.test:monitor:1.3.0-rc03
 androidx.transition:transition:1.2.0
 androidx.transition:transition:1.2.0-rc01
 androidx.vectordrawable:vectordrawable-animated:1.0.0
@@ -79,10 +70,11 @@ androidx.vectordrawable:vectordrawable:1.0.1
 androidx.vectordrawable:vectordrawable:1.1.0
 androidx.versionedparcelable:versionedparcelable:1.0.0
 androidx.versionedparcelable:versionedparcelable:1.1.0
-androidx.versionedparcelable:versionedparcelable:1.1.1
 androidx.viewpager2:viewpager2:1.0.0
 androidx.viewpager:viewpager:1.0.0
 androidx.webkit:webkit:1.4.0
+backport-util-concurrent:backport-util-concurrent:3.1
+classworlds:classworlds:1.1-alpha-2
 commons-codec:commons-codec:1.4
 commons-codec:commons-codec:1.6
 commons-codec:commons-codec:1.9
@@ -93,6 +85,7 @@ commons-logging:commons-logging:1.2
 com.adobe.xmp:xmpcore:5.1.2
 com.afollestad.material-dialogs:commons:0.9.6.0
 com.afollestad.material-dialogs:core:0.9.6.0
+com.almworks.sqlite4java:sqlite4java:0.282
 com.android.databinding:baseLibrary:1.0-rc5
 com.android.databinding:baseLibrary:3.0.0
 com.android.databinding:baseLibrary:3.0.1
@@ -104,6 +97,7 @@ 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.installreferrer:installreferrer:1.1.2
 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
@@ -360,8 +354,26 @@ com.github.wix-playground:reflow-animator:1.0.6
 com.github.yalantis:ucrop:2.2.6-native
 com.googlecode.json-simple:json-simple:1.1
 com.googlecode.juniversalchardet:juniversalchardet:1.0.3
+com.google.android.apps.common.testing.accessibility.framework:accessibility-test-framework:2.1
+com.google.android.datatransport:transport-api:2.2.1
+com.google.android.datatransport:transport-api:3.0.0
+com.google.android.datatransport:transport-backend-cct:2.3.3
+com.google.android.datatransport:transport-backend-cct:3.0.0
+com.google.android.datatransport:transport-runtime:2.2.5
+com.google.android.datatransport:transport-runtime:3.0.0
+com.google.android.gms:play-services-basement:17.0.0
+com.google.android.gms:play-services-base:17.0.0
+com.google.android.gms:play-services-cloud-messaging:16.0.0
+com.google.android.gms:play-services-cloud-messaging:17.0.0
+com.google.android.gms:play-services-iid:17.0.0
+com.google.android.gms:play-services-stats:17.0.0
+com.google.android.gms:play-services-tasks:17.0.0
+com.google.android.gms:strict-version-matcher-plugin:1.2.2
 com.google.android.material:material:1.2.0-alpha03
+com.google.auto.service:auto-service:1.0-rc4
+com.google.auto.value:auto-value-annotations:1.6.2
 com.google.auto.value:auto-value:1.5.2
+com.google.auto:auto-common:0.8
 com.google.code.findbugs:jsr305:1.3.9
 com.google.code.findbugs:jsr305:3.0.2
 com.google.code.gson:gson:2.2.4
@@ -374,6 +386,28 @@ 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.firebase:firebase-annotations:16.0.0
+com.google.firebase:firebase-common:19.5.0
+com.google.firebase:firebase-common:20.0.0
+com.google.firebase:firebase-components:16.1.0
+com.google.firebase:firebase-components:17.0.0
+com.google.firebase:firebase-datatransport:17.0.10
+com.google.firebase:firebase-datatransport:18.0.0
+com.google.firebase:firebase-encoders-json:17.1.0
+com.google.firebase:firebase-encoders-json:18.0.0
+com.google.firebase:firebase-encoders:16.1.0
+com.google.firebase:firebase-encoders:17.0.0
+com.google.firebase:firebase-iid-interop:17.1.0
+com.google.firebase:firebase-iid:21.1.0
+com.google.firebase:firebase-installations-interop:16.0.1
+com.google.firebase:firebase-installations-interop:17.0.0
+com.google.firebase:firebase-installations:16.3.5
+com.google.firebase:firebase-installations:17.0.0
+com.google.firebase:firebase-measurement-connector:18.0.0
+com.google.firebase:firebase-measurement-connector:19.0.0
+com.google.firebase:firebase-messaging:21.1.0
+com.google.firebase:firebase-messaging:23.0.0
+com.google.gms:google-services:4.3.10
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:17.0
 com.google.guava:guava:22.0
@@ -384,12 +418,16 @@ com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.1
 com.google.jimfs:jimfs:1.1
 com.google.protobuf:protobuf-java-util:3.4.0
+com.google.protobuf:protobuf-java:2.6.1
 com.google.protobuf:protobuf-java:3.0.0
 com.google.protobuf:protobuf-java:3.4.0
 com.google.zxing:core:3.3.0
+com.ibm.icu:icu4j:53.1
 com.intellij:annotations:12.0
+com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0
 com.parse.bolts:bolts-applinks:1.4.0
 com.parse.bolts:bolts-tasks:1.4.0
+com.squareup.assertj:assertj-android:1.1.1
 com.squareup.okhttp3:okhttp-tls:3.12.12
 com.squareup.okhttp3:okhttp-urlconnection:3.12.12
 com.squareup.okhttp3:okhttp:3.12.12
@@ -405,10 +443,17 @@ com.tunnelvisionlabs:antlr4:4.5
 de.undercouch:gradle-download-task:3.4.3
 de.undercouch:gradle-download-task:4.0.2
 it.unimi.dsi:fastutil:7.2.0
+javax.annotation:javax.annotation-api:1.3.2
 javax.inject:javax.inject:1
 javax.xml.bind:jaxb-api:2.2.12-b140109.1041
 junit:junit:4.12
 me.zhanghai.android.materialprogressbar:library:1.4.2
+nekohtml:nekohtml:1.9.6.2
+nekohtml:xercesMinimal:1.9.6.2
+net.bytebuddy:byte-buddy-agent:1.9.10
+net.bytebuddy:byte-buddy-agent:1.10.18
+net.bytebuddy:byte-buddy:1.9.10
+net.bytebuddy:byte-buddy:1.10.18
 net.sf.jopt-simple:jopt-simple:4.9
 net.sf.kxml:kxml2:2.3.0
 net.sf.proguard:proguard-base:5.1
@@ -425,6 +470,8 @@ org.antlr:antlr4-runtime:4.5.2-1
 org.antlr:antlr4:4.5.3
 org.antlr:antlr-runtime:3.5.2
 org.antlr:antlr:3.5.2
+org.apache.ant:ant-launcher:1.8.0
+org.apache.ant:ant:1.8.0
 org.apache.commons:commons-compress:1.8.1
 org.apache.commons:commons-compress:1.12
 org.apache.commons:commons-lang3:3.3.2
@@ -442,15 +489,36 @@ org.apache.httpcomponents:httpcore:4.4.10
 org.apache.httpcomponents:httpmime:4.1
 org.apache.httpcomponents:httpmime:4.5.2
 org.apache.httpcomponents:httpmime:4.5.6
+org.apache.maven.wagon:wagon-file:1.0-beta-6
+org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6
+org.apache.maven.wagon:wagon-http-shared:1.0-beta-6
+org.apache.maven.wagon:wagon-provider-api:1.0-beta-6
+org.apache.maven:maven-ant-tasks:2.1.3
+org.apache.maven:maven-artifact-manager:2.2.1
+org.apache.maven:maven-artifact:2.2.1
+org.apache.maven:maven-error-diagnostics:2.2.1
+org.apache.maven:maven-model:2.2.1
+org.apache.maven:maven-plugin-registry:2.2.1
+org.apache.maven:maven-profile:2.2.1
+org.apache.maven:maven-project:2.2.1
+org.apache.maven:maven-repository-metadata:2.2.1
+org.apache.maven:maven-settings:2.2.1
+org.apiguardian:apiguardian-api:1.1.0
+org.assertj:assertj-core:3.8.0
 org.bouncycastle:bcpkix-jdk15on:1.48
 org.bouncycastle:bcpkix-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.48
+org.bouncycastle:bcprov-jdk15on:1.52
 org.bouncycastle:bcprov-jdk15on:1.56
 org.bouncycastle:bcprov-jdk15on:1.60
+org.bouncycastle:bcprov-jdk15on:1.65
 org.checkerframework:checker-qual:2.5.2
 org.codehaus.groovy:groovy-all:2.4.15
 org.codehaus.mojo:animal-sniffer-annotations:1.14
 org.codehaus.mojo:animal-sniffer-annotations:1.17
+org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1
+org.codehaus.plexus:plexus-interpolation:1.11
+org.codehaus.plexus:plexus-utils:1.5.15
 org.conscrypt:conscrypt-android:2.0.0
 org.eclipse.jdt.core.compiler:ecj:4.4
 org.eclipse.jdt.core.compiler:ecj:4.4.2
@@ -459,14 +527,16 @@ org.glassfish.jaxb:jaxb-core:2.2.11
 org.glassfish.jaxb:jaxb-runtime:2.2.11
 org.glassfish.jaxb:txw2:2.2.11
 org.hamcrest:hamcrest-core:1.3
+org.hamcrest:hamcrest-library:1.3
 org.jacoco:org.jacoco.core:0.7.4.201502262128
 org.jacoco:org.jacoco.report:0.7.4.201502262128
 org.jdom:jdom2:2.0.6
 org.jetbrains.intellij.deps:trove4j:1.0.20181211
-org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2
-org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.2
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.4.3
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8
+org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.4.31
 org.jetbrains.kotlin:kotlin-android-extensions:1.3.50
 org.jetbrains.kotlin:kotlin-android-extensions:1.4.31
 org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.3.50
@@ -508,15 +578,16 @@ org.jetbrains.kotlin:kotlin-stdlib-common:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-common:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib-common:1.4.31
-org.jetbrains.kotlin:kotlin-stdlib-common:1.5.30
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.31
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.50
-org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.30
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31
 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
@@ -525,24 +596,64 @@ org.jetbrains.kotlin:kotlin-stdlib:1.2.71
 org.jetbrains.kotlin:kotlin-stdlib:1.3.20
 org.jetbrains.kotlin:kotlin-stdlib:1.3.50
 org.jetbrains.kotlin:kotlin-stdlib:1.4.31
-org.jetbrains.kotlin:kotlin-stdlib:1.5.30
+org.jetbrains.kotlin:kotlin-test-common:1.4.31
+org.jetbrains.kotlin:kotlin-test:1.4.31
 org.jetbrains.kotlin:kotlin-util-io:1.3.50
 org.jetbrains.kotlin:kotlin-util-io:1.4.31
 org.jetbrains.kotlin:kotlin-util-klib:1.4.31
 org.jetbrains.trove4j:trove4j:20160824
 org.jetbrains:annotations:13.0
+org.junit.jupiter:junit-jupiter-api:5.7.0
+org.junit.platform:junit-platform-commons:1.7.0
 org.jvnet.staxex:stax-ex:1.7.7
+org.mockito:mockito-core:2.28.2
+org.mockito:mockito-core:3.6.28
+org.objenesis:objenesis:2.6
+org.objenesis:objenesis:3.1
+org.opentest4j:opentest4j:1.2.0
 org.ow2.asm:asm-analysis:5.0.3
 org.ow2.asm:asm-analysis:5.1
 org.ow2.asm:asm-analysis:6.0
+org.ow2.asm:asm-analysis:7.0
+org.ow2.asm:asm-analysis:7.2
 org.ow2.asm:asm-commons:5.1
 org.ow2.asm:asm-commons:6.0
+org.ow2.asm:asm-commons:7.0
+org.ow2.asm:asm-commons:7.2
 org.ow2.asm:asm-debug-all:5.0.1
 org.ow2.asm:asm-tree:5.0.3
 org.ow2.asm:asm-tree:5.1
 org.ow2.asm:asm-tree:6.0
+org.ow2.asm:asm-tree:7.0
+org.ow2.asm:asm-tree:7.2
 org.ow2.asm:asm-util:5.1
 org.ow2.asm:asm-util:6.0
+org.ow2.asm:asm-util:7.0
+org.ow2.asm:asm-util:7.2
 org.ow2.asm:asm:5.0.3
 org.ow2.asm:asm:5.1
 org.ow2.asm:asm:6.0
+org.ow2.asm:asm:7.0
+org.ow2.asm:asm:7.2
+org.robolectric:annotations:4.3
+org.robolectric:annotations:4.4
+org.robolectric:junit:4.3
+org.robolectric:junit:4.4
+org.robolectric:pluginapi:4.3
+org.robolectric:pluginapi:4.4
+org.robolectric:plugins-maven-dependency-resolver:4.3
+org.robolectric:plugins-maven-dependency-resolver:4.4
+org.robolectric:resources:4.3
+org.robolectric:resources:4.4
+org.robolectric:robolectric:4.3
+org.robolectric:robolectric:4.4
+org.robolectric:sandbox:4.3
+org.robolectric:sandbox:4.4
+org.robolectric:shadowapi:4.3
+org.robolectric:shadowapi:4.4
+org.robolectric:shadows-framework:4.3
+org.robolectric:shadows-framework:4.4
+org.robolectric:utils-reflector:4.3
+org.robolectric:utils-reflector:4.4
+org.robolectric:utils:4.3
+org.robolectric:utils:4.4

nix/deps/gradle/deps.urls

@@ -1,25 +1,19 @@
 https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.0.0/activity-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/activity/activity/1.2.4/activity-1.2.4.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.0.0/annotation-experimental-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/annotation/annotation-experimental/1.1.0/annotation-experimental-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.0/annotation-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.1/annotation-1.0.1.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.0.2/annotation-1.0.2.pom
 https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.1.0/annotation-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/annotation/annotation/1.2.0/annotation-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.1.0/appcompat-resources-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.2.0/appcompat-resources-1.2.0.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat-resources/1.3.1/appcompat-resources-1.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.0/appcompat-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.0.2/appcompat-1.0.2.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.1.0/appcompat-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.2.0/appcompat-1.2.0.pom
-https://dl.google.com/dl/android/maven2/androidx/appcompat/appcompat/1.3.1/appcompat-1.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.0/core-common-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.0.1/core-common-2.0.1.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-common/2.1.0/core-common-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.0.0/core-runtime-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/arch/core/core-runtime/2.1.0/core-runtime-2.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/asynclayoutinflater/asynclayoutinflater/1.0.0/asynclayoutinflater-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/cardview/cardview/1.0.0/cardview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/collection/collection/1.0.0/collection-1.0.0.pom
@@ -28,15 +22,13 @@ https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayo
 https://dl.google.com/dl/android/maven2/androidx/constraintlayout/constraintlayout/2.0.4/constraintlayout-2.0.4.pom
 https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.0.0/coordinatorlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/coordinatorlayout/coordinatorlayout/1.1.0/coordinatorlayout-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.6.0/core-ktx-1.6.0.pom
+https://dl.google.com/dl/android/maven2/androidx/core/core-ktx/1.3.2/core-ktx-1.3.2.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.0/core-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.0.1/core-1.0.1.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.1.0/core-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.2.0/core-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.0/core-1.3.0.pom
 https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.1/core-1.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.5.0/core-1.5.0.pom
-https://dl.google.com/dl/android/maven2/androidx/core/core/1.6.0/core-1.6.0.pom
+https://dl.google.com/dl/android/maven2/androidx/core/core/1.3.2/core-1.3.2.pom
 https://dl.google.com/dl/android/maven2/androidx/cursoradapter/cursoradapter/1.0.0/cursoradapter-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/customview/customview/1.0.0/customview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/databinding/databinding-common/3.2.1/databinding-common-3.2.1.pom
@@ -52,24 +44,18 @@ https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.1
 https://dl.google.com/dl/android/maven2/androidx/exifinterface/exifinterface/1.2.0/exifinterface-1.2.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.0.0/fragment-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.1.0/fragment-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/fragment/fragment/1.3.6/fragment-1.3.6.pom
 https://dl.google.com/dl/android/maven2/androidx/interpolator/interpolator/1.0.0/interpolator-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-ui/1.0.0/legacy-support-core-ui-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-core-utils/1.0.0/legacy-support-core-utils-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/legacy/legacy-support-v4/1.0.0/legacy-support-v4-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.0.0/lifecycle-common-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.1.0/lifecycle-common-2.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-common/2.3.1/lifecycle-common-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.0.0/lifecycle-livedata-core-2.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata-core/2.3.1/lifecycle-livedata-core-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-livedata/2.0.0/lifecycle-livedata-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.0.0/lifecycle-runtime-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.1.0/lifecycle-runtime-2.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-runtime/2.3.1/lifecycle-runtime-2.3.1.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel-savedstate/2.3.1/lifecycle-viewmodel-savedstate-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.0.0/lifecycle-viewmodel-2.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.1.0/lifecycle-viewmodel-2.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/lifecycle/lifecycle-viewmodel/2.3.1/lifecycle-viewmodel-2.3.1.pom
 https://dl.google.com/dl/android/maven2/androidx/loader/loader/1.0.0/loader-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/localbroadcastmanager/localbroadcastmanager/1.0.0/localbroadcastmanager-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/media/media/1.0.0/media-1.0.0.pom
@@ -78,11 +64,11 @@ https://dl.google.com/dl/android/maven2/androidx/print/print/1.0.0/print-1.0.0.p
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.0.0/recyclerview-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/recyclerview/recyclerview/1.1.0/recyclerview-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.0.0/savedstate-1.0.0.pom
-https://dl.google.com/dl/android/maven2/androidx/savedstate/savedstate/1.1.0/savedstate-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/slidingpanelayout/slidingpanelayout/1.0.0/slidingpanelayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.0.0/swiperefreshlayout-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/swiperefreshlayout/swiperefreshlayout/1.1.0/swiperefreshlayout-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/tracing/tracing/1.0.0/tracing-1.0.0.pom
+https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.2.0/monitor-1.2.0.pom
+https://dl.google.com/dl/android/maven2/androidx/test/monitor/1.3.0-rc03/monitor-1.3.0-rc03.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.0.0/transition-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0-rc01/transition-1.2.0-rc01.pom
 https://dl.google.com/dl/android/maven2/androidx/transition/transition/1.2.0/transition-1.2.0.pom
@@ -93,7 +79,6 @@ https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1
 https://dl.google.com/dl/android/maven2/androidx/vectordrawable/vectordrawable/1.1.0/vectordrawable-1.1.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.0.0/versionedparcelable-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0/versionedparcelable-1.1.0.pom
-https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.1/versionedparcelable-1.1.1.pom
 https://dl.google.com/dl/android/maven2/androidx/viewpager2/viewpager2/1.0.0/viewpager2-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0.pom
 https://dl.google.com/dl/android/maven2/androidx/webkit/webkit/1.4.0/webkit-1.4.0.pom
@@ -109,14 +94,17 @@ https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.5.
 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/installreferrer/installreferrer/1.1.2/installreferrer-1.1.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/26.0.2/animated-vector-drawable-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/animated-vector-drawable/27.0.1/animated-vector-drawable-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/26.0.2/appcompat-v7-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/27.0.1/appcompat-v7-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/recyclerview-v7/27.0.1/recyclerview-v7-27.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/26.0.2/support-annotations-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/26.1.0/support-annotations-26.1.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/27.0.1/support-annotations-27.0.1.pom
+https://dl.google.com/dl/android/maven2/com/android/support/support-annotations/28.0.0/support-annotations-28.0.0.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-compat/26.0.2/support-compat-26.0.2.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-compat/27.0.1/support-compat-27.0.1.pom
 https://dl.google.com/dl/android/maven2/com/android/support/support-core-ui/26.0.2/support-core-ui-26.0.2.pom
@@ -280,8 +268,46 @@ https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.1.4/sdk-
 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
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.0/transport-api-2.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/2.2.1/transport-api-2.2.1.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-api/3.0.0/transport-api-3.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/2.3.3/transport-backend-cct-2.3.3.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-backend-cct/3.0.0/transport-backend-cct-3.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.0/transport-runtime-2.2.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/2.2.5/transport-runtime-2.2.5.pom
+https://dl.google.com/dl/android/maven2/com/google/android/datatransport/transport-runtime/3.0.0/transport-runtime-3.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/17.0.0/play-services-basement-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-base/17.0.0/play-services-base-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-cloud-messaging/16.0.0/play-services-cloud-messaging-16.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-cloud-messaging/17.0.0/play-services-cloud-messaging-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-iid/17.0.0/play-services-iid-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-stats/17.0.0/play-services-stats-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-tasks/17.0.0/play-services-tasks-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/android/gms/strict-version-matcher-plugin/1.2.2/strict-version-matcher-plugin-1.2.2.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.0.0/material-1.0.0.pom
 https://dl.google.com/dl/android/maven2/com/google/android/material/material/1.2.0-alpha03/material-1.2.0-alpha03.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-annotations/16.0.0/firebase-annotations-16.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/19.5.0/firebase-common-19.5.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-common/20.0.0/firebase-common-20.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/16.1.0/firebase-components-16.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-components/17.0.0/firebase-components-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-datatransport/17.0.10/firebase-datatransport-17.0.10.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-datatransport/18.0.0/firebase-datatransport-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/17.1.0/firebase-encoders-json-17.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders-json/18.0.0/firebase-encoders-json-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/16.1.0/firebase-encoders-16.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-encoders/17.0.0/firebase-encoders-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid-interop/17.1.0/firebase-iid-interop-17.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-iid/21.1.0/firebase-iid-21.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations-interop/16.0.1/firebase-installations-interop-16.0.1.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations-interop/17.0.0/firebase-installations-interop-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations/16.3.5/firebase-installations-16.3.5.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-installations/17.0.0/firebase-installations-17.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measurement-connector/18.0.0/firebase-measurement-connector-18.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-measurement-connector/19.0.0/firebase-measurement-connector-19.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messaging/21.1.0/firebase-messaging-21.1.0.pom
+https://dl.google.com/dl/android/maven2/com/google/firebase/firebase-messaging/23.0.0/firebase-messaging-23.0.0.pom
+https://dl.google.com/dl/android/maven2/com/google/gms/google-services/4.3.10/google-services-4.3.10.pom
 https://jitpack.io/com/github/status-im/function/0.0.1/function-0.0.1.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/android/3.0.4/android-3.0.4.pom
 https://jitpack.io/com/github/status-im/status-keycard-java/lib/3.0.4/lib-3.0.4.pom
@@ -299,18 +325,27 @@ https://plugins.gradle.org/m2/com/facebook/fresco/nativeimagefilters/2.2.0/nativ
 https://plugins.gradle.org/m2/com/facebook/fresco/stetho/2.2.0/stetho-2.2.0.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.1/antlr-2.7.1.pom
 https://repo.maven.apache.org/maven2/antlr/antlr/2.7.7/antlr-2.7.7.pom
+https://repo.maven.apache.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.pom
+https://repo.maven.apache.org/maven2/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom
+https://repo.maven.apache.org/maven2/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom
 https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.pom
+https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.2/commons-codec-1.2.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.4/commons-codec-1.4.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.6/commons-codec-1.6.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.10/commons-codec-1.10.pom
 https://repo.maven.apache.org/maven2/commons-codec/commons-codec/1.15/commons-codec-1.15.pom
+https://repo.maven.apache.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom
 https://repo.maven.apache.org/maven2/commons-io/commons-io/2.4/commons-io-2.4.pom
+https://repo.maven.apache.org/maven2/commons-io/commons-io/2.6/commons-io-2.6.pom
+https://repo.maven.apache.org/maven2/commons-io/commons-io/2.11.0/commons-io-2.11.0.pom
+https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom
 https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.pom
 https://repo.maven.apache.org/maven2/com/adobe/xmp/xmpcore/5.1.2/xmpcore-5.1.2.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/commons/0.9.6.0/commons-0.9.6.0.pom
 https://repo.maven.apache.org/maven2/com/afollestad/material-dialogs/core/0.9.6.0/core-0.9.6.0.pom
+https://repo.maven.apache.org/maven2/com/almworks/sqlite4java/sqlite4java/0.282/sqlite4java-0.282.pom
 https://repo.maven.apache.org/maven2/com/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5.pom
 https://repo.maven.apache.org/maven2/com/android/databinding/compilerCommon/1.0-rc5/compilerCommon-1.0-rc5.pom
 https://repo.maven.apache.org/maven2/com/android/tools/annotations/24.1.3/annotations-24.1.3.pom
@@ -410,8 +445,15 @@ https://repo.maven.apache.org/maven2/com/github/clans/fab/1.6.4/fab-1.6.4.pom
 https://repo.maven.apache.org/maven2/com/github/gundy/semver4j/0.16.4/semver4j-0.16.4.pom
 https://repo.maven.apache.org/maven2/com/googlecode/json-simple/json-simple/1.1/json-simple-1.1.pom
 https://repo.maven.apache.org/maven2/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.pom
+https://repo.maven.apache.org/maven2/com/google/android/apps/common/testing/accessibility/framework/accessibility-test-framework/2.1/accessibility-test-framework-2.1.pom
+https://repo.maven.apache.org/maven2/com/google/auto/auto-common/0.8/auto-common-0.8.pom
 https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/3/auto-parent-3.pom
+https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/5/auto-parent-5.pom
+https://repo.maven.apache.org/maven2/com/google/auto/auto-parent/6/auto-parent-6.pom
+https://repo.maven.apache.org/maven2/com/google/auto/service/auto-service/1.0-rc4/auto-service-1.0-rc4.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.6.2/auto-value-annotations-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-annotations/1.9/auto-value-annotations-1.9.pom
+https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.6.2/auto-value-parent-1.6.2.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value-parent/1.9/auto-value-parent-1.9.pom
 https://repo.maven.apache.org/maven2/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.pom
 https://repo.maven.apache.org/maven2/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.pom
@@ -428,6 +470,7 @@ https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.7/gson-2.7.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.0/gson-2.8.0.pom
 https://repo.maven.apache.org/maven2/com/google/code/gson/gson/2.8.5/gson-2.8.5.pom
 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/dagger/dagger/2.24/dagger-2.24.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
@@ -439,6 +482,7 @@ https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.3.1/error_prone_parent-2.3.1.pom
 https://repo.maven.apache.org/maven2/com/google/errorprone/error_prone_parent/2.13.1/error_prone_parent-2.13.1.pom
 https://repo.maven.apache.org/maven2/com/google/google/1/google-1.pom
+https://repo.maven.apache.org/maven2/com/google/google/5/google-5.pom
 https://repo.maven.apache.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/17.0/guava-parent-17.0.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava-parent/22.0/guava-parent-22.0.pom
@@ -455,12 +499,15 @@ https://repo.maven.apache.org/maven2/com/google/guava/guava/26.0-jre/guava-26.0-
 https://repo.maven.apache.org/maven2/com/google/guava/guava/27.0.1-jre/guava-27.0.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/guava/31.1-jre/guava-31.1-jre.pom
 https://repo.maven.apache.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.pom
+https://repo.maven.apache.org/maven2/com/google/inject/guice-parent/5.1.0/guice-parent-5.1.0.pom
+https://repo.maven.apache.org/maven2/com/google/inject/guice/5.1.0/guice-5.1.0.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.1/j2objc-annotations-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.pom
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs-parent/1.1/jimfs-parent-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/jimfs/jimfs/1.1/jimfs-1.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-bom/4.0.0-rc-2/protobuf-bom-4.0.0-rc-2.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java-util/3.4.0/protobuf-java-util-3.4.0.pom
+https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/2.6.1/protobuf-java-2.6.1.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.0.0/protobuf-java-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/3.4.0/protobuf-java-3.4.0.pom
 https://repo.maven.apache.org/maven2/com/google/protobuf/protobuf-java/4.0.0-rc-2/protobuf-java-4.0.0-rc-2.pom
@@ -471,9 +518,12 @@ https://repo.maven.apache.org/maven2/com/google/truth/truth-parent/1.1.3/truth-p
 https://repo.maven.apache.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/core/3.3.0/core-3.3.0.pom
 https://repo.maven.apache.org/maven2/com/google/zxing/zxing-parent/3.3.0/zxing-parent-3.3.0.pom
+https://repo.maven.apache.org/maven2/com/ibm/icu/icu4j/53.1/icu4j-53.1.pom
 https://repo.maven.apache.org/maven2/com/intellij/annotations/12.0/annotations-12.0.pom
+https://repo.maven.apache.org/maven2/com/nhaarman/mockitokotlin2/mockito-kotlin/2.2.0/mockito-kotlin-2.2.0.pom
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-applinks/1.4.0/bolts-applinks-1.4.0.pom
 https://repo.maven.apache.org/maven2/com/parse/bolts/bolts-tasks/1.4.0/bolts-tasks-1.4.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/assertj/assertj-android/1.1.1/assertj-android-1.1.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/javapoet/1.8.0/javapoet-1.8.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/javawriter/2.5.0/javawriter-2.5.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-tls/3.12.12/okhttp-tls-3.12.12.pom
@@ -481,12 +531,13 @@ https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp-urlconnection/3
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.9.1/okhttp-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.1/okhttp-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/3.12.12/okhttp-3.12.12.pom
-https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.7/okhttp-5.0.0-alpha.7.pom
+https://repo.maven.apache.org/maven2/com/squareup/okhttp3/okhttp/5.0.0-alpha.6/okhttp-5.0.0-alpha.6.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.9.1/parent-3.9.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.1/parent-3.12.1.pom
 https://repo.maven.apache.org/maven2/com/squareup/okhttp3/parent/3.12.12/parent-3.12.12.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio-parent/1.15.0/okio-parent-1.15.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/1.15.0/okio-1.15.0.pom
+https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.0.0/okio-3.0.0.pom
 https://repo.maven.apache.org/maven2/com/squareup/okio/okio/3.1.0/okio-3.1.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/all/1.2.0/all-1.2.0.pom
 https://repo.maven.apache.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.pom
@@ -520,14 +571,32 @@ https://repo.maven.apache.org/maven2/jakarta/xml/bind/jakarta.xml.bind-api-paren
 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
 https://repo.maven.apache.org/maven2/javax/activation/javax.activation-api/1.2.0/javax.activation-api-1.2.0.pom
+https://repo.maven.apache.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.pom
+https://repo.maven.apache.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.pom
+https://repo.maven.apache.org/maven2/javax/el/javax.el-api/3.0.1-b06/javax.el-api-3.0.1-b06.pom
+https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/1.2/cdi-api-1.2.pom
+https://repo.maven.apache.org/maven2/javax/enterprise/cdi-api/2.0-PFD2/cdi-api-2.0-PFD2.pom
 https://repo.maven.apache.org/maven2/javax/inject/javax.inject/1/javax.inject-1.pom
+https://repo.maven.apache.org/maven2/javax/interceptor/javax.interceptor-api/1.2.2/javax.interceptor-api-1.2.2.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api-parent/2.4.0-b180830.0359/jaxb-api-parent-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.pom
 https://repo.maven.apache.org/maven2/javax/xml/bind/jaxb-api/2.4.0-b180830.0359/jaxb-api-2.4.0-b180830.0359.pom
 https://repo.maven.apache.org/maven2/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.pom
+https://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.pom
 https://repo.maven.apache.org/maven2/junit/junit/4.12/junit-4.12.pom
 https://repo.maven.apache.org/maven2/junit/junit/4.13.2/junit-4.13.2.pom
 https://repo.maven.apache.org/maven2/me/zhanghai/android/materialprogressbar/library/1.4.2/library-1.4.2.pom
+https://repo.maven.apache.org/maven2/nekohtml/nekohtml/1.9.6.2/nekohtml-1.9.6.2.pom
+https://repo.maven.apache.org/maven2/nekohtml/xercesMinimal/1.9.6.2/xercesMinimal-1.9.6.2.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.9.0/byte-buddy-agent-1.9.0.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.9.10/byte-buddy-agent-1.9.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.10.18/byte-buddy-agent-1.10.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.9.0/byte-buddy-parent-1.9.0.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.9.10/byte-buddy-parent-1.9.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-parent/1.10.18/byte-buddy-parent-1.10.18.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.9.0/byte-buddy-1.9.0.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.9.10/byte-buddy-1.9.10.pom
+https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.10.18/byte-buddy-1.10.18.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/1/jvnet-parent-1.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/3/jvnet-parent-3.pom
 https://repo.maven.apache.org/maven2/net/java/jvnet-parent/4/jvnet-parent-4.pom
@@ -566,7 +635,13 @@ https://repo.maven.apache.org/maven2/org/antlr/antlr-runtime/3.5.3/antlr-runtime
 https://repo.maven.apache.org/maven2/org/antlr/antlr/3.5.2/antlr-3.5.2.pom
 https://repo.maven.apache.org/maven2/org/antlr/stringtemplate/3.2.1/stringtemplate-3.2.1.pom
 https://repo.maven.apache.org/maven2/org/antlr/stringtemplate/4.0.2/stringtemplate-4.0.2.pom
+https://repo.maven.apache.org/maven2/org/apache/ant/ant-launcher/1.8.0/ant-launcher-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/ant/ant-parent/1.8.0/ant-parent-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/ant/ant/1.8.0/ant-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/1/apache-1.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/5/apache-5.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/9/apache-9.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/13/apache-13.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/15/apache-15.pom
@@ -574,10 +649,12 @@ https://repo.maven.apache.org/maven2/org/apache/apache/16/apache-16.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/21/apache-21.pom
 https://repo.maven.apache.org/maven2/org/apache/apache/23/apache-23.pom
+https://repo.maven.apache.org/maven2/org/apache/apache/25/apache-25.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress/1.12/commons-compress-1.12.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.9/commons-lang3-3.9.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/5/commons-parent-5.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/11/commons-parent-11.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/22/commons-parent-22.pom
@@ -587,8 +664,12 @@ https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/33/common
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/34/commons-parent-34.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/35/commons-parent-35.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/39/commons-parent-39.pom
+https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/48/commons-parent-48.pom
 https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/52/commons-parent-52.pom
+https://repo.maven.apache.org/maven2/org/apache/geronimo/genesis/genesis-default-flava/2.3/genesis-default-flava-2.3.pom
+https://repo.maven.apache.org/maven2/org/apache/geronimo/genesis/genesis-java8-flava/2.3/genesis-java8-flava-2.3.pom
+https://repo.maven.apache.org/maven2/org/apache/geronimo/genesis/genesis/2.3/genesis-2.3.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.2.6/httpclient-4.2.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpclient/4.5.2/httpclient-4.5.2.pom
@@ -621,14 +702,74 @@ https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpmime/4.5.2/ht
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/httpmime/4.5.6/httpmime-4.5.6.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/4.1.1/project-4.1.1.pom
 https://repo.maven.apache.org/maven2/org/apache/httpcomponents/project/7/project-7.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-artifact/3.8.5/maven-artifact-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-builder-support/3.8.5/maven-builder-support-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-compat/3.8.5/maven-compat-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-core/3.8.5/maven-core-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model-builder/3.8.5/maven-model-builder-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-model/3.8.5/maven-model-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/10/maven-parent-10.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/11/maven-parent-11.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/19/maven-parent-19.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/34/maven-parent-34.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-parent/35/maven-parent-35.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/3.8.5/maven-plugin-api-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-project-builder/3.0-alpha-2/maven-project-builder-3.0-alpha-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-project/3.0-alpha-2/maven-project-3.0-alpha-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-repository-metadata/3.8.5/maven-repository-metadata-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-resolver-provider/3.8.5/maven-resolver-provider-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings-builder/3.8.5/maven-settings-builder-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven-settings/3.8.5/maven-settings-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/2.2.1/maven-2.2.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.0-alpha-2/maven-3.0-alpha-2.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/maven/3.8.5/maven-3.8.5.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-api/1.8.0/maven-resolver-api-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-impl/1.8.0/maven-resolver-impl-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-named-locks/1.8.0/maven-resolver-named-locks-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-spi/1.8.0/maven-resolver-spi-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver-util/1.8.0/maven-resolver-util-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/resolver/maven-resolver/1.8.0/maven-resolver-1.8.0.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-components/34/maven-shared-components-34.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/shared/maven-shared-utils/3.3.4/maven-shared-utils-3.3.4.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-file/1.0-beta-6/wagon-file-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-file/3.5.1/wagon-file-3.5.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-6/wagon-http-lightweight-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-lightweight/3.5.1/wagon-http-lightweight-3.5.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-shared/1.0-beta-6/wagon-http-shared-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-http-shared/3.5.1/wagon-http-shared-3.5.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/1.0-beta-6/wagon-providers-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-providers/3.5.1/wagon-providers-3.5.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon-provider-api/3.5.1/wagon-provider-api-3.5.1.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom
+https://repo.maven.apache.org/maven2/org/apache/maven/wagon/wagon/3.5.1/wagon-3.5.1.pom
+https://repo.maven.apache.org/maven2/org/apache/xbean/xbean-reflect/4.21/xbean-reflect-4.21.pom
+https://repo.maven.apache.org/maven2/org/apache/xbean/xbean/4.21/xbean-4.21.pom
+https://repo.maven.apache.org/maven2/org/apiguardian/apiguardian-api/1.1.0/apiguardian-api-1.1.0.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-core/1.7.1/assertj-core-1.7.1.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-core/3.8.0/assertj-core-3.8.0.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-parent-pom/1.2.6/assertj-parent-pom-1.2.6.pom
+https://repo.maven.apache.org/maven2/org/assertj/assertj-parent-pom/2.1.6/assertj-parent-pom-2.1.6.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcpkix-jdk15on/1.56/bcpkix-jdk15on-1.56.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.pom
+https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.52/bcprov-jdk15on-1.52.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.56/bcprov-jdk15on-1.56.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.60/bcprov-jdk15on-1.60.pom
+https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.65/bcprov-jdk15on-1.65.pom
 https://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15on/1.70/bcprov-jdk15on-1.70.pom
 https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/2.5.2/checker-qual-2.5.2.pom
-https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.22.0/checker-qual-3.22.0.pom
+https://repo.maven.apache.org/maven2/org/checkerframework/checker-qual/3.21.4/checker-qual-3.21.4.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
@@ -640,6 +781,45 @@ https://repo.maven.apache.org/maven2/org/codehaus/mojo/animal-sniffer-parent/1.2
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/34/mojo-parent-34.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/40/mojo-parent-40.pom
 https://repo.maven.apache.org/maven2/org/codehaus/mojo/mojo-parent/65/mojo-parent-65.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-cipher/2.0/plexus-cipher-2.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.4/plexus-classworlds-2.4.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.5.2/plexus-classworlds-2.5.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-classworlds/2.6.0/plexus-classworlds-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.5/plexus-component-annotations-1.5.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.5.6/plexus-component-annotations-1.5.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/1.6/plexus-component-annotations-1.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.1.0/plexus-component-annotations-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-annotations/2.1.1/plexus-component-annotations-2.1.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.5/plexus-containers-1.5.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.5.6/plexus-containers-1.5.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/1.6/plexus-containers-1.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.1.0/plexus-containers-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-containers/2.1.1/plexus-containers-2.1.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-container-default/2.1.1/plexus-container-default-2.1.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-interpolation/1.26/plexus-interpolation-1.26.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-sec-dispatcher/2.0/plexus-sec-dispatcher-2.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/2.0.5/plexus-utils-2.0.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.18/plexus-utils-3.0.18.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.0.24/plexus-utils-3.0.24.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-utils/3.4.1/plexus-utils-3.4.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.6/plexus-2.0.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.1/plexus-3.3.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/3.3.2/plexus-3.3.2.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/4.0/plexus-4.0.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/5.1/plexus-5.1.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/6.5/plexus-6.5.pom
+https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus/8/plexus-8.pom
+https://repo.maven.apache.org/maven2/org/codehaus/woodstox/wstx-asl/3.2.6/wstx-asl-3.2.6.pom
+https://repo.maven.apache.org/maven2/org/codehaus/woodstox/wstx-asl/4.0.6/wstx-asl-4.0.6.pom
 https://repo.maven.apache.org/maven2/org/conscrypt/conscrypt-android/2.0.0/conscrypt-android-2.0.0.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymockclassextension/3.2/easymockclassextension-3.2.pom
 https://repo.maven.apache.org/maven2/org/easymock/easymock-parent/3.2/easymock-parent-3.2.pom
@@ -651,6 +831,10 @@ https://repo.maven.apache.org/maven2/org/eclipse/ee4j/project/1.0.7/project-1.0.
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.pom
 https://repo.maven.apache.org/maven2/org/eclipse/jdt/core/compiler/ecj/4.6.1/ecj-4.6.1.pom
+https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject/0.3.5/org.eclipse.sisu.inject-0.3.5.pom
+https://repo.maven.apache.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus/0.3.5/org.eclipse.sisu.plexus-0.3.5.pom
+https://repo.maven.apache.org/maven2/org/eclipse/sisu/sisu-inject/0.3.5/sisu-inject-0.3.5.pom
+https://repo.maven.apache.org/maven2/org/eclipse/sisu/sisu-plexus/0.3.5/sisu-plexus-0.3.5.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/2.2.11/jaxb-bom-2.2.11.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-bom/4.0.0-M4/jaxb-bom-4.0.0-M4.pom
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/jaxb-core/2.2.11/jaxb-core-2.2.11.pom
@@ -660,6 +844,7 @@ https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/2.2.11/txw2-2.2.11.
 https://repo.maven.apache.org/maven2/org/glassfish/jaxb/txw2/4.0.0-M4/txw2-4.0.0-M4.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/2.2/hamcrest-core-2.2.pom
+https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom
 https://repo.maven.apache.org/maven2/org/hamcrest/hamcrest/2.2/hamcrest-2.2.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.7.4.201502262128/org.jacoco.build-0.7.4.201502262128.pom
@@ -667,15 +852,18 @@ https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.build/0.8.8/org.jacoc
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.core/0.8.8/org.jacoco.core-0.8.8.pom
 https://repo.maven.apache.org/maven2/org/jacoco/org.jacoco.report/0.7.4.201502262128/org.jacoco.report-0.7.4.201502262128.pom
+https://repo.maven.apache.org/maven2/org/jboss/weld/weld-parent/26/weld-parent-26.pom
+https://repo.maven.apache.org/maven2/org/jboss/weld/weld-parent/36/weld-parent-36.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
 https://repo.maven.apache.org/maven2/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.5.2/kotlinx-coroutines-android-1.5.2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-android/1.4.3/kotlinx-coroutines-android-1.4.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-common/1.1.1/kotlinx-coroutines-core-common-1.1.1.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.5.2/kotlinx-coroutines-core-jvm-1.5.2.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core-jvm/1.4.3/kotlinx-coroutines-core-jvm-1.4.3.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.1.1/kotlinx-coroutines-core-1.1.1.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.3.8/kotlinx-coroutines-core-1.3.8.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlinx/kotlinx-metadata-jvm/0.1.0/kotlinx-metadata-jvm-0.1.0.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions-runtime/1.4.31/kotlin-android-extensions-runtime-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.3.50/kotlin-android-extensions-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-android-extensions/1.4.31/kotlin-android-extensions-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-annotation-processing-gradle/1.3.50/kotlin-annotation-processing-gradle-1.3.50.pom
@@ -719,19 +907,22 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.31/kotlin-stdlib-common-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.50/kotlin-stdlib-common-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.3.71/kotlin-stdlib-common-1.3.71.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.10/kotlin-stdlib-common-1.4.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.30/kotlin-stdlib-common-1.4.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.4.31/kotlin-stdlib-common-1.4.31.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.10/kotlin-stdlib-common-1.5.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.30/kotlin-stdlib-common-1.5.30.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.5.31/kotlin-stdlib-common-1.5.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.10/kotlin-stdlib-common-1.6.10.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.20/kotlin-stdlib-common-1.6.20.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-common/1.6.21/kotlin-stdlib-common-1.6.21.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.2.71/kotlin-stdlib-jdk7-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.20/kotlin-stdlib-jdk7-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.3.50/kotlin-stdlib-jdk7-1.3.50.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.5.30/kotlin-stdlib-jdk7-1.5.30.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.10/kotlin-stdlib-jdk7-1.4.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.4.31/kotlin-stdlib-jdk7-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.2.71/kotlin-stdlib-jdk8-1.2.71.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.20/kotlin-stdlib-jdk8-1.3.20.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.3.50/kotlin-stdlib-jdk8-1.3.50.pom
-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.4.10/kotlin-stdlib-jdk8-1.4.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.4.31/kotlin-stdlib-jdk8-1.4.31.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
@@ -743,24 +934,43 @@ https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.20/k
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.31/kotlin-stdlib-1.3.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.50/kotlin-stdlib-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.3.71/kotlin-stdlib-1.3.71.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.10/kotlin-stdlib-1.4.10.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.30/kotlin-stdlib-1.4.30.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.4.31/kotlin-stdlib-1.4.31.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.10/kotlin-stdlib-1.5.10.pom
-https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.5.30/kotlin-stdlib-1.5.30.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test-common/1.4.31/kotlin-test-common-1.4.31.pom
+https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-test/1.4.31/kotlin-test-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.3.50/kotlin-util-io-1.3.50.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-io/1.4.31/kotlin-util-io-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/kotlin/kotlin-util-klib/1.4.31/kotlin-util-klib-1.4.31.pom
 https://repo.maven.apache.org/maven2/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom
-https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.9.0-M1/junit-bom-5.9.0-M1.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.7.0/junit-bom-5.7.0.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.7.1/junit-bom-5.7.1.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.7.2/junit-bom-5.7.2.pom
+https://repo.maven.apache.org/maven2/org/junit/junit-bom/5.8.2/junit-bom-5.8.2.pom
+https://repo.maven.apache.org/maven2/org/junit/jupiter/junit-jupiter-api/5.7.0/junit-jupiter-api-5.7.0.pom
+https://repo.maven.apache.org/maven2/org/junit/platform/junit-platform-commons/1.7.0/junit-platform-commons-1.7.0.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/1.7.7/stax-ex-1.7.7.pom
 https://repo.maven.apache.org/maven2/org/jvnet/staxex/stax-ex/2.1.0/stax-ex-2.1.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/2.23.0/mockito-core-2.23.0.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/2.28.2/mockito-core-2.28.2.pom
+https://repo.maven.apache.org/maven2/org/mockito/mockito-core/3.6.28/mockito-core-3.6.28.pom
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/2.6/objenesis-parent-2.6.pom
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.1/objenesis-parent-3.1.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis-parent/3.2/objenesis-parent-3.2.pom
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.pom
+https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.1/objenesis-3.1.pom
 https://repo.maven.apache.org/maven2/org/objenesis/objenesis/3.2/objenesis-3.2.pom
+https://repo.maven.apache.org/maven2/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.pom
 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-analysis/7.2/asm-analysis-7.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-analysis/9.3/asm-analysis-9.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/5.1/asm-commons-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/6.0/asm-commons-6.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.0/asm-commons-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/7.2/asm-commons-7.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-commons/9.3/asm-commons-9.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-debug-all/6.0_BETA/asm-debug-all-6.0_BETA.pom
@@ -772,18 +982,73 @@ https://repo.maven.apache.org/maven2/org/ow2/asm/asm-parent/6.0_BETA/asm-parent-
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/5.1/asm-tree-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/6.0/asm-tree-6.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.0/asm-tree-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/7.2/asm-tree-7.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-tree/9.3/asm-tree-9.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/5.1/asm-util-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/6.0/asm-util-6.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.0/asm-util-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm-util/7.2/asm-util-7.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.0.3/asm-5.0.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/5.1/asm-5.1.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/6.0/asm-6.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.0/asm-7.0.pom
+https://repo.maven.apache.org/maven2/org/ow2/asm/asm/7.2/asm-7.2.pom
 https://repo.maven.apache.org/maven2/org/ow2/asm/asm/9.3/asm-9.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.3/ow2-1.3.pom
 https://repo.maven.apache.org/maven2/org/ow2/ow2/1.5/ow2-1.5.pom
+https://repo.maven.apache.org/maven2/org/robolectric/annotations/4.3/annotations-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/annotations/4.4/annotations-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/junit/4.3/junit-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/junit/4.4/junit-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/pluginapi/4.3/pluginapi-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/pluginapi/4.4/pluginapi-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/plugins-maven-dependency-resolver/4.3/plugins-maven-dependency-resolver-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/plugins-maven-dependency-resolver/4.4/plugins-maven-dependency-resolver-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/resources/4.3/resources-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/resources/4.4/resources-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/robolectric/4.3/robolectric-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/robolectric/4.4/robolectric-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/sandbox/4.3/sandbox-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/sandbox/4.4/sandbox-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadowapi/4.3/shadowapi-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadowapi/4.4/shadowapi-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadows-framework/4.3/shadows-framework-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/shadows-framework/4.4/shadows-framework-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.3/utils-reflector-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils-reflector/4.4/utils-reflector-4.4.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils/4.3/utils-4.3.pom
+https://repo.maven.apache.org/maven2/org/robolectric/utils/4.4/utils-4.4.pom
 https://repo.maven.apache.org/maven2/org/slf4j/jcl-over-slf4j/2.0.0-alpha7/jcl-over-slf4j-2.0.0-alpha7.pom
+https://repo.maven.apache.org/maven2/org/slf4j/jul-to-slf4j/2.0.0-alpha7/jul-to-slf4j-2.0.0-alpha7.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/2.0.0-alpha7/slf4j-api-2.0.0-alpha7.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-jdk14/2.0.0-alpha7/slf4j-jdk14-2.0.0-alpha7.pom
 https://repo.maven.apache.org/maven2/org/slf4j/slf4j-parent/2.0.0-alpha7/slf4j-parent-2.0.0-alpha7.pom
+https://repo.maven.apache.org/maven2/org/slf4j/slf4j-simple/2.0.0-alpha7/slf4j-simple-2.0.0-alpha7.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/buildsupport/5/buildsupport-5.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/buildsupport/12/buildsupport-12.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/public-parent/5/public-parent-5.pom
+https://repo.maven.apache.org/maven2/org/sonatype/buildsupport/public-parent/12/public-parent-12.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/3/forge-parent-3.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/6/forge-parent-6.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/10/forge-parent-10.pom
+https://repo.maven.apache.org/maven2/org/sonatype/forge/forge-parent/38/forge-parent-38.pom
+https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/4/oss-parent-4.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/7/oss-parent-7.pom
 https://repo.maven.apache.org/maven2/org/sonatype/oss/oss-parent/9/oss-parent-9.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/cglib/3.1.1/cglib-3.1.1.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-parent/2.9.4/guice-parent-2.9.4.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/guice-parent/4.2.0/guice-parent-4.2.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/inject/wrappers/2.6.0/wrappers-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/2.9.4/sisu-guice-2.9.4.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-guice/4.2.0/sisu-guice-4.2.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-bean/2.6.0/sisu-inject-bean-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject-plexus/2.6.0/sisu-inject-plexus-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-inject/2.6.0/sisu-inject-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/sisu/sisu-parent/2.6.0/sisu-parent-2.6.0.pom
+https://repo.maven.apache.org/maven2/org/sonatype/spice/model-builder/1.10/model-builder-1.10.pom
+https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/10/spice-parent-10.pom
+https://repo.maven.apache.org/maven2/org/sonatype/spice/spice-parent/17/spice-parent-17.pom
+https://repo.maven.apache.org/maven2/stax/stax-api/1.0.1/stax-api-1.0.1.pom
+https://repo.maven.apache.org/maven2/xerces/xercesImpl/2.8.1/xercesImpl-2.8.1.pom
+https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.03/xml-apis-1.3.03.pom

nix/deps/gradle/generate.sh

@@ -14,9 +14,10 @@ fi
 # required to build the project
 
 GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
+THIS_SCRIPT=$(realpath --relative-to="${GIT_ROOT}" ${BASH_SOURCE})
+CUR_DIR=$(cd "${BASH_SOURCE%/*}" && pwd)
 source "${GIT_ROOT}/scripts/colors.sh"
 
-CUR_DIR=$(cd "${BASH_SOURCE%/*}" && pwd)
 PROJ_LIST="${CUR_DIR}/proj.list"
 DEPS_LIST="${CUR_DIR}/deps.list"
 DEPS_URLS="${CUR_DIR}/deps.urls"
@@ -51,8 +52,7 @@ function gen_deps_json() {
 
     # Format URLs into a Nix consumable file.
     URLS=$(cat ${DEPS_URLS})
-    # Avoid rate limiting by using 4 of the available threads.
-    parallel --will-cite --keep-order --jobs 4 \
+    parallel --will-cite --keep-order \
         "${CUR_DIR}/url2json.sh" \
         ::: ${URLS} \
         >> ${DEPS_JSON}

nix/deps/gradle/proj.list

@@ -10,6 +10,7 @@ react-native-community_masked-view
 react-native-community_netinfo
 react-native-community_slider
 react-native-config
+react-native-device-info
 react-native-dialogs
 react-native-fast-image
 react-native-fs
@@ -23,6 +24,7 @@ react-native-linear-gradient
 react-native-mail
 react-native-navigation
 react-native-nfc-manager
+react-native-notifications
 react-native-permissions
 react-native-randombytes
 react-native-reanimated

nix/deps/gradle/url2json.sh

@@ -66,30 +66,16 @@ POM_SHA256=$(get_nix_sha "${POM_NIX_FETCH_OUT}")
 POM_SHA1=$(get_sha1 "${POM_PATH}")
 
 # Identify packaging type, JAR, AAR, or just POM.
-OBJ_TYPE_RAW=$(grep -oP '<packaging>\K[^<]+' "${POM_PATH}")
+OBJ_TYPE=$(grep -oP '<packaging>\K[^<]+' "${POM_PATH}")
 # Bundle is a JAR made using maven-bundle-plugin.
-case "${OBJ_TYPE_RAW}" in
+case "${OBJ_TYPE}" in
     ''|'bundle') OBJ_TYPE=jar;;
     'aar.asc')   OBJ_TYPE=aar;;
-    *)           OBJ_TYPE="${OBJ_TYPE_RAW}"
 esac
-
-# Some deps are Eclipse plugins, and we don't need those.
-if [[ "${OBJ_TYPE}" == "eclipse-plugin" ]]; then
-    exit 0
-fi
-
-# Some deps are just POMs, in which case there is no JAR to fetch.
+# Some dependencies have only a POM file.
 if [[ "${OBJ_TYPE}" != "pom" ]]; then
     OBJ_NIX_FETCH_OUT=$(nix_fetch "${OBJ_REL_URL}.${OBJ_TYPE}")
-    # If type was a JAR or other, not getting one is an error.
-    if [[ ${?} -ne 0 ]]; then
-        # POMs without packaging type defined can still include JARs.
-        if [[ "${OBJ_TYPE_RAW}" != "" ]]; then
-            echo " ! Failed to fetch: ${OBJ_REL_URL}.${OBJ_TYPE}" >&2
-            exit 1
-        fi
-    else
+    if [[ ${?} -eq 0 ]]; then
         OBJ_PATH=$(get_nix_path "${OBJ_NIX_FETCH_OUT}")
         OBJ_SHA256=$(get_nix_sha "${OBJ_NIX_FETCH_OUT}")
         OBJ_SHA1=$(get_sha1 "${OBJ_PATH}")

nix/deps/nodejs-patched/README.md

@@ -8,7 +8,7 @@ Modules provided by `yarn2nix` are normally fine, but we use `react-native-*` pa
 ```js
 repositories {
     google()
-    maven { url "https://www.jitpack.io" }
+    jcenter()
 }
 ```
 And these need to be patched and replaced with `mavenLocal()` to make sure Gradle doesn't try to fetch dependencies from remote repos.

nix/lib/mkFilter_test.nix

@@ -51,6 +51,10 @@ let
     { path = "${absPath}/ios/subfile"; type = "file";
       expected = false; }
   ];
+  # make paths absolute
+  testsAbs = builtins.map (
+    t: t // { path = "${absPath}/${t.path}"; }
+  ) tests;
 in builtins.map (
     t: let
       rval = (filter t.path t.type);

nix/mobile/android/default.nix

@@ -1,7 +1,10 @@
-{ pkgs, deps, callPackage, mkShell
+{ lib, pkgs, deps, callPackage, mkShell
 , status-go, androidPkgs, androidShell }:
 
 let
+  # For generating a temporary keystore for local development
+  keystore = callPackage ./keystore.nix { };
+
   # Import a jsbundle compiled out of clojure codebase
   jsbundle = callPackage ./jsbundle { };
 
@@ -10,12 +13,12 @@ let
 
   # TARGETS
   release = callPackage ./release.nix {
-    inherit jsbundle status-go watchmanFactory;
+    inherit keystore jsbundle status-go watchmanFactory;
   };
 
 in {
   # TARGETS
-  inherit release jsbundle;
+  inherit keystore release jsbundle;
 
   shell = mkShell {
     buildInputs = with pkgs; [

nix/mobile/android/keystore.nix

@@ -0,0 +1,44 @@
+#
+# Generates an ad-hoc and temporary keystore for signing debug/pr builds.
+#
+# WARNING: Do NOT use this to make a keystore that needs to be secret!
+#          Using a derivation will store the inputs in a .drv file.
+#
+{ stdenv, lib, pkgs }:
+
+let
+  inherit (lib) getAttr;
+
+  gradleProps = pkgs.gradlePropParser ../../../android/gradle.properties;
+
+  # Loading defaults from gradle.properties which should be safe.
+  KEYSTORE_ALIAS = getAttr "KEYSTORE_ALIAS" gradleProps;
+  KEYSTORE_PASSWORD = getAttr "KEYSTORE_PASSWORD" gradleProps;
+  KEYSTORE_KEY_PASSWORD = getAttr "KEYSTORE_KEY_PASSWORD" gradleProps;
+
+in stdenv.mkDerivation {
+  name = "status-react-android-keystore";
+
+  buildInputs = [ pkgs.openjdk8 ];
+
+  phases = [ "generatePhase" ];
+  generatePhase = ''
+    keytool -genkey -v \
+        -keyalg RSA \
+        -keysize 2048 \
+        -validity 10000 \
+        -deststoretype pkcs12 \
+        -dname "CN=, OU=, O=, L=, S=, C=" \
+        -keystore "$out" \
+        -alias "${KEYSTORE_ALIAS}" \
+        -storepass "${KEYSTORE_PASSWORD}" \
+        -keypass "${KEYSTORE_KEY_PASSWORD}" \
+        >&2
+  '';
+
+  shellHook = ''
+    export KEYSTORE_ALIAS="${KEYSTORE_ALIAS}"
+    export KEYSTORE_PASSWORD="${KEYSTORE_PASSWORD}"
+    export KEYSTORE_KEY_PASSWORD="${KEYSTORE_KEY_PASSWORD}"
+  '';
+}

nix/mobile/android/release.nix

@@ -1,5 +1,6 @@
-{ stdenv, pkgs, deps, lib, watchmanFactory
-, androidPkgs, patchMavenSources, jsbundle, status-go }:
+{ stdenv, pkgs, deps, lib, config, callPackage,
+  watchmanFactory, androidPkgs, patchMavenSources,
+  keystore, jsbundle, status-go }:
 
 {
   # Value for BUILD_ENV checked by Clojure code at compile time
@@ -14,7 +15,9 @@
 assert (lib.stringLength watchmanSockPath) > 0 -> stdenv.isDarwin;
 
 let
-  inherit (lib) toLower optionalString stringLength getConfig makeLibraryPath elem;
+  inherit (lib)
+    toLower optionalString stringLength assertMsg
+    getConfig makeLibraryPath checkEnvVarSet elem;
 
   # Pass secretsFile for INFURA_TOKEN to jsbundle build
   builtJsBundle = jsbundle { inherit secretsFile; };
@@ -25,6 +28,12 @@ let
   gradleOpts = getConfig "android.gradle-opts" null;
   # Used to detect end-to-end builds
   androidAbiInclude = getConfig "android.abi-include" "armeabi-v7a;arm64-v8a;x86";
+  # Keystore can be provided via config and extra-sandbox-paths.
+  # If it is not we use an ad-hoc one generated with default password.
+  keystorePath = getConfig "android.keystore-path" keystore;
+
+  baseName = "${buildType}-android";
+  name = "status-react-build-${baseName}";
 
   envFileName = 
     if androidAbiInclude == "x86"                  then ".env.e2e" 
@@ -38,10 +47,8 @@ let
   apksPath = "./android/app/build/outputs/apk/${toLower gradleBuildType}";
   patchedWatchman = watchmanFactory watchmanSockPath;
 
-  baseName = "${buildType}-android";
 in stdenv.mkDerivation rec {
-  name = "status-react-build-${baseName}";
-
+  inherit name;
   src = let path = ./../../..;
   # We use builtins.path so that we can name the resulting derivation
   in builtins.path {
@@ -69,6 +76,7 @@ in stdenv.mkDerivation rec {
 
   # custom env variables derived from config
   STATUS_GO_SRC_OVERRIDE = getConfig "status-go.src-override" null;
+  ANDROID_APK_SIGNED = getConfig "android.apk-signed" "true";
   ANDROID_ABI_SPLIT = getConfig "android.abi-split" "false";
   ANDROID_ABI_INCLUDE = androidAbiInclude;
 
@@ -80,7 +88,8 @@ in stdenv.mkDerivation rec {
   STATUS_GO_ANDROID_LIBDIR = status-go { inherit secretsFile; };
 
   phases = [
-    "unpackPhase" "secretsPhase" "buildPhase" "checkPhase" "installPhase"
+    "unpackPhase" "secretsPhase" "keystorePhase"
+    "buildPhase" "checkPhase" "installPhase"
   ];
 
   unpackPhase = ''
@@ -111,13 +120,21 @@ in stdenv.mkDerivation rec {
     ${patchMavenSources} ./android/build.gradle
   '';
 
-  # Secrets file is passed to sandbox using extra-sandbox-paths.
+  # if secretsFile is not set we use generate keystore
   secretsPhase = if (secretsFile != "") then ''
     source "${secretsFile}"
-  '' else ''
-    echo 'WARNING: No secrets provided!' >&2
-  '';
+    ${checkEnvVarSet "KEYSTORE_ALIAS"}
+    ${checkEnvVarSet "KEYSTORE_PASSWORD"}
+    ${checkEnvVarSet "KEYSTORE_KEY_PASSWORD"}
+  '' else keystore.shellHook;
 
+  # if keystorePath is set copy it into build directory
+  keystorePhase =
+    assert assertMsg (keystorePath != null) "keystorePath has to be set!";
+  ''
+    export KEYSTORE_PATH="$PWD/status-im.keystore"
+    cp -a --no-preserve=ownership "${keystorePath}" "$KEYSTORE_PATH"
+  '';
   buildPhase = let
     adhocEnvVars = optionalString stdenv.isLinux
       "LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${makeLibraryPath [ pkgs.zlib ]}";

nix/mobile/default.nix

@@ -1,6 +1,8 @@
-{ lib, callPackage, mkShell, status-go }:
+{ config, lib, stdenvNoCC, callPackage, mkShell, status-go }:
 
 let
+  inherit (lib) catAttrs concatStrings optional unique;
+
   fastlane = callPackage ./fastlane { };
 
   android = callPackage ./android {
@@ -22,7 +24,7 @@ let
 
 in {
   shell = mkShell {
-    inputsFrom = lib.catAttrs "shell" selectedSources;
+    inputsFrom = (catAttrs "shell" selectedSources);
   };
 
   # TARGETS

nix/mobile/ios/status-go-shell.nix

@@ -3,7 +3,7 @@
 # It copies the status-go build result to 'modules/react-native-status/ios/RCTStatus'.
 #
 
-{ mkShell, status-go }:
+{ lib, mkShell, status-go }:
 
 mkShell {
   shellHook = ''

nix/nix.conf

@@ -11,5 +11,3 @@ keep-derivations = true
 keep-outputs = true
 # Extra isolation for network and filesystem, doesn't work on MacOS
 build-use-sandbox = false
-# Enable Nix v2 interface.
-experimental-features = nix-command

nix/overlay.nix

@@ -33,16 +33,14 @@ in {
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
   # Package version adjustments
+  go = super.pkgs.go_1_16;
   gradle = super.pkgs.gradle_5;
-  nodejs = super.pkgs.nodejs-16_x;
+  nodejs = super.pkgs.nodejs-12_x;
   openjdk = super.pkgs.openjdk8_headless;
   xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
-    version = "13.3";
+    version = "11.5";
     allowHigher = true;
   };
-  go = super.pkgs.go_1_17;
-  buildGoPackage = super.pkgs.buildGo117Package;
-  buildGoModule = super.pkgs.buildGo117Module;
   gomobile = super.gomobile.override {
     # FIXME: No Android SDK packages for aarch64-darwin.
     withAndroidPkgs = stdenv.system != "aarch64-darwin";

nix/pkgs.nix

@@ -11,10 +11,10 @@ let
   # We follow the master branch of official nixpkgs.
   nixpkgsSrc = fetchFromGitHub {
     name = "nixpkgs-source";
-    owner = "NixOS";
+    owner = "status-im";
     repo = "nixpkgs";
-    rev = "8a782b05cb764db86f2826995adb9128e26dffe2";
-    sha256 = "sha256-9+Ys74yxniHBz2/kLVSzboqCNRx1E+Dv/yzSBtw0jDQ=";
+    rev = "15111f8a9ad423d300886b537647691c2faa28cd";
+    sha256 = "05ny644x3dpxigljnb4rmams5vrs5gkbcyqjfamvlqm8rdmsi0kn";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

nix/pkgs/aapt2/default.nix

@@ -2,10 +2,11 @@
 # It is used by Gradle to package Android app resources.
 # See: https://developer.android.com/studio/command-line/aapt2
 
-{ lib, stdenv, pkgs, fetchurl }:
+{ lib, stdenv, deps, pkgs, fetchurl }:
 
 let
   inherit (lib) getAttr optionals;
+  inherit (pkgs) zip unzip patchelf;
   inherit (stdenv) isLinux isDarwin;
 
   pname = "aapt2";
@@ -52,7 +53,7 @@ in stdenv.mkDerivation {
   srcs = with urls; [ jar sha pom ];
   phases = [ "unpackPhase" ]
     ++ optionals isLinux [ "patchPhase" ]; # OSX binaries don't need patchelf
-  buildInputs = with pkgs; [ zip unzip patchelf ];
+  buildInputs = [ zip unzip patchelf ];
 
   unpackPhase = ''
     mkdir -p $out
@@ -70,15 +71,15 @@ in stdenv.mkDerivation {
 
     # Patch executables from maven dependency to use Nix's interpreter
     tmpDir=$(mktemp -d)
-    unzip $out/${filenames.jar} -d $tmpDir
+    ${unzip}/bin/unzip $out/${filenames.jar} -d $tmpDir
     for exe in `find $tmpDir/ -type f -executable`; do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
+      ${patchelf}/bin/patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $exe
     done
 
     # Rebuild the .jar file with patched binaries
     pushd $tmpDir > /dev/null
     chmod u+w $out/${filenames.jar}
-    zip -fr $out/${filenames.jar}
+    ${zip}/bin/zip -fr $out/${filenames.jar}
     chmod $out/${filenames.jar} --reference=$out/${filenames.jar}.sha1
     popd > /dev/null
     rm -rf $tmpDir

nix/pkgs/android-sdk/compose.nix

@@ -3,13 +3,13 @@
 # for the Android development environment.
 #
 
-{ androidenv }:
+{ stdenv, config, callPackage, androidenv, openjdk, mkShell }:
 
 # The "android-sdk-license" license is accepted
 # by setting android_sdk.accept_license = true.
 androidenv.composeAndroidPackages {
   toolsVersion = "26.1.1";
-  platformToolsVersion = "33.0.1";
+  platformToolsVersion = "31.0.3";
   buildToolsVersions = [ "31.0.0" ];
   platformVersions = [ "30" ];
   cmakeVersions = [ "3.18.1" ];

nix/pkgs/android-sdk/default.nix

@@ -3,7 +3,7 @@
 # for the Android development environment.
 #
 
-{ callPackage }:
+{ callPackage, stdenv, writeScript }:
 
 let
   compose = callPackage ./compose.nix { };

nix/pkgs/go-maven-resolver/default.nix

@@ -1,6 +1,8 @@
-{ buildGoModule, fetchFromGitHub }:
+{ lib, buildGo116Module, fetchFromGitHub }:
 
-buildGoModule rec {
+let
+  inherit (lib) strings;
+in buildGo116Module rec {
   pname = "go-maven-resolver";
   version = "v1.1.2";
 

nix/scripts/build.sh

@@ -58,7 +58,7 @@ nixOpts=(
 ${GIT_ROOT}/nix/scripts/gcroots.sh "${TARGET}" "${@}"
 
 # Run the actual build
-echo -e "${GRN}Running:${RST} ${BLD}nix-build "${nixOpts[@]}" ${@}${RST}"
+echo "Running: nix-build "${nixOpts[@]}" "${@}" default.nix"
 nixResultPath=$(nix-build "${nixOpts[@]}" "${@}" default.nix)
 
 echo -e "\n${YLW}Extracting result${RST}: ${BLD}${nixResultPath}${RST}"

nix/scripts/lib.sh

@@ -23,28 +23,15 @@ nix_install_type() {
     NIX_STORE_DIR_GROUP=$(file_group /nix/store)
     if [[ "$(os_name)" =~ NixOS ]]; then
         echo "nixos"
+    elif [[ "${NIX_STORE_DIR_GROUP}" == "nixbld" ]]; then
+        echo "multi"
+    elif [[ "${NIX_STORE_DIR_GROUP}" == "${USER}" ]]; then
+        echo "single"
+    elif [[ "${NIX_STORE_DIR_GROUP}" == "" ]]; then
+        echo "No Nix installtion detected!" >&2
+        echo "none"
     else
-        case "${NIX_STORE_DIR_GROUP}" in
-            "nixbld")   echo "multi";;
-            "30000")    echo "multi";;
-            "(30000)")  echo "multi";;
-            "wheel")    echo "single";;
-            "users")    echo "single";;
-            "${USER}")  echo "single";;
-            "${UID}")   echo "single";;
-            "(${UID})") echo "single";;
-            "")         echo "none";
-                        echo "No Nix installtion detected!" >&2;;
-            *)          echo "Unknown Nix installtion type!" >&2; exit 1;;
-        esac
+        echo "Unknown Nix installtion type!" >&2
+        exit 1
     fi
 }
-
-nix_root() {
-    NIX_ROOT="/nix"
-    if [[ $(uname -s) == "Darwin" ]]; then
-        # Special case due to read-only root on MacOS Catalina
-        NIX_ROOT="/opt/nix"
-    fi
-    echo "${NIX_ROOT}"
-}

nix/scripts/purge.sh

@@ -5,58 +5,20 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 source "${GIT_ROOT}/nix/scripts/lib.sh"
 source "${GIT_ROOT}/scripts/colors.sh"
 
-nix_purge_linux_multi_user_service() {
-    NIX_SERVICES=(nix-daemon.service nix-daemon.socket)
-    for NIX_SERVICE in "${NIX_SERVICES[@]}"; do
-        sudo systemctl stop "${NIX_SERVICE}"
-        sudo systemctl disable "${NIX_SERVICE}"
-    done
+nix_purge_multi_user() {
+    sudo systemctl stop nix-daemon.socket
+    sudo systemctl stop nix-daemon.service
+    sudo systemctl disable nix-daemon.socket
+    sudo systemctl disable nix-daemon.service
     sudo systemctl daemon-reload
-}
+    sudo rm -fr /etc/nix
+    sudo rm -f /etc/profile.d/nix.sh*
 
-nix_purge_linux_multi_user_users() {
+    # Remove nix build users and groups
     for NIX_USER in $(awk -F: '/nixbld/{print $1}' /etc/passwd); do
         sudo userdel "${NIX_USER}"
     done
     sudo groupdel nixbld
-}
-
-nix_purge_darwin_multi_user_service() {
-    cd /Library/LaunchDaemons
-    NIX_SERVICES=(org.nixos.darwin-store.plist org.nixos.nix-daemon.plist)
-    for NIX_SERVICE in "${NIX_SERVICES[@]}"; do
-        sudo launchctl unload "${NIX_SERVICE}"
-        sudo launchctl remove "${NIX_SERVICE}"
-    done
-}
-
-nix_purge_darwin_multi_user_users() {
-    for NIX_USER in $(dscl . list /Users | grep nixbld); do
-        sudo dscl . -delete "/Users/${NIX_USER}"
-    done
-    sudo dscl . -delete /Groups/nixbld
-}
-
-# This still leaves an empty /nix, which will disappear after reboot.
-nix_purge_darwin_multi_user_volumes() {
-    sudo sed -i.bkp '/nix/d' /etc/synthetic.conf
-    sudo sed -i.bkp '/nix/d' /etc/fstab
-    sudo diskutil apfs deleteVolume /nix
-    echo -e "${YLW}You will need to reboot your system!${RST}" >&2
-}
-
-nix_purge_multi_user() {
-    if [[ $(uname -s) == "Darwin" ]]; then
-        nix_purge_darwin_multi_user_service
-        nix_purge_darwin_multi_user_users
-        nix_purge_darwin_multi_user_volumes
-    else
-        nix_purge_linux_multi_user_service
-        nix_purge_linux_multi_user_users
-    fi
-
-    sudo rm -fr /etc/nix
-    sudo rm -f /etc/profile.d/nix.sh*
 
     # Restore old shell profiles
     NIX_PROFILE_FILES=(
@@ -79,7 +41,11 @@ nix_purge_user_profile() {
 }
 
 nix_purge_root() {
-    NIX_ROOT=$(nix_root)
+    NIX_ROOT="/nix"
+    if [[ $(uname -s) == "Darwin" ]]; then
+        # Special case due to read-only root on MacOS Catalina
+        NIX_ROOT="/opt/nix"
+    fi
     if [[ -z "${NIX_ROOT}" ]]; then
         echo -e "${RED}Unable to identify Nix root!${RST}" >&2
         exit 1
@@ -87,35 +53,27 @@ nix_purge_root() {
     sudo rm -fr "${NIX_ROOT}"
 }
 
-# Don't run anything if script is just sourced.
-if (return 0 2>/dev/null); then
-    echo -e "${YLW}Script sourced, not running purge.${RST}"
-    return
-fi
-
-# Confirm user decission, unless --force is used.
-if [[ "${1}" != "--force" ]]; then
-    echo -e "${YLW}Are you sure you want to purge Nix?${RST}" >&2
-    read -p "[y/n]: " -n 1 -r
-    echo
-    if [[ $REPLY =~ ^[^Yy]$ ]]; then
-        echo -e "${GRN}Aborting Nix purge!${RST}" >&2
-        exit 0
-    fi
-fi
-
 NIX_INSTALL_TYPE=$(nix_install_type)
-# Purging /nix on NixOS would be disasterous.
+
+if [[ "${1}" == "--force" ]] && [[ "${NIX_INSTALL_TYPE}" != "nixos" ]]; then
+    echo -e "${YLW}Purge forced, no checks performed!${RST}" >&2
+    nix_purge_multi_user
+    nix_purge_user_profile
+    nix_purge_root
+    exit
+fi
+
+# Purging /nix on NixOS would be disasterous
 if [[ "${NIX_INSTALL_TYPE}" == "nixos" ]]; then
     echo -e "${RED}You should not purge Nix files on NixOS!${RST}" >&2
     exit
-elif [[ "${NIX_INSTALL_TYPE}" == "none" ]] && [[ "${1}" != "--force" ]]; then
+elif [[ "${NIX_INSTALL_TYPE}" == "none" ]]; then
     echo -e "${YLW}Nothing to remove, Nix not installed.${RST}" >&2
     exit
-elif [[ "${NIX_INSTALL_TYPE}" == "multi" ]] || [[ "${1}" == "--force" ]]; then
+elif [[ "${NIX_INSTALL_TYPE}" == "multi" ]]; then
     echo -e "${YLW}Detected multi-user Nix installation.${RST}" >&2
     nix_purge_multi_user
-elif [[ "${NIX_INSTALL_TYPE}" == "single" ]] || [[ "${1}" == "--force" ]]; then
+elif [[ "${NIX_INSTALL_TYPE}" == "single" ]]; then
     echo -e "${YLW}Detected single-user Nix installation.${RST}" >&2
     nix_purge_user_profile
 fi

nix/scripts/setup.sh

@@ -6,9 +6,9 @@ GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
 source "${GIT_ROOT}/nix/scripts/lib.sh"
 source "${GIT_ROOT}/scripts/colors.sh"
 
-NIX_VERSION="2.8.0"
+NIX_VERSION="2.6.1"
 NIX_INSTALL_URL="https://nixos.org/releases/nix/nix-${NIX_VERSION}/install"
-NIX_INSTALL_SHA256="f43bfedfca9151479462d8bc11f238615a2d52f19b14894d8e2b59980e75ef72"
+NIX_INSTALL_SHA256="a63732b4f3628ce97e096dbda88e3cb9851ff6b4f94b5cd43feb257126437b9d"
 NIX_INSTALL_PATH="/tmp/nix-install-${NIX_VERSION}"
 
 install_nix() {

nix/shells.nix

@@ -58,7 +58,7 @@ let
 
     # for 'scripts/generate-keystore.sh'
     keytool = mkShell {
-      buildInputs = with pkgs; [ openjdk8 apksigner ];
+      buildInputs = with pkgs; [ openjdk8 ];
     };
 
     # for targets that need 'adb' and other SDK/NDK tools
@@ -71,7 +71,7 @@ let
   };
 
   # for merging the default shell with others
-  mergeDefaultShell = (_: val: lib.mergeSh default [ val ]);
+  mergeDefaultShell = (key: val: lib.mergeSh default [ val ]);
 
 # values here can be selected using `nix-shell --attr shells.$TARGET default.nix`
 # the nix/scripts/shell.sh wrapper does this for us and expects TARGET to be set

nix/status-go/default.nix

@@ -1,7 +1,9 @@
-{ lib, callPackage, mkShell }:
+{ lib, callPackage, mkShell, openjdk, androidPkgs }:
 
 let
-  inherit (lib) attrValues mapAttrs;
+  inherit (lib)
+    catAttrs concatStrings concatStringsSep fileContents makeBinPath
+    getConfig optional attrValues mapAttrs attrByPath;
 
   # Metadata common to all builds of status-go
   meta = {
@@ -28,13 +30,12 @@ let
     "-s" # -s disabled symbol table
     "-w" # -w disables DWARF debugging information
   ];
+
+  goBuildFlags = [ "-v" ];
+
 in rec {
   mobile = callPackage ./mobile {
-    inherit meta source goBuildLdFlags;
-  };
-
-  library = callPackage ./library {
-    inherit meta source;
+    inherit meta source goBuildFlags goBuildLdFlags;
   };
 
   shell = mkShell {

nix/status-go/library/default.nix

@@ -1,26 +0,0 @@
-{ buildGoPackage
-# object with source attributes
-, meta, source}:
-
-buildGoPackage {
-  pname = source.repo;
-  version = "${source.cleanVersion}-${source.shortRev}";
-
-  inherit meta;
-  inherit (source) src goPackagePath;
-
-  phases = ["unpackPhase" "configurePhase" "buildPhase"];
-
-  preBuild = ''
-    pushd go/src/$goPackagePath
-    go run cmd/library/*.go > $NIX_BUILD_TOP/main.go
-    popd
-  '';
-
-  # Build the Go library
-  buildPhase = ''
-    runHook preBuild
-    go build -buildmode=c-archive -o $out/libstatus.a $NIX_BUILD_TOP/main.go
-    runHook postBuild
-  '';
-}

nix/status-go/mobile/build.nix

@@ -1,10 +1,10 @@
-{ lib, utils, buildGoPackage, androidPkgs, openjdk, gomobile, xcodeWrapper
-, meta
-, source
+{ lib, stdenv, utils, callPackage, buildGo116Package
+, go, androidPkgs, openjdk, gomobile, xcodeWrapper
+# object with source attributes
+, meta, source
 , platform ? "android"
-, platformVersion ? "23"
 , architectures ? [ "arm64" "arm" "x86" ]
-, goBuildFlags ? [ "-x" ]
+, goBuildFlags ? [ ]
 , goBuildLdFlags ? [ ]
 , outputFileName ? "status-go-${source.shortRev}-${platform}.aar" }:
 
@@ -12,55 +12,96 @@
 { secretsFile ? "" }:
 
 let
-  inherit (lib) concatStringsSep optionalString optional;
+  inherit (stdenv) isDarwin;
+  inherit (lib)
+    concatStrings concatStringsSep concatMapStrings optionalString
+    getAttr attrValues makeBinPath optional;
+
+  removeReferences = [ go ];
+  removeExpr = refs: ''remove-references-to ${concatMapStrings (ref: " -t ${ref}") refs}'';
+
   # formatted for use with -target
   targetArchs = map (a: "${platform}/${a}") architectures;
 
-in buildGoPackage {
+in buildGo116Package {
   pname = source.repo;
   version = "${source.cleanVersion}-${source.shortRev}-${platform}";
 
   inherit meta;
   inherit (source) src goPackagePath;
 
-  extraSrcPaths = [ gomobile ];
   nativeBuildInputs = [ gomobile ]
     ++ optional (platform == "android") openjdk
-    ++ optional (platform == "ios") xcodeWrapper;
+    ++ optional isDarwin xcodeWrapper;
 
-  ldflags = concatStringsSep " " (goBuildLdFlags
-    ++ lib.optionals (secretsFile != "") ["-X node.OpenseaKeyFromEnv=$OPENSEA_API_KEY"]);
+  # Fixes Cgo related build failures (see https://github.com/NixOS/nixpkgs/issues/25959 )
+  hardeningDisable = [ "fortify" ];
 
-  ANDROID_HOME = optionalString (platform == "android") androidPkgs.sdk;
+  phases = [
+    "unpackPhase" "secretsPhase" "configurePhase"
+    "buildPhase" "installPhase"  "fixupPhase"
+  ];
 
-  # Ensure XCode is present for iOS, instead of failing at the end of the build.
-  preConfigure = optionalString (platform == "ios") utils.enforceXCodeAvailable;
-
-  # If secretsFile is not set we use generate keystore.
-  preBuild = if (secretsFile != "") then ''
+  # if secretsFile is not set we use generate keystore
+  secretsPhase = if (secretsFile != "") then ''
     source "${secretsFile}"
   '' else ''
     echo "No secrets provided!"
   '';
 
-  buildPhase = ''
+  # Ensure XCode is present for iOS build, instead of failing at the end of the build
+  preConfigure = optionalString (isDarwin && platform == "ios") utils.enforceXCodeAvailable;
+
+  # Build mobile libraries
+  preBuild = let
+    NIX_GOWORKDIR = "$NIX_BUILD_TOP/go-build";
+  in ''
+    mkdir ${NIX_GOWORKDIR}
+
+    export GO111MODULE=off
+    export GOPATH=${gomobile}:$GOPATH
+    export NIX_GOWORKDIR=${NIX_GOWORKDIR}
+  '' + optionalString (platform == "android") ''
+    export ANDROID_SDK_ROOT="${androidPkgs.sdk}"
+    export ANDROID_NDK_HOME="${androidPkgs.ndk}"
+    export PATH="${makeBinPath [ openjdk ]}:$PATH"
+  '';
+
+  # Build the Go library using gomobile for each of the configured platforms
+  buildPhase = let
+    ldFlags = [ "-extldflags=-Wl,--allow-multiple-definition" ]
+      ++ lib.optionals (secretsFile != "") ["-X node.OpenseaKeyFromEnv=$OPENSEA_API_KEY"]
+      ++ goBuildLdFlags;
+    CGO_LDFLAGS = concatStringsSep " " ldFlags;
+  in ''
     runHook preBuild
+    runHook renameImports
+
     echo -e "\nBuilding for targets: ${concatStringsSep "," targetArchs}\n"
 
-    gomobile bind \
-      ${concatStringsSep " " goBuildFlags} \
-      -ldflags="$ldflags" \
+    ${gomobile}/bin/gomobile bind \
       -target=${concatStringsSep "," targetArchs} \
-      ${optionalString (platform == "android") "-androidapi=${platformVersion}"} \
-      ${optionalString (platform == "ios") "-iosversion=${platformVersion}"} \
+      -ldflags="${CGO_LDFLAGS}" \
+      ${optionalString (platform == "android") "-androidapi 23"} \
+      ${optionalString (platform == "ios") "-iosversion=8.0"} \
+      ${concatStringsSep " " goBuildFlags} \
       -o ${outputFileName} \
       ${source.goPackagePath}/mobile
 
+    rm -rf $NIX_GOWORKDIR
+
     runHook postBuild
   '';
 
+  # replace hardcoded paths to go package in /nix/store, otherwise Nix will fail the build
+  fixupPhase = ''
+    find $out -type f -exec ${removeExpr removeReferences} '{}' + || true
+  '';
+
   installPhase = ''
     mkdir -p $out
-    cp -r ${outputFileName} $out/
+    mv ${outputFileName} $out/
   '';
+
+  outputs = [ "out" ];
 }

nix/status-go/mobile/default.nix

@@ -1,19 +1,22 @@
-{ callPackage, meta, source, goBuildLdFlags }:
+{ callPackage
+, meta, source
+, goBuildFlags
+, goBuildLdFlags }:
 
 {
   android = callPackage ./build.nix {
     platform = "android";
-    platformVersion = "23";
-    architectures = [ "arm" "arm64" "386" ]; # 386 is for android simulator.
+    # 386 is for android simulator
+    architectures = [ "arm" "arm64" "386" ];
     outputFileName = "status-go-${source.shortRev}.aar";
-    inherit meta source goBuildLdFlags;
+    inherit meta source goBuildFlags goBuildLdFlags;
   };
 
   ios = callPackage ./build.nix {
     platform = "ios";
-    platformVersion = "8.0";
-    architectures = [ "arm64" "amd64" ]; # amd64 is for ios simulator.
+    # amd64 is for ios simulator
+    architectures = [ "arm64" "amd64" ];
     outputFileName = "Statusgo.framework";
-    inherit meta source goBuildLdFlags;
+    inherit meta source goBuildFlags goBuildLdFlags;
   };
 }

nix/status-go/source.nix

@@ -1,7 +1,7 @@
-{ utils, lib, fetchFromGitHub }:
+{ config, utils, lib, callPackage, fetchFromGitHub }:
 
 let
-  inherit (lib) strings traceValFn importJSON getConfig;
+  inherit (lib) strings traceValFn attrByPath importJSON getConfig;
 
   srcOverride = getConfig "status-go.src-override" null;
   # Warning message about using local sources

nix/tools/envParser.nix

@@ -1,11 +1,12 @@
 # This Nix expression takes care of reading/parsing the correct .env configuration file and return it as an attr set
-{ config, lib }:
+{ config, stdenv, lib }:
 
 let
   inherit (builtins) listToAttrs head tail readFile;
   inherit (lib) attrByPath filter hasPrefix nameValuePair splitString;
 
   build-type = attrByPath ["status-im" "build-type"] "" config;
+  ci = (attrByPath ["status-im" "ci"] "" config) != "";
 
   readLinesFromFile =
     file:

nix/tools/gradlePropParser.nix

@@ -11,7 +11,7 @@ let
   lines = splitString "\n" (readFile gradlePropsFile);
 
   isKeyValueLine = line: line != "" && !hasPrefix "#" line;
-  cleanup = filter isKeyValueLine;
+  cleanup = lines: filter isKeyValueLine lines;
   extractKeyValues = line:
     let flag = splitString "=" line;
     in nameValuePair (head flag) (last flag);

nix/tools/utils.nix

@@ -53,9 +53,9 @@ let
   sanitizeVersion = version:
     if (builtins.match versionRegex version) != null
     # Geth forces a 'v' prefix for all versions
-    then lib.removePrefix "v" (dropSlashes version)
+    then lib.removePrefix "v" (dropSlashes version) 
     # reduce metrics cardinality in Prometheus
-    else lib.traceValFn (_: "WARNING: Marking build version as 'develop'!") "develop";
+    else lib.traceValFn (v: "WARNING: Marking build version as 'develop'!") "develop"; 
 
 in {
   inherit sanitizeVersion

package.json

@@ -1,12 +1,10 @@
 {
   "name": "StatusIm-Mobile",
   "version": "0.0.1",
-  "main": "modules/react-native-status/nodejs/bindings.js",
   "private": true,
   "scripts": {
     "start": "react-native start",
     "ios": "react-native run-ios",
-    "preinstall": "make status-go-library",
     "app:compile:android": "shadow-cljs compile android",
     "app:watch": "shadow-cljs watch android",
     "app:packager": "react-native start --host 0.0.0.0 --port 8081",
@@ -32,6 +30,7 @@
     "emojilib": "^2.4.0",
     "eth-phishing-detect": "^1.1.13",
     "functional-red-black-tree": "^1.0.1",
+    "hermes-engine": "0.5.2-rc1",
     "hi-base32": "^0.5.0",
     "i18n-js": "^3.3.0",
     "node-libs-react-native": "^1.2.1",
@@ -43,6 +42,7 @@
     "react-native-blob-util": "^0.13.18",
     "react-native-camera-kit": "^8.0.4",
     "react-native-config": "git+https://github.com/status-im/react-native-config.git#refs/tags/v1.4.2-status",
+    "react-native-device-info": "^7.4.0",
     "react-native-dialogs": "^1.0.4",
     "react-native-draggable-flatlist": "^3.0.3",
     "react-native-fast-image": "^8.5.11",
@@ -57,7 +57,8 @@
     "react-native-languages": "^3.0.2",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-mail": "^6.1.1",
-    "react-native-navigation": "^7.27.1",
+    "react-native-navigation": "^7.13.0",
+    "react-native-notifications": "^4.1.3",
     "react-native-permissions": "^2.1.5",
     "react-native-randombytes": "^3.6.1",
     "react-native-reanimated": "^2.1.0",
@@ -65,7 +66,7 @@
     "react-native-safe-area-context": "^2.0.0",
     "react-native-shake": "^3.3.1",
     "react-native-share": "^7.0.1",
-    "react-native-splash-screen": "3.3.0",
+    "react-native-splash-screen": "^3.2.0",
     "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#refs/tags/v2.5.37",
     "react-native-svg": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
@@ -75,7 +76,6 @@
     "web3-utils": "^1.2.1"
   },
   "devDependencies": {
-    "@mapbox/node-pre-gyp": "^1.0.9",
     "@babel/generator": "7.0.0",
     "@babel/helper-builder-react-jsx": "7.0.0",
     "@babel/plugin-transform-block-scoping": "7.0.0",
@@ -84,16 +84,9 @@
     "clj-kondo": "^2020.1.13",
     "coveralls": "^3.0.4",
     "jest": "^25.1.0",
-    "nodemon": "^2.0.16",
     "nyc": "^14.1.1",
     "process": "0.11.10",
     "rn-snoopy": "git+https://github.com/status-im/rn-snoopy.git#refs/tags/v2.0.2-status",
     "shadow-cljs": "^2.10.14"
-  },
-  "binary": {
-    "module_name": "status_nodejs_addon",
-    "module_path": "./lib/binding/",
-    "host": "https://github.com/status-im/status-react/releases/download/",
-    "remote_path": "{version}"
   }
 }

scripts/generate-keystore.sh

@@ -32,6 +32,7 @@ KEYSTORE_PATH=${KEYSTORE_PATH/#\~/$HOME}
 
 if [[ -e "${KEYSTORE_PATH}" ]]; then
     echo -e "${YLW}Keystore file already exists:${RST} ${KEYSTORE_PATH}" >&2
+    echo "${KEYSTORE_PATH}"
     exit 0
 fi
 
@@ -40,7 +41,7 @@ KEYSTORE_DIR=$(dirname "${KEYSTORE_PATH}")
 
 echo -e "${GRN}Generating keystore...${RST}" >&2
 
-exec keytool -genkey -v \
+keytool -genkey -v \
     -keyalg RSA \
     -keysize 2048 \
     -validity 10000 \
@@ -51,3 +52,5 @@ exec keytool -genkey -v \
     -storepass "${KEYSTORE_PASSWORD}" \
     -keypass "${KEYSTORE_KEY_PASSWORD}" \
     > /dev/stderr
+
+echo "${KEYSTORE_PATH}"

scripts/google-free.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Used by Clojure to condition code and Gradle to make dependencies optional
+sed -i -e '$aGOOGLE_FREE=1' .env.release
+
+# remove react-native-notifications(uses google dependencies) and google-services.json for the fdroid-build
+yarn remove react-native-notifications
+rm android/app/google-services.json

scripts/hooks/prepare-commit-msg

@@ -10,13 +10,13 @@ GO_COMMIT_MERGE_BASE=$(git show "${MERGE_BASE}":status-go-version.json | jq -r '
 GO_COMMIT_CURRENT=$(jq -r '."commit-sha1"' status-go-version.json)
 GITHUB_LINK_PREFIX="https://github.com/status-im/status-go/compare/"
 # Link to the current StatusGo changelog being updated.
-GITHUB_LINK="${GITHUB_LINK_PREFIX}${GO_COMMIT_MERGE_BASE::8}...${GO_COMMIT_CURRENT::8}"
+GITHUB_LINK="${GITHUB_LINK_PREFIX}${GO_COMMIT_MERGE_BASE}...${GO_COMMIT_CURRENT}"
 
 COMMIT_MSG_FILE=$1
 # Check if the commit message already contains the link (rebase) and update otherwise insert into line2
 if ! grep -qF "${GITHUB_LINK_PREFIX}" "${COMMIT_MSG_FILE}" >/dev/null; then
   sed -in'' -e "2i\\
-\n${GITHUB_LINK}" "${COMMIT_MSG_FILE}"
+${GITHUB_LINK}\n" "${COMMIT_MSG_FILE}"
 else
   sed -in'' -e "s;^${GITHUB_LINK_PREFIX}.*$;${GITHUB_LINK};" "${COMMIT_MSG_FILE}"
 fi

scripts/release-android.sh

@@ -26,9 +26,13 @@ config=''
 if [[ -n "${STATUS_GO_SRC_OVERRIDE}" ]]; then
   config+="status-im.status-go.src-override=\"${STATUS_GO_SRC_OVERRIDE}\";"
 fi
+if [[ "${ANDROID_APK_SIGNED}" == "true" ]]; then
+  config+="status-im.android.keystore-path=\"$(must_get_env KEYSTORE_PATH)\";"
+fi
 config+="status-im.commit-hash=\"$(git rev-parse --verify HEAD)\";"
 config+="status-im.build-type=\"$(must_get_env BUILD_TYPE)\";"
 config+="status-im.build-number=\"$(must_get_env BUILD_NUMBER)\";"
+config+="status-im.android.apk-signed=\"$(must_get_env ANDROID_APK_SIGNED)\";"
 config+="status-im.android.abi-split=\"$(must_get_env ANDROID_ABI_SPLIT)\";"
 config+="status-im.android.abi-include=\"$(must_get_env ANDROID_ABI_INCLUDE)\";"
 nixOpts=()
@@ -38,10 +42,24 @@ export SECRETS_FILE_PATH=$(mktemp)
 chmod 644 ${SECRETS_FILE_PATH}
 # If secrets file was created we want to remove it.
 trap "rm -vf ${SECRETS_FILE_PATH}" EXIT ERR INT QUIT
-
 # Secrets like this can't be passed via args or they end up in derivation.
-if [[ -n "${INFURA_TOKEN}" ]];    then append_env_export 'INFURA_TOKEN';    fi
-if [[ -n "${OPENSEA_API_KEY}" ]]; then append_env_export 'OPENSEA_API_KEY'; fi
+if [[ -n "${KEYSTORE_ALIAS}${KEYSTORE_ALIAS}${KEYSTORE_ALIAS}" ]]; then
+  # WARNING: All three have to be set!
+  append_env_export 'KEYSTORE_PASSWORD'
+  append_env_export 'KEYSTORE_ALIAS'
+  append_env_export 'KEYSTORE_KEY_PASSWORD'
+fi
+if [[ -n "${INFURA_TOKEN}" ]]; then
+  append_env_export 'INFURA_TOKEN'
+fi
+if [[ -n "${OPENSEA_API_KEY}" ]]; then
+  append_env_export 'OPENSEA_API_KEY'
+fi
+
+# Used by Clojure at compile time for remove import of react-native-notifications for fdroid release
+if [[ -n "${READER_FEATURES}" ]]; then
+    append_env_export 'READER_FEATURES'
+fi
 
 # If no secrets were passed there's no need to pass the 'secretsFile'.
 if [[ -s "${SECRETS_FILE_PATH}" ]]; then

scripts/sign-android.sh

@@ -1,48 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-GIT_ROOT=$(cd "${BASH_SOURCE%/*}" && git rev-parse --show-toplevel)
-source "${GIT_ROOT}/scripts/colors.sh"
-
-function property() {
-    grep "${2}" "${1}" | cut -d'=' -f2
-}
-
-function gradle_property() {
-    property ${GIT_ROOT}/android/gradle.properties ${1}
-}
-
-function env_var_or_gradle_prop() {
-    VAR_NAME="${1}"
-    if [[ -n "${!VAR_NAME}" ]]; then
-        echo "${!VAR_NAME}"
-    else
-        gradle_property "${VAR_NAME}"
-    fi
-}
-
-function must_get_env() {
-  declare -n VAR_VALUE="$1"
-  if [[ -n "${VAR_VALUE}" ]]; then
-      echo "${VAR_VALUE}"
-      return
-  fi
-  echo -e "${RED}No required env variable:${RST} ${BLD}${!VAR_VALUE}${RST}" 1>&2
-  exit 1
-}
-
-# If filename contains string "unsigned" change that to signed.
-# Otherwise sign in-place and overwrite the current unsigned file.
-if [[ "${1}" =~ unsigned ]]; then
-  OUTPUT_FLAGS="--out=${1/unsigned/signed}"
-fi
-
-echo -e "${GRN}Signing APK:${RST} ${1}" >&2
-
-exec apksigner sign --verbose \
-    --ks="$(env_var_or_gradle_prop KEYSTORE_PATH)" \
-    --ks-pass="pass:$(env_var_or_gradle_prop KEYSTORE_PASSWORD)" \
-    --ks-key-alias="$(env_var_or_gradle_prop KEYSTORE_ALIAS)" \
-    --key-pass="pass:$(env_var_or_gradle_prop KEYSTORE_KEY_PASSWORD)" \
-    "${OUTPUT_FLAGS}" \
-    "${1}"

shadow-cljs.edn

@@ -16,7 +16,7 @@
                 [refactor-nrepl "2.5.0"]
                 [cider/cider-nrepl "0.25.3"]
                 [cider/piggieback "0.4.1"]
-                [re-frisk-remote "1.6.0"]
+                [re-frisk-remote "1.5.0"]
                 ;; routing
                 [bidi "2.1.6"]
                 ;; test dependencies
@@ -64,7 +64,8 @@
                                         :static-fns true
                                         :fn-invoke-direct true
                                         :optimizations :advanced
-                                        :js-options {:js-provider :closure}}}}
+                                        :js-options {:js-provider :closure}
+                                        :reader-features #{#shadow/env ["READER_FEATURES" :as :keyword :default :cljs]}}}}
           ;; the tests are ran with node, react-native dependencies are mocked
           ;; by using node --require override.js, which uses the node-library
           ;; produced by the target :mocks below and redefines node require

src/mocks/js_dependencies.cljs

@@ -1,7 +1,6 @@
 (ns mocks.js-dependencies
   (:require-macros [status-im.utils.slurp :refer [slurp]])
   (:require [status-im.fleet.default-fleet :refer (default-fleets)])
-  (:require [status-im.utils.test :as utils.test])
   (:require [status-im.chat.default-chats :refer (default-chats)]))
 
 (def action-button          #js {:default #js {:Item #js {}}})
@@ -20,12 +19,10 @@
 (def react-native
   (clj->js {:NativeModules {:RNGestureHandlerModule {:Direction (fn [])}
                             :PushNotifications      {}
-                            :Status                 utils.test/status
                             :ReanimatedModule       {:configureProps (fn [])}}
 
             :View                     {}
             :RefreshControl           {}
-            :AppState                 {}
             :FlatList                 {}
             :SectionList              {}
             :Text                     {}
@@ -50,7 +47,6 @@
                                        :ValueXY                 (fn [])
                                        :View                    {}
                                        :FlatList                {}
-                                       :Image                   {}
                                        :ScrollView              {}
                                        :Text                    {}}
             :Easing                   {:bezier (fn [])
@@ -59,7 +55,7 @@
                                        :in     (fn [])
                                        :inOut  (fn [])}
             :DeviceEventEmitter       {:addListener (fn [])}
-            :Dimensions               {:get (fn []) :addEventListener identity}
+            :Dimensions               {:get (fn [])}
             :useWindowDimensions      {}
             :Platform                 {:select (fn [])}
             :I18nManager              {:isRTL ""}
@@ -81,8 +77,7 @@
 
 (def icons           #js {:default #js {}})
 (def webview                #js {:WebView #js {}})
-(def status-keycard         #js {:default #js {:nfcIsSupported (fn [] #js {:then identity})
-                                               :nfcIsEnabled (fn [] #js {:then identity})}})
+(def status-keycard         #js {:default #js {}})
 
 (def snoopy                 #js {:default #js {}})
 (def snoopy-filter          #js {:default #js {}})
@@ -90,11 +85,6 @@
 (def snoopy-buffer          #js {:default #js {}})
 (def fetch                  #js {})
 
-(def async-storage-atom (atom {}))
-(def async-storage #js {:default #js {:setItem #(js/Promise.resolve)
-                                      :multiGet #(js/Promise.resolve)
-                                      :getItem #(js/Promise.resolve)}})
-
 (def background-timer (clj->js {:default {:setTimeout js/setTimeout
                                           :setInterval js/setInterval
                                           :clearTimeout js/clearTimeout
@@ -107,14 +97,8 @@
 (def react-native-mail #js {:mail #js {}})
 (def react-native-screens  #js {})
 (def react-native-shake  #js {})
-(def react-native-share #js {:default {}})
-(def react-native-svg #js {:SvgUri #js {:render identity}
-                           :SvgXml #js {:render identity}})
-(def react-native-webview #js {:default {}})
-(def react-native-audio-toolkit #js {:MediaStates {}})
 (def net-info  #js {})
 (def touchid  #js {})
-(def react-native-image-viewing #js {:default {}})
 (def safe-area-context (clj->js {:SafeAreaProvider {:_reactNativeIphoneXHelper {:getStatusBarHeight (fn [])}}
                                  :SafeAreaInsetsContext {:Consumer (fn [])}
                                  :SafeAreaView {}}))
@@ -132,19 +116,7 @@
                                   :StackActions        #js {}})
 
 (def react-native-navigation #js {:Navigation #js {:constants (fn [] #js {:then identity})
-                                                   :setDefaultOptions identity
-                                                   :setRoot identity
-                                                   :setLazyComponentRegistrator identity
-                                                   :push identity
-                                                   :registerComponent identity
-                                                   :events
-                                                   (fn []
-                                                     #js {:registerModalDismissedListener identity
-                                                          :registerAppLaunchedListener identity
-                                                          :registerBottomTabSelectedListener identity
-                                                          :registerComponentDidDisappearListener identity
-                                                          :registerComponentDidAppearListener identity
-                                                          :registerNavigationButtonPressedListener identity})}})
+                                                   :events identity}})
 
 (def react-navigation-stack #js {:createStackNavigator identity
                                  :TransitionPresets    #js {:ModalPresentationIOS #js {}}})
@@ -230,8 +202,6 @@
 
 (def react-native-gradien #js {:default #js {}})
 
-(def react-native-permissions #js {:default #js {}})
-
 (def push-notification-ios #js {})
 
 (def rn-emoji-keyboard
@@ -240,15 +210,12 @@
 (def react-native-draggable-flatlist
   #js {:default #js {}})
 
-(def react-native-blob-util
-  #js {:default #js {}})
+(def react-native-notifications
+  #js {:Notifications #js {}})
 
 (def react-native-blur
   (clj->js {:BlurView {}}))
 
-(def react-native-camera-roll
-  (clj->js {:default #js {}}))
-
 (def wallet-connect-client #js {:default       #js {}
                                 :CLIENT_EVENTS #js {:session #js {:request nil
                                                                   :created nil
@@ -284,21 +251,13 @@
     "react-native-device-info" react-native-device-info
     "react-native-push-notification" react-native-push-notification
     "react-native-linear-gradient" react-native-gradien
-    "react-native-blob-util" react-native-blob-util
     "react-native-navigation" react-native-navigation
     "@react-native-community/push-notification-ios" push-notification-ios
     "@react-native-community/blur" react-native-blur
-    "@react-native-community/cameraroll" react-native-camera-roll
     "react-native-camera-kit" react-native-camera-kit
-    "react-native-permissions" react-native-permissions
     "rn-emoji-keyboard" rn-emoji-keyboard
+    "react-native-notifications" react-native-notifications
     "react-native-draggable-flatlist" react-native-draggable-flatlist
-    "react-native-webview" react-native-webview
-    "@react-native-community/audio-toolkit" react-native-audio-toolkit
-    "react-native-image-viewing" react-native-image-viewing
-    "react-native-share" react-native-share
-    "@react-native-community/async-storage" async-storage
-    "react-native-svg" react-native-svg
     "./fleets.js" default-fleets
     "./chats.js" default-chats
     "@walletconnect/client" wallet-connect-client

src/quo/components/text.cljs

@@ -28,7 +28,6 @@
            :inherit           nil)
          (case (or size :base)
            :tiny     typography/tiny
-           :x-small  typography/x-small
            :small    typography/small
            :base     typography/base
            :large    typography/large

src/quo/design_system/typography.cljs

@@ -3,9 +3,6 @@
 (def tiny {:font-size    10
            :line-height 14})
 
-(def x-small {:font-size 12
-              :line-height 16})
-
 (def small {:font-size   13
             :line-height 18})
 

src/quo/react_native.cljs

@@ -74,9 +74,6 @@
 (def animated-view
   (reagent/adapt-react-class (.-View ^js animated)))
 
-(def animated-image-view
-  (reagent/adapt-react-class (.-Image ^js animated)))
-
 (def ui-manager  (.-UIManager ^js rn))
 
 (def layout-animation (.-LayoutAnimation ^js rn))
@@ -106,10 +103,6 @@
                                                :delete   #js {:type     (:ease-in-ease-out layout-animation-types)
                                                               :property (:opacity layout-animation-properties)}}})
 
-(defonce enable-layout-animations
-  (when platform/android?
-    (.setLayoutAnimationEnabledExperimental ^js ui-manager true)))
-
 (def activity-indicator (reagent/adapt-react-class (.-ActivityIndicator ^js rn)))
 
 ;; Flat-list

src/quo2/components/button.cljs

@@ -105,7 +105,7 @@
   [_ _]
   (let [pressed (reagent/atom false)]
     (fn [{:keys [on-press disabled type size before after above width
-                 on-long-press accessibility-label icon style]
+                 on-long-press accessibility-label icon]
           :or   {type :primary
                  size 40}}
          children]
@@ -126,19 +126,17 @@
                                               {:on-press-out (fn []
                                                                (reset! pressed nil))})
 
-         [rn/view {:style (merge
-                           (style-container
-                            type
-                            size
-                            disabled
-                            (get background-color state)
-                            (get border-color state)
-                            icon
-                            above
-                            width
-                            before
-                            after)
-                           style)}
+         [rn/view {:style (style-container
+                           type
+                           size
+                           disabled
+                           (get background-color state)
+                           (get border-color state)
+                           icon
+                           above
+                           width
+                           before
+                           after)}
           (when above
             [rn/view
              [quo2.icons/icon above {:container-style {:margin-bottom 2}
@@ -170,4 +168,4 @@
              [quo2.icons/icon after {:container-style {:margin-left  4
                                                        :margin-right (if (= size 40) 12 8)}
                                      :color           icon-color
-                                     :size            icon-size}]])]]))))
+                                     :size            icon-size}]])]]))))

src/quo2/components/text.cljs

@@ -29,6 +29,5 @@
   (let [this (reagent/current-component)
         props (reagent/props this)
         style (text-style props)]
-    (into [rn/text (merge {:style style}
-                          (dissoc props :style :size :align :weight :color))]
-          (reagent/children this))))
+    (into [rn/text {:style style}]
+          (reagent/children this))))