diff --git a/android_all_sensors_driver/build.gradle b/android_all_sensors_driver/build.gradle
index 8d2c414..ac90a3c 100644
--- a/android_all_sensors_driver/build.gradle
+++ b/android_all_sensors_driver/build.gradle
@@ -17,10 +17,15 @@
 
 apply plugin: "com.android.application"
 
+// see: https://github.com/rosjava/android_extras/issues/27
 //noinspection GroovyAssignabilityCheck
 dependencies {
-    compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
-    compile group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
+    implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
+    implementation group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
+    implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
+    implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
+    implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
+    implementation 'org.ros.rosjava_messages:geometry_msgs:[1.12, 1.13)'
 }
 
 android {
diff --git a/android_tutorial_cv_bridge_CompressedImage/build.gradle b/android_tutorial_cv_bridge_CompressedImage/build.gradle
index 439df19..a875a9b 100644
--- a/android_tutorial_cv_bridge_CompressedImage/build.gradle
+++ b/android_tutorial_cv_bridge_CompressedImage/build.gradle
@@ -8,8 +8,13 @@ apply plugin: 'com.android.application'
 
 //noinspection GroovyAssignabilityCheck
 dependencies {
-    compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
-    compile project(":cv_bridge")
+    implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
+    implementation project(":cv_bridge")
+    implementation "org.opencv:openCVLibrary:3.4.0"
+    implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
+    implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
+    implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)" //for sensor_msgs.ImageEncodings
+    implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
 }
 
 android {
diff --git a/android_tutorial_cv_bridge_CompressedImage_javacv/build.gradle b/android_tutorial_cv_bridge_CompressedImage_javacv/build.gradle
index f617e4b..3b34a03 100644
--- a/android_tutorial_cv_bridge_CompressedImage_javacv/build.gradle
+++ b/android_tutorial_cv_bridge_CompressedImage_javacv/build.gradle
@@ -8,8 +8,13 @@ apply plugin: 'com.android.application'
 
 //noinspection GroovyAssignabilityCheck
 dependencies {
-    compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
-    compile "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
+    implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
+    implementation "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
+    implementation "org.bytedeco.javacpp-presets:opencv:2.4.11-0.11"
+    implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
+    implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
+    implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)" //for sensor_msgs.ImageEncodings
+    implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
 }
 
 android {
diff --git a/android_tutorial_cv_bridge_Image/build.gradle b/android_tutorial_cv_bridge_Image/build.gradle
index 439df19..8c46685 100644
--- a/android_tutorial_cv_bridge_Image/build.gradle
+++ b/android_tutorial_cv_bridge_Image/build.gradle
@@ -8,8 +8,13 @@ apply plugin: 'com.android.application'
 
 //noinspection GroovyAssignabilityCheck
 dependencies {
-    compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
-    compile project(":cv_bridge")
+    implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
+    implementation project(":cv_bridge")
+    implementation "org.opencv:openCVLibrary:3.4.0"
+    implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
+    implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
+    implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
+    implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
 }
 
 android {
diff --git a/android_tutorial_cv_bridge_Image_javacv/build.gradle b/android_tutorial_cv_bridge_Image_javacv/build.gradle
index 9a665c4..83e8a2c 100644
--- a/android_tutorial_cv_bridge_Image_javacv/build.gradle
+++ b/android_tutorial_cv_bridge_Image_javacv/build.gradle
@@ -8,8 +8,15 @@ apply plugin: 'com.android.application'
 
 //noinspection GroovyAssignabilityCheck
 dependencies {
-    compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
-    compile "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
+    implementation 'org.ros.android_core:android_core_components:[0.4,0.5)'
+    implementation "com.github.rosjava.rosjava_extras:cv_bridge_javacv:[0.3,0.4]"
+    implementation "org.bytedeco.javacpp-presets:opencv:2.4.11-0.11"
+    implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
+    implementation 'org.ros.rosjava_messages:sensor_msgs:1.12.7'
+    implementation 'org.ros.rosjava_messages:std_srvs:1.11.2'
+    implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
+    implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
+    implementation "org.apache.commons:com.springsource.org.apache.commons.logging:[1.1.1,1.2)"
 }
 
 android {
diff --git a/build.gradle b/build.gradle
index efa71d8..057def9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@
  * the License.
  */
 
-task wrapper(type: Wrapper) {
-  gradleVersion = "4.10.2"
+wrapper {
+  gradleVersion = "5.4.1"
 }
 
 buildscript {
diff --git a/cv_bridge/build.gradle b/cv_bridge/build.gradle
index 80abccb..bea6994 100644
--- a/cv_bridge/build.gradle
+++ b/cv_bridge/build.gradle
@@ -8,10 +8,13 @@ apply plugin: "com.android.library"
 
 //noinspection GroovyAssignabilityCheck
 dependencies {
-    compile "org.ros.rosjava_core:rosjava:[0.3,0.4)"
-    compile "org.ros.rosjava_messages:sensor_msgs:[1.12,1.13)"
-    compile "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
-    compile group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
+    implementation "org.ros.rosjava_core:rosjava:[0.3,0.4)"
+    implementation "org.ros.rosjava_messages:sensor_msgs:[1.12,1.13)"
+    implementation "com.github.rosjava.rosjava_extras:image:[0.3,0.4)"
+    implementation group: 'org.opencv', name: 'openCVLibrary', version: '3.4.0'
+    implementation 'com.android.tools.build:aapt2:4.1.2-6503028'
+    implementation "org.ros.rosjava_bootstrap:message_generation:0.3.3"
+    implementation 'org.ros.rosjava_messages:std_msgs:0.5.11'
 }
 
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e0b3fb8..f4d7b2b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists