diff --git a/android/build.gradle b/android/build.gradle
index 3724888..dede84b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -11,12 +11,12 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.1"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -30,5 +30,5 @@ repositories {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:0.12.+'
+    implementation 'com.facebook.react:react-native:+'
 }
diff --git a/android/src/main/java/com/sensormanager/AccelerometerRecord.java b/android/src/main/java/com/sensormanager/AccelerometerRecord.java
index 01741e8..df96c91 100644
--- a/android/src/main/java/com/sensormanager/AccelerometerRecord.java
+++ b/android/src/main/java/com/sensormanager/AccelerometerRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -54,7 +54,7 @@ public void stop() {
 		}
     }
 
-	private void sendEvent(String eventName, @Nullable WritableMap params)
+	private void sendEvent(String eventName, @NonNull WritableMap params)
 	{
 		try {
 			mReactContext 
diff --git a/android/src/main/java/com/sensormanager/GyroscopeRecord.java b/android/src/main/java/com/sensormanager/GyroscopeRecord.java
index cf708ef..f72548b 100644
--- a/android/src/main/java/com/sensormanager/GyroscopeRecord.java
+++ b/android/src/main/java/com/sensormanager/GyroscopeRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -48,7 +48,7 @@ public void stop() {
         mSensorManager.unregisterListener(this);
     }
 
-	private void sendEvent(String eventName, @Nullable WritableMap params)
+	private void sendEvent(String eventName, @NonNull WritableMap params)
 	{
 		try {
 			mReactContext 
diff --git a/android/src/main/java/com/sensormanager/LightSensorRecord.java b/android/src/main/java/com/sensormanager/LightSensorRecord.java
index 2a83009..758157d 100644
--- a/android/src/main/java/com/sensormanager/LightSensorRecord.java
+++ b/android/src/main/java/com/sensormanager/LightSensorRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -47,7 +47,7 @@ public void stop() {
         mSensorManager.unregisterListener(this);
     }
 
-    private void sendEvent(String eventName, @Nullable WritableMap params)
+    private void sendEvent(String eventName, @NonNull WritableMap params)
     {
         try {
             mReactContext
diff --git a/android/src/main/java/com/sensormanager/MagnetometerRecord.java b/android/src/main/java/com/sensormanager/MagnetometerRecord.java
index 9fb5b05..d686769 100644
--- a/android/src/main/java/com/sensormanager/MagnetometerRecord.java
+++ b/android/src/main/java/com/sensormanager/MagnetometerRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -48,7 +48,7 @@ public void stop() {
         mSensorManager.unregisterListener(this);
     }
 
-	private void sendEvent(String eventName, @Nullable WritableMap params)
+	private void sendEvent(String eventName, @NonNull WritableMap params)
 	{
 		try {
 			mReactContext 
diff --git a/android/src/main/java/com/sensormanager/MotionValueRecord.java b/android/src/main/java/com/sensormanager/MotionValueRecord.java
index 04765e7..1cefbcd 100644
--- a/android/src/main/java/com/sensormanager/MotionValueRecord.java
+++ b/android/src/main/java/com/sensormanager/MotionValueRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -54,7 +54,7 @@ public void stop() {
         mSensorManager.unregisterListener(this);
     }
 
-	private void sendEvent(String eventName, @Nullable WritableMap params)
+	private void sendEvent(String eventName, @NonNull WritableMap params)
 	{
 		try {
 			mReactContext 
diff --git a/android/src/main/java/com/sensormanager/OrientationRecord.java b/android/src/main/java/com/sensormanager/OrientationRecord.java
index 3811f85..3a96128 100644
--- a/android/src/main/java/com/sensormanager/OrientationRecord.java
+++ b/android/src/main/java/com/sensormanager/OrientationRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -57,7 +57,7 @@ public void stop() {
       }
     }
 
-    private void sendEvent(String eventName, @Nullable WritableMap params)
+    private void sendEvent(String eventName, @NonNull WritableMap params)
     {
         try {
             mReactContext
diff --git a/android/src/main/java/com/sensormanager/ProximityRecord.java b/android/src/main/java/com/sensormanager/ProximityRecord.java
index 28bd06a..c6ec586 100644
--- a/android/src/main/java/com/sensormanager/ProximityRecord.java
+++ b/android/src/main/java/com/sensormanager/ProximityRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -47,7 +47,7 @@ public void stop() {
         mSensorManager.unregisterListener(this);
     }
 
-    private void sendEvent(String eventName, @Nullable WritableMap params) {
+    private void sendEvent(String eventName, @NonNull WritableMap params) {
         try {
             mReactContext
                 .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
diff --git a/android/src/main/java/com/sensormanager/SensorManagerPackage.java b/android/src/main/java/com/sensormanager/SensorManagerPackage.java
index 739f30d..c6d21da 100644
--- a/android/src/main/java/com/sensormanager/SensorManagerPackage.java
+++ b/android/src/main/java/com/sensormanager/SensorManagerPackage.java
@@ -13,19 +13,16 @@
 
 public class SensorManagerPackage implements ReactPackage {
 
-    @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
         List<NativeModule> modules = new ArrayList<>();
         modules.add(new SensorManagerModule(reactContext));
         return modules;
     }
 
-    @Override
     public List<Class<? extends JavaScriptModule>> createJSModules() {
         return Collections.emptyList();
     }
 
-	@Override
 	public List<ViewManager> createViewManagers(ReactApplicationContext reactContext) {
 		return Arrays.<ViewManager>asList();
 	}
diff --git a/android/src/main/java/com/sensormanager/StepCounterRecord.java b/android/src/main/java/com/sensormanager/StepCounterRecord.java
index 80aab48..50c4804 100644
--- a/android/src/main/java/com/sensormanager/StepCounterRecord.java
+++ b/android/src/main/java/com/sensormanager/StepCounterRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -48,7 +48,7 @@ public void stop() {
         mSensorManager.unregisterListener(this);
     }
 
-	private void sendEvent(String eventName, @Nullable WritableMap params)
+	private void sendEvent(String eventName, @NonNull WritableMap params)
 	{
 		try {
 			mReactContext 
diff --git a/android/src/main/java/com/sensormanager/ThermometerRecord.java b/android/src/main/java/com/sensormanager/ThermometerRecord.java
index 25b934d..ea3b3bb 100644
--- a/android/src/main/java/com/sensormanager/ThermometerRecord.java
+++ b/android/src/main/java/com/sensormanager/ThermometerRecord.java
@@ -6,7 +6,7 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.util.Log;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import java.io.*;
 import java.util.Date;
@@ -49,7 +49,7 @@ public void stop() {
         mSensorManager.unregisterListener(this);
     }
 
-	private void sendEvent(String eventName, @Nullable WritableMap params)
+	private void sendEvent(String eventName, @NonNull WritableMap params)
 	{
 		try {
 			mReactContext