diff --git a/android/build.gradle b/android/build.gradle
index 7379cc7..63e12a8 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -31,7 +31,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.2'
 
     defaultConfig {
         minSdkVersion 18
@@ -53,7 +53,7 @@ android {
 
             // where to find generated Java source
             java.srcDirs = ['../src', 'src']
-
+            jniLibs.srcDirs = ['external/data/data/security.pEp/app_opt/lib']
             assets.srcDirs = ['assets', 'external/assets']
         }
     }
diff --git a/android/src/org/pEp/jniadapter/AndroidHelper.java b/android/src/org/pEp/jniadapter/AndroidHelper.java
index ec8b8a0..d5609f7 100644
--- a/android/src/org/pEp/jniadapter/AndroidHelper.java
+++ b/android/src/org/pEp/jniadapter/AndroidHelper.java
@@ -29,7 +29,7 @@ public class AndroidHelper {
     private static File tmpDir;
         
     // TODO : Increment when needed.
-    public static int ENGINE_VERSION_CODE = 2779;
+    public static int ENGINE_VERSION_CODE = 3063;
 
     private static File shareDir;
 
diff --git a/androidTests/app/build.gradle b/androidTests/app/build.gradle
index abfb76a..f7e8b33 100644
--- a/androidTests/app/build.gradle
+++ b/androidTests/app/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId "security.pEp"
@@ -25,12 +25,12 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.4.0'
-    compile project(':pEpJNIAdapter')
-    testCompile 'junit:junit:4.12'
-    compile 'com.jakewharton:butterknife:8.0.1'
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.android.support:appcompat-v7:23.4.0'
+    implementation project(':pEpJNIAdapter')
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.jakewharton:butterknife:8.0.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.0.1'
-    compile 'com.karumi:dexter:2.3.1'
-    compile group: 'net.lingala.zip4j', name: 'zip4j', version: '1.3.1'
+    implementation 'com.karumi:dexter:5.0.0'
+    implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.3.1'
 }
diff --git a/androidTests/build.gradle b/androidTests/build.gradle
index 8250249..44373dc 100644
--- a/androidTests/build.gradle
+++ b/androidTests/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files