diff --git a/.ci/Dockerfile b/.ci/Dockerfile
new file mode 100644
index 0000000..eb7247d
--- /dev/null
+++ b/.ci/Dockerfile
@@ -0,0 +1,30 @@
+FROM cirrusci/flutter:stable
+
+RUN sudo apt-get update -y
+
+RUN sudo apt-get install -y --no-install-recommends gnupg
+
+# Add repo for gcloud sdk and install it
+RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
+    sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list 
+
+RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
+    sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
+
+RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \
+    gcloud config set core/disable_usage_reporting true && \
+    gcloud config set component_manager/disable_update_check true
+
+RUN yes | sdkmanager \
+    "platforms;android-29" \
+    "build-tools;29.0.2" \
+    "extras;google;m2repository" \
+    "extras;android;m2repository"
+
+RUN yes | sdkmanager \
+    "platforms;android-28" \
+    "build-tools;28.0.3" \
+    "extras;google;m2repository" \
+    "extras;android;m2repository"
+
+RUN yes | sdkmanager --licenses
diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000..1891be0
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,31 @@
+task:
+    container:
+        dockerfile: .ci/Dockerfile
+        cpu: 8
+        memory: 16G
+    pub_cache:
+        folder: ~/.pub-cache
+    setup_script:
+        - flutter channel stable
+        - flutter upgrade
+    build_script: 
+        - cd example
+        - flutter build apk
+    #test_script: flutter test
+  
+task:
+    osx_instance:
+        image: mojave-flutter
+    pub_cache:
+        folder: ~/.pub-cache
+    setup_script:
+        - pod repo update
+        - flutter channel stable
+        - flutter upgrade
+    create_simulator_script:
+        - xcrun simctl list
+        - xcrun simctl create Flutter-iPhone com.apple.CoreSimulator.SimDeviceType.iPhone-X com.apple.CoreSimulator.SimRuntime.iOS-13-2 | xargs xcrun simctl boot
+    build_script: 
+        - cd example
+        - flutter build ios --no-codesign
+    #test_script: flutter test
diff --git a/android/build.gradle b/android/build.gradle
index a65b74e..1f3b28d 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.pycampers.rx_ble'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -43,5 +43,5 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation project(path: ':plugin_scaffold')
     implementation "com.google.android.gms:play-services-location:17.0.0"
-    implementation "com.polidea.rxandroidble2:rxandroidble:1.10.1"
+    implementation "com.polidea.rxandroidble2:rxandroidble:1.10.5"
 }
diff --git a/example/.gitignore b/example/.gitignore
index 07488ba..852d37e 100644
--- a/example/.gitignore
+++ b/example/.gitignore
@@ -68,3 +68,6 @@
 !**/ios/**/default.pbxuser
 !**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
+
+flutter_export_environment.sh
+.flutter-plugins-dependencies
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 6991643..f846d30 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -39,7 +39,7 @@ android {
     defaultConfig {
         applicationId "com.pycampers.rx_ble_example"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -60,6 +60,6 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 5074a6f..1101244 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/example/android/gradle.properties b/example/android/gradle.properties
index 8bd86f6..a673820 100644
--- a/example/android/gradle.properties
+++ b/example/android/gradle.properties
@@ -1 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
+android.enableJetifier=true
+android.enableR8=true
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 8565906..4dd1feb 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip