feat: AndroidX migration

enioka-Haute-Couture · Apr 16, 2024 · 2cec761 · 2cec761
1 parent 3df603e
commit 2cec761
Show file tree

Hide file tree

Showing 63 changed files with 92 additions and 88 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.3.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/demoscannerapp/build.gradle b/demoscannerapp/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         applicationId "com.enioka.scanner.demoscannerapp"
         minSdkVersion 19
@@ -61,7 +61,7 @@ dependencies {
 
     //noinspection GradleCompatible
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 
     // Useless test stuff
     testImplementation 'junit:junit:4.12'

diff --git a/demoscannerapp/src/main/java/com/enioka/scanner/demo/ScannerTesterActivity.java b/demoscannerapp/src/main/java/com/enioka/scanner/demo/ScannerTesterActivity.java
@@ -7,10 +7,10 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 import android.util.Log;
 
 import com.enioka.scanner.activities.ScannerCompatActivity;

diff --git a/demoscannerapp/src/main/java/com/enioka/scanner/demo/SettingsActivity.java b/demoscannerapp/src/main/java/com/enioka/scanner/demo/SettingsActivity.java
@@ -2,7 +2,7 @@
 
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Switch;

diff --git a/demoscannerapp/src/main/java/com/enioka/scanner/demo/WelcomeActivity.java b/demoscannerapp/src/main/java/com/enioka/scanner/demo/WelcomeActivity.java
@@ -3,7 +3,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
 import com.enioka.scanner.api.ScannerSearchOptions;

diff --git a/demoscannerapp/src/main/res/layout/activity_settings.xml b/demoscannerapp/src/main/res/layout/activity_settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -13,7 +13,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingBottom="33dp"
@@ -898,7 +898,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/textViewSelectAztec" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/demoscannerapp/src/main/res/layout/activity_welcome.xml b/demoscannerapp/src/main/res/layout/activity_welcome.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -38,4 +38,4 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/bt_tester" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/enioka_scan/build.gradle b/enioka_scan/build.gradle
@@ -3,11 +3,11 @@ apply plugin: 'scanner.published-library'
 description('A library that makes the integration of all barcode scanners easy in any Android application, avoiding vendor lock-in and lowering the cost of advanced scanner integration.')
 
 android {
-    compileSdk 33
+    compileSdk 34
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -24,7 +24,7 @@ ext {
     mavenArtifactId = "scanner"
 }
 
-task androidSourcesJar(type: Jar) {
+tasks.register('androidSourcesJar', Jar) {
     archiveClassifier.set('sources')
     from android.sourceSets.main.java.srcDirs
     from android.sourceSets.main.kotlin.srcDirs
@@ -33,7 +33,7 @@ task androidSourcesJar(type: Jar) {
 dependencies {
     //noinspection GradleCompatible
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 
     // ZBAR & ZXING (Zebra Crossing) = camera. From Maven Central.
     api('me.dm7.barcodescanner:zbar:1.9.8') {

diff --git a/enioka_scan/src/androidTest/java/com/enioka/scanner/service/ScannerServiceAndroidTest.java b/enioka_scan/src/androidTest/java/com/enioka/scanner/service/ScannerServiceAndroidTest.java
@@ -5,8 +5,8 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
+import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
 import android.util.Log;
 
 import com.enioka.scanner.api.Scanner;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/activities/ManualInputFragment.java b/enioka_scan/src/main/java/com/enioka/scanner/activities/ManualInputFragment.java
@@ -5,7 +5,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/activities/ScannerCompatActivity.java b/enioka_scan/src/main/java/com/enioka/scanner/activities/ScannerCompatActivity.java
@@ -15,10 +15,10 @@
 import android.graphics.PorterDuff;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.ImageButton;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/api/Scanner.java b/enioka_scan/src/main/java/com/enioka/scanner/api/Scanner.java
@@ -1,7 +1,7 @@
 package com.enioka.scanner.api;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.enioka.scanner.api.callbacks.ScannerCommandCallback;
 import com.enioka.scanner.api.callbacks.ScannerDataCallback;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/api/callbacks/ScannerStatusCallback.java b/enioka_scan/src/main/java/com/enioka/scanner/api/callbacks/ScannerStatusCallback.java
@@ -1,8 +1,8 @@
 package com.enioka.scanner.api.callbacks;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.enioka.scanner.R;
 import com.enioka.scanner.api.Scanner;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/api/proxies/ScannerStatusCallbackProxy.java b/enioka_scan/src/main/java/com/enioka/scanner/api/proxies/ScannerStatusCallbackProxy.java
@@ -2,7 +2,7 @@
 
 import android.os.Handler;
 import android.os.Looper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.enioka.scanner.api.Scanner;
 import com.enioka.scanner.api.callbacks.ScannerStatusCallback;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/bt/manager/bleserial/BleDeviceScanner.java b/enioka_scan/src/main/java/com/enioka/scanner/bt/manager/bleserial/BleDeviceScanner.java
@@ -11,7 +11,7 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.Log;
 
 import com.enioka.scanner.bt.manager.common.BluetoothScannerInternal;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanView.java b/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanView.java
@@ -6,8 +6,8 @@
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.widget.FrameLayout;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanViewBase.java b/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanViewBase.java
@@ -8,8 +8,8 @@
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanViewV1.java b/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanViewV1.java
@@ -11,7 +11,7 @@
 import android.graphics.Rect;
 import android.graphics.YuvImage;
 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/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanViewV2.java b/enioka_scan/src/main/java/com/enioka/scanner/camera/CameraBarcodeScanViewV2.java
@@ -23,9 +23,9 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Range;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/camera/TargetView.java b/enioka_scan/src/main/java/com/enioka/scanner/camera/TargetView.java
@@ -7,8 +7,8 @@
 import android.graphics.DashPathEffect;
 import android.graphics.Paint;
 import android.graphics.Rect;
-import android.support.annotation.ColorInt;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/helpers/Permissions.java b/enioka_scan/src/main/java/com/enioka/scanner/helpers/Permissions.java
@@ -5,8 +5,8 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
 
 /**
  * A set of helpers for scanner SDK providers.

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/helpers/ScannerProviderHolder.java b/enioka_scan/src/main/java/com/enioka/scanner/helpers/ScannerProviderHolder.java
@@ -1,6 +1,6 @@
 package com.enioka.scanner.helpers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.enioka.scanner.api.ScannerProvider;
 

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/helpers/ScannerProviderMeta.java b/enioka_scan/src/main/java/com/enioka/scanner/helpers/ScannerProviderMeta.java
@@ -1,8 +1,8 @@
 package com.enioka.scanner.helpers;
 
 import android.content.pm.ServiceInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Helper class containing a ScannerProvider's meta information.

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/helpers/intent/IntentScanner.java b/enioka_scan/src/main/java/com/enioka/scanner/helpers/intent/IntentScanner.java
@@ -4,7 +4,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.enioka.scanner.api.Scanner;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/sdk/camera/CameraBarcodeScanViewScanner.java b/enioka_scan/src/main/java/com/enioka/scanner/sdk/camera/CameraBarcodeScanViewScanner.java
@@ -1,7 +1,7 @@
 package com.enioka.scanner.sdk.camera;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.enioka.scanner.api.Scanner;

diff --git a/enioka_scan/src/main/java/com/enioka/scanner/service/ScannerService.java b/enioka_scan/src/main/java/com/enioka/scanner/service/ScannerService.java
@@ -5,7 +5,7 @@
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.enioka.scanner.LaserScanner;

diff --git a/enioka_scan/src/main/res/layout/activity_main.xml b/enioka_scan/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -104,4 +104,4 @@
         app:layout_constraintTop_toBottomOf="@id/scanner_trigger_off" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/enioka_scan/src/main/res/layout/activity_main_alt.xml b/enioka_scan/src/main/res/layout/activity_main_alt.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -91,4 +91,4 @@
         android:text="@string/activity_scan_pause_camera"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@id/scanner_switch_zxing" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/enioka_scan_athesi_rd50te/build.gradle b/enioka_scan_athesi_rd50te/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
 description 'Athesi E5L scanner provider for the Athesi E5L device (RD50TE name).'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28

diff --git a/...athesi_rd50te/src/main/java/com/enioka/scanner/sdk/athesi/RD50TE/AthesiRD50TEScanner.java b/...athesi_rd50te/src/main/java/com/enioka/scanner/sdk/athesi/RD50TE/AthesiRD50TEScanner.java
@@ -2,7 +2,7 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.enioka.scanner.api.Scanner;
 import com.enioka.scanner.api.proxies.ScannerCommandCallbackProxy;

diff --git a/enioka_scan_athesi_spa43lte/build.gradle b/enioka_scan_athesi_spa43lte/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
 description 'Scanner provider for Athesi SPA43 device (SPA43LTE name).'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28

diff --git a/..._spa43lte/src/main/java/com/enioka/scanner/sdk/athesi/SPA43LTE/AthesiSPA43LTEScanner.java b/..._spa43lte/src/main/java/com/enioka/scanner/sdk/athesi/SPA43LTE/AthesiSPA43LTEScanner.java
@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.enioka.scanner.api.Scanner;

diff --git a/enioka_scan_bluebird/build.gradle b/enioka_scan_bluebird/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.library'
 description 'Scanner provider for bluebird devices.'
 
 android {
-    compileSdkVersion 33
+    compileSdk 34
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28

diff --git a/enioka_scan_bluebird/src/main/java/com/enioka/scanner/sdk/bluebird/BluebirdScanner.java b/enioka_scan_bluebird/src/main/java/com/enioka/scanner/sdk/bluebird/BluebirdScanner.java
@@ -5,7 +5,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.enioka.scanner.api.proxies.ScannerCommandCallbackProxy;