diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35b08d0..4f9404b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [0.6.0] - 15-11-2019
+
+* update gradle
+* migrate to androidX
+
 ## [0.5.6] - 13-05-2019
 
 * added null check in Android layout callback
diff --git a/android/build.gradle b/android/build.gradle
index b6a428f..91e71d3 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.5.2'
     }
 }
 
@@ -22,11 +22,11 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 29
     
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     lintOptions {
         disable 'InvalidPackage'
diff --git a/android/gradle.properties b/android/gradle.properties
index 8bd86f6..7be3d8b 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.enableR8=true
diff --git a/lib/keyboard_visibility.dart b/lib/keyboard_visibility.dart
index 4387192..6d75142 100644
--- a/lib/keyboard_visibility.dart
+++ b/lib/keyboard_visibility.dart
@@ -1,6 +1,7 @@
-import 'package:flutter/services.dart';
 import 'dart:async';
 
+import 'package:flutter/services.dart';
+
 /// A base class to handle the subscribing events
 class KeyboardVisibilitySubscriber {
   /// Called when a keyboard visibility event occurs
@@ -20,10 +21,8 @@ class KeyboardVisibilitySubscriber {
 
 /// The notification class that handles all information
 class KeyboardVisibilityNotification {
-  static const EventChannel _keyboardVisibilityStream =
-      const EventChannel('github.com/adee42/flutter_keyboard_visibility');
-  static Map<int, KeyboardVisibilitySubscriber> _list =
-      Map<int, KeyboardVisibilitySubscriber>();
+  static const EventChannel _keyboardVisibilityStream = const EventChannel('github.com/adee42/flutter_keyboard_visibility');
+  static Map<int, KeyboardVisibilitySubscriber> _list = Map<int, KeyboardVisibilitySubscriber>();
   static StreamSubscription _keyboardVisibilitySubscription;
   static int _currentIndex = 0;
 
@@ -32,9 +31,7 @@ class KeyboardVisibilityNotification {
 
   /// Constructs a new [KeyboardVisibilityNotification]
   KeyboardVisibilityNotification() {
-    _keyboardVisibilitySubscription ??= _keyboardVisibilityStream
-        .receiveBroadcastStream()
-        .listen(onKeyboardEvent);
+    _keyboardVisibilitySubscription ??= _keyboardVisibilityStream.receiveBroadcastStream().listen(onKeyboardEvent);
   }
 
   /// Internal function to handle native code channel communication
@@ -62,10 +59,8 @@ class KeyboardVisibilityNotification {
   /// [onShow] is called when the keyboard appears
   /// [onHide] is called when the keyboard disappears
   /// Returns a subscribing id that can be used to unsubscribe
-  int addNewListener(
-      {Function(bool) onChange, Function onShow, Function onHide}) {
-    _list[_currentIndex] = KeyboardVisibilitySubscriber(
-        onChange: onChange, onShow: onShow, onHide: onHide);
+  int addNewListener({Function(bool) onChange, Function onShow, Function onHide}) {
+    _list[_currentIndex] = KeyboardVisibilitySubscriber(onChange: onChange, onShow: onShow, onHide: onHide);
     return _currentIndex++;
   }
 
@@ -83,9 +78,9 @@ class KeyboardVisibilityNotification {
   }
 
   /// Internal function to clear class on dispose
-  dispose() {
-    if (_list.length == 0) {
-      _keyboardVisibilitySubscription?.cancel()?.catchError((e) {});
+  void dispose() {
+    if (_list.isEmpty) {
+      _keyboardVisibilitySubscription?.cancel()?.catchError(() {});
       _keyboardVisibilitySubscription = null;
     }
   }
diff --git a/pubspec.yaml b/pubspec.yaml
index 3abbc64..be3db1e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: keyboard_visibility
 description: Flutter plugin for discovering the state of the soft-keyboard visibility on Android and iOS.
-version: 0.5.6
+version: 0.6.0
 author: adee42 <42adee@gmail.com>
 homepage: https://github.com/adee42/flutter_keyboard_visibility/tree/master