AND-57 Move to AndroidX

voiceittech · Jun 21, 2021 · c31a78a · c31a78a
1 parent b147ae4
commit c31a78a
Show file tree

Hide file tree

Showing 15 changed files with 46 additions and 45 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 28
     defaultConfig {
         applicationId "com.voiceit.voiceit2sdk"
-        minSdkVersion 17
+        minSdkVersion 21
         targetSdkVersion 28
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,8 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-
+android.useAndroidX=true
+android.enableJetifier=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/CameraSource.java b/voiceit2/src/main/java/com/voiceit/voiceit2/CameraSource.java
@@ -28,9 +28,9 @@
 import android.hardware.Camera.CameraInfo;
 import android.os.Build;
 import android.os.SystemClock;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresPermission;
-import android.support.annotation.StringDef;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresPermission;
+import androidx.annotation.StringDef;
 import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/CameraSourcePreview.java b/voiceit2/src/main/java/com/voiceit/voiceit2/CameraSourcePreview.java
@@ -18,7 +18,7 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.hardware.Camera;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.SurfaceHolder;

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/FaceEnrollmentView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/FaceEnrollmentView.java
@@ -13,11 +13,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/FaceTracker.java b/voiceit2/src/main/java/com/voiceit/voiceit2/FaceTracker.java
@@ -3,7 +3,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Handler;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.media.MediaPlayer;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/FaceVerificationView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/FaceVerificationView.java
@@ -16,11 +16,11 @@
     import android.os.Build;
     import android.os.Bundle;
     import android.os.Handler;
-    import android.support.annotation.NonNull;
-    import android.support.v4.app.ActivityCompat;
-    import android.support.v4.content.ContextCompat;
-    import android.support.v4.content.LocalBroadcastManager;
-    import android.support.v7.app.AppCompatActivity;
+    import androidx.annotation.NonNull;
+    import androidx.core.app.ActivityCompat;
+    import androidx.core.content.ContextCompat;
+    import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+    import androidx.appcompat.app.AppCompatActivity;
     import android.util.Log;
     import android.view.WindowManager;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/InstructionalVideoView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/InstructionalVideoView.java
@@ -2,7 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/LivenessTracker.java b/voiceit2/src/main/java/com/voiceit/voiceit2/LivenessTracker.java
@@ -5,7 +5,7 @@
 import android.media.CamcorderProfile;
 import android.media.MediaRecorder;
 import android.os.Handler;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.media.MediaPlayer;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/VideoEnrollmentView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/VideoEnrollmentView.java
@@ -14,11 +14,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/VideoVerificationView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/VideoVerificationView.java
@@ -15,11 +15,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceEnrollmentView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceEnrollmentView.java
@@ -9,11 +9,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceIdentificationView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceIdentificationView.java
@@ -9,11 +9,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceItAPI2.java b/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceItAPI2.java
@@ -11,7 +11,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
 import android.widget.Toast;
 

diff --git a/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceVerificationView.java b/voiceit2/src/main/java/com/voiceit/voiceit2/VoiceVerificationView.java
@@ -9,11 +9,11 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.WindowManager;