Android Build: Update sequoia deps and build.gradle for Release 2.1.8

android/build.gradle

@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }
 
@@ -32,8 +32,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 3
-        versionName "2.1.4"
+        versionCode 4
+        versionName "2.1.8"
 
         externalNativeBuild {
             ndkBuild {
@@ -50,7 +50,7 @@ android {
             manifest.srcFile 'AndroidManifest.xml'
 
             // where to find generated Java source
-            java.srcDirs = ['../src', 'src']
+            java.srcDirs = ['../src', 'src', '../src/java']
             jniLibs.srcDirs = ['libs',
             //                   'external/data/data/security.pEp/app_opt/lib'
                                ]
@@ -140,7 +140,7 @@ android {
         commandLine 'make', "-j${threadsToUse}", 'system.db'
     }
 
-    // copy pEpEnginge's system.db to asset
+    // copy pEpEngine's system.db to asset
     task cpDBAssets(type: Copy, dependsOn: 'buildpEpEngineSystemDB') {
         from file(new File(pEpEngineDB, 'system.db'))
         into 'assets'

android/external/Makefile.conf

@@ -15,8 +15,8 @@ endif
 
 ### Sequoia deps versions
 OPENSSL_VERSION=1.1.1h
-GMP_VERSION=6.2.0
-NETTLE_VERSION=3.6
+GMP_VERSION=6.2.1
+NETTLE_VERSION=3.7
 
 ### Git deps repos
 EXTERNAL_GIT_REPOS += libetpan|https://github.com/fdik/libetpan.git?HEAD

android/external/downloads/gmp-6.2.0.tar.bz2.md5

@@ -1 +0,0 @@
-c24161e0dd44cae78cd5f67193492a21  gmp-6.2.0.tar.bz2

android/external/downloads/gmp-6.2.1.tar.bz2.md5

@@ -0,0 +1 @@
+28971fc21cf028042d4897f02fd355ea  downloads/gmp-6.2.1.tar.bz2

android/external/downloads/nettle-3.6.tar.gz.md5

@@ -1 +0,0 @@
-c45ee24ed7361dcda152a035d396fe8a  nettle-3.6.tar.gz

android/external/downloads/nettle-3.7.tar.gz.md5

@@ -0,0 +1 @@
+568070f62fd14ca6b076ad583d84e9db  nettle-3.7.tar.gz