From 2cec7611108a949ce856ca700ac026c1354a5f73 Mon Sep 17 00:00:00 2001 From: VincentKobz Date: Fri, 12 Apr 2024 16:12:37 +0200 Subject: [PATCH] feat: AndroidX migration --- build.gradle | 2 +- demoscannerapp/build.gradle | 4 ++-- .../com/enioka/scanner/demo/ScannerTesterActivity.java | 8 ++++---- .../java/com/enioka/scanner/demo/SettingsActivity.java | 2 +- .../java/com/enioka/scanner/demo/WelcomeActivity.java | 2 +- demoscannerapp/src/main/res/layout/activity_settings.xml | 8 ++++---- demoscannerapp/src/main/res/layout/activity_welcome.xml | 4 ++-- enioka_scan/build.gradle | 8 ++++---- .../enioka/scanner/service/ScannerServiceAndroidTest.java | 4 ++-- .../enioka/scanner/activities/ManualInputFragment.java | 2 +- .../enioka/scanner/activities/ScannerCompatActivity.java | 8 ++++---- .../src/main/java/com/enioka/scanner/api/Scanner.java | 2 +- .../scanner/api/callbacks/ScannerStatusCallback.java | 4 ++-- .../scanner/api/proxies/ScannerStatusCallbackProxy.java | 2 +- .../scanner/bt/manager/bleserial/BleDeviceScanner.java | 2 +- .../com/enioka/scanner/camera/CameraBarcodeScanView.java | 4 ++-- .../enioka/scanner/camera/CameraBarcodeScanViewBase.java | 4 ++-- .../enioka/scanner/camera/CameraBarcodeScanViewV1.java | 2 +- .../enioka/scanner/camera/CameraBarcodeScanViewV2.java | 6 +++--- .../main/java/com/enioka/scanner/camera/TargetView.java | 4 ++-- .../main/java/com/enioka/scanner/helpers/Permissions.java | 4 ++-- .../com/enioka/scanner/helpers/ScannerProviderHolder.java | 2 +- .../com/enioka/scanner/helpers/ScannerProviderMeta.java | 4 ++-- .../com/enioka/scanner/helpers/intent/IntentScanner.java | 2 +- .../scanner/sdk/camera/CameraBarcodeScanViewScanner.java | 2 +- .../java/com/enioka/scanner/service/ScannerService.java | 2 +- enioka_scan/src/main/res/layout/activity_main.xml | 4 ++-- enioka_scan/src/main/res/layout/activity_main_alt.xml | 4 ++-- enioka_scan_athesi_rd50te/build.gradle | 2 +- .../scanner/sdk/athesi/RD50TE/AthesiRD50TEScanner.java | 2 +- enioka_scan_athesi_spa43lte/build.gradle | 2 +- .../sdk/athesi/SPA43LTE/AthesiSPA43LTEScanner.java | 2 +- enioka_scan_bluebird/build.gradle | 2 +- .../com/enioka/scanner/sdk/bluebird/BluebirdScanner.java | 2 +- enioka_scan_generalscan/build.gradle | 2 +- .../com/enioka/scanner/sdk/generalscan/GsSppScanner.java | 2 +- enioka_scan_honeywell/build.gradle | 2 +- enioka_scan_honeywelloss_integrated/build.gradle | 2 +- .../integrated/HoneywellOssIntegratedScanner.java | 2 +- .../scanner/sdk/honeywelloss/integrated/SymbologyId.java | 2 +- enioka_scan_honeywelloss_spp/build.gradle | 2 +- .../sdk/honeywelloss/spp/HoneywellOssSppScanner.java | 2 +- .../enioka/scanner/sdk/honeywelloss/spp/SymbologyId.java | 2 +- enioka_scan_koamtac/build.gradle | 2 +- enioka_scan_m3/build.gradle | 2 +- enioka_scan_mock/build.gradle | 2 +- .../java/com/enioka/scanner/sdk/mock/MockAndroidTest.java | 4 ++-- .../java/com/enioka/scanner/sdk/mock/MockScanner.java | 2 +- enioka_scan_postech/build.gradle | 2 +- .../com/enioka/scanner/sdk/postech/PostechSppScanner.java | 2 +- enioka_scan_proglove/build.gradle | 2 +- .../com/enioka/scanner/sdk/proglove/ProgloveScanner.java | 2 +- enioka_scan_zebra/build.gradle | 2 +- enioka_scan_zebra_dw/build.gradle | 2 +- .../com/enioka/scanner/sdk/zebra/dw/ZebraDwCommand.java | 2 +- .../com/enioka/scanner/sdk/zebra/dw/ZebraDwConfig.java | 2 +- .../com/enioka/scanner/sdk/zebra/dw/ZebraDwScanner.java | 2 +- enioka_scan_zebraoss/build.gradle | 2 +- .../com/enioka/scanner/sdk/zebraoss/ZebraOssScanner.java | 2 +- .../scanner/sdk/zebraoss/parsers/ParamSendParser.java | 2 +- .../com/enioka/scanner/sdk/zebraoss/ssi/SsiSource.java | 2 +- gradle.properties | 4 ++++ gradle/wrapper/gradle-wrapper.properties | 2 +- 63 files changed, 92 insertions(+), 88 deletions(-) diff --git a/build.gradle b/build.gradle index e4e5bfd1..6ea52350 100644 --- 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 index 39d63466..b176ce1e 100644 --- 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 index cf51f89b..b2de84fb 100644 --- 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 index 075064d6..36288686 100644 --- 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 index c2e9c17e..3edeb66d 100644 --- 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 index 7ce3807b..71a0dea8 100644 --- a/demoscannerapp/src/main/res/layout/activity_settings.xml +++ b/demoscannerapp/src/main/res/layout/activity_settings.xml @@ -1,5 +1,5 @@ - - - + - \ No newline at end of file + \ No newline at end of file diff --git a/demoscannerapp/src/main/res/layout/activity_welcome.xml b/demoscannerapp/src/main/res/layout/activity_welcome.xml index fb8e179a..98188417 100644 --- a/demoscannerapp/src/main/res/layout/activity_welcome.xml +++ b/demoscannerapp/src/main/res/layout/activity_welcome.xml @@ -1,5 +1,5 @@ - - + diff --git a/enioka_scan/build.gradle b/enioka_scan/build.gradle index bba3814e..aa0c931c 100644 --- 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 index 555ab0fa..c3c529d7 100644 --- 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 index 342a4a8b..fb2676c2 100644 --- 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 index 0709f7a8..170e4045 100644 --- 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 index 711d30c5..f5ccc90c 100644 --- 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 index 557df7a6..e64e8b8c 100644 --- 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 index f1052796..874f8bed 100644 --- 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 index 815d635b..21b0007c 100644 --- 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 index f51a278c..ba8e6720 100644 --- 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 index c3d8e13d..892c60ce 100644 --- 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 index ca51d95e..826e545e 100644 --- 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 index 98162541..8db7965d 100644 --- 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 index 04ab86ba..8466eb7e 100644 --- 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 index 18326a59..80665812 100644 --- 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 index c5cf1caf..34e9dba3 100644 --- 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 index 89dca3e4..708e9f19 100644 --- 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 index 6efc8f41..aaf31568 100644 --- 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 index b8f09aee..633b5476 100644 --- 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 index d11e219a..bca55940 100644 --- 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 index d36f2173..4f50ab44 100644 --- a/enioka_scan/src/main/res/layout/activity_main.xml +++ b/enioka_scan/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/enioka_scan/src/main/res/layout/activity_main_alt.xml b/enioka_scan/src/main/res/layout/activity_main_alt.xml index 9aedc029..a2d6cc14 100644 --- 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 @@ - - + diff --git a/enioka_scan_athesi_rd50te/build.gradle b/enioka_scan_athesi_rd50te/build.gradle index f0332759..28098043 100644 --- 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/enioka_scan_athesi_rd50te/src/main/java/com/enioka/scanner/sdk/athesi/RD50TE/AthesiRD50TEScanner.java b/enioka_scan_athesi_rd50te/src/main/java/com/enioka/scanner/sdk/athesi/RD50TE/AthesiRD50TEScanner.java index 99a132f3..2b0a5a65 100644 --- a/enioka_scan_athesi_rd50te/src/main/java/com/enioka/scanner/sdk/athesi/RD50TE/AthesiRD50TEScanner.java +++ b/enioka_scan_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 index 266ef846..3f860bec 100644 --- 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/enioka_scan_athesi_spa43lte/src/main/java/com/enioka/scanner/sdk/athesi/SPA43LTE/AthesiSPA43LTEScanner.java b/enioka_scan_athesi_spa43lte/src/main/java/com/enioka/scanner/sdk/athesi/SPA43LTE/AthesiSPA43LTEScanner.java index f0208361..6a990a17 100644 --- a/enioka_scan_athesi_spa43lte/src/main/java/com/enioka/scanner/sdk/athesi/SPA43LTE/AthesiSPA43LTEScanner.java +++ b/enioka_scan_athesi_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 index edab90e4..bd877f66 100644 --- 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 index 720b9f50..09eccc84 100644 --- 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; diff --git a/enioka_scan_generalscan/build.gradle b/enioka_scan_generalscan/build.gradle index 4069b29d..a339fa37 100644 --- a/enioka_scan_generalscan/build.gradle +++ b/enioka_scan_generalscan/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.android.library' description 'Scanner provider for GeneralScan devices.' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_generalscan/src/main/java/com/enioka/scanner/sdk/generalscan/GsSppScanner.java b/enioka_scan_generalscan/src/main/java/com/enioka/scanner/sdk/generalscan/GsSppScanner.java index 42069876..33fed137 100644 --- a/enioka_scan_generalscan/src/main/java/com/enioka/scanner/sdk/generalscan/GsSppScanner.java +++ b/enioka_scan_generalscan/src/main/java/com/enioka/scanner/sdk/generalscan/GsSppScanner.java @@ -1,7 +1,7 @@ package com.enioka.scanner.sdk.generalscan; import android.content.Context; -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_honeywell/build.gradle b/enioka_scan_honeywell/build.gradle index febc75ff..0d5130d5 100644 --- a/enioka_scan_honeywell/build.gradle +++ b/enioka_scan_honeywell/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'scanner.published-library' description 'Scanner provider for Honeywell devices using the official AIDC driver (not provided)' android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_honeywelloss_integrated/build.gradle b/enioka_scan_honeywelloss_integrated/build.gradle index af4f42c2..7523720d 100644 --- a/enioka_scan_honeywelloss_integrated/build.gradle +++ b/enioka_scan_honeywelloss_integrated/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.android.library' description 'Scanner provider for Honeywell integrated scanner devices' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/HoneywellOssIntegratedScanner.java b/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/HoneywellOssIntegratedScanner.java index 98d88dba..84c3af95 100644 --- a/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/HoneywellOssIntegratedScanner.java +++ b/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/HoneywellOssIntegratedScanner.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.enioka.scanner.api.Scanner; diff --git a/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/SymbologyId.java b/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/SymbologyId.java index bfd054cf..97f935b4 100644 --- a/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/SymbologyId.java +++ b/enioka_scan_honeywelloss_integrated/src/main/java/com/enioka/scanner/sdk/honeywelloss/integrated/SymbologyId.java @@ -1,6 +1,6 @@ package com.enioka.scanner.sdk.honeywelloss.integrated; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.enioka.scanner.data.BarcodeType; diff --git a/enioka_scan_honeywelloss_spp/build.gradle b/enioka_scan_honeywelloss_spp/build.gradle index b27d459d..490e2f7f 100644 --- a/enioka_scan_honeywelloss_spp/build.gradle +++ b/enioka_scan_honeywelloss_spp/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.android.library' description 'Scanner provider for Honeywell bluetooth devices' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/HoneywellOssSppScanner.java b/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/HoneywellOssSppScanner.java index f1e6dd45..57f87076 100644 --- a/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/HoneywellOssSppScanner.java +++ b/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/HoneywellOssSppScanner.java @@ -2,7 +2,7 @@ import android.content.Context; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.enioka.scanner.api.Scanner; import com.enioka.scanner.api.ScannerLedColor; diff --git a/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/SymbologyId.java b/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/SymbologyId.java index 870efb36..3cd6871c 100644 --- a/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/SymbologyId.java +++ b/enioka_scan_honeywelloss_spp/src/main/java/com/enioka/scanner/sdk/honeywelloss/spp/SymbologyId.java @@ -1,6 +1,6 @@ package com.enioka.scanner.sdk.honeywelloss.spp; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.enioka.scanner.data.BarcodeType; diff --git a/enioka_scan_koamtac/build.gradle b/enioka_scan_koamtac/build.gradle index 2086ffa5..b7675bfd 100644 --- a/enioka_scan_koamtac/build.gradle +++ b/enioka_scan_koamtac/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'scanner.published-library' description 'Scanner provider for Koamtac devices using the official KDC driver (not provided)' android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_m3/build.gradle b/enioka_scan_m3/build.gradle index e7a9fe35..da627da5 100644 --- a/enioka_scan_m3/build.gradle +++ b/enioka_scan_m3/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'scanner.published-library' description 'Scanner provider for M3 bluetooth ring devices using the official drivers (not provided)' android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_mock/build.gradle b/enioka_scan_mock/build.gradle index deaccea8..eabe034e 100644 --- a/enioka_scan_mock/build.gradle +++ b/enioka_scan_mock/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_mock/src/androidTest/java/com/enioka/scanner/sdk/mock/MockAndroidTest.java b/enioka_scan_mock/src/androidTest/java/com/enioka/scanner/sdk/mock/MockAndroidTest.java index bb3d4a8b..78293e9a 100644 --- a/enioka_scan_mock/src/androidTest/java/com/enioka/scanner/sdk/mock/MockAndroidTest.java +++ b/enioka_scan_mock/src/androidTest/java/com/enioka/scanner/sdk/mock/MockAndroidTest.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.LaserScanner; diff --git a/enioka_scan_mock/src/main/java/com/enioka/scanner/sdk/mock/MockScanner.java b/enioka_scan_mock/src/main/java/com/enioka/scanner/sdk/mock/MockScanner.java index ade28e16..92c2bbfd 100644 --- a/enioka_scan_mock/src/main/java/com/enioka/scanner/sdk/mock/MockScanner.java +++ b/enioka_scan_mock/src/main/java/com/enioka/scanner/sdk/mock/MockScanner.java @@ -1,7 +1,7 @@ package com.enioka.scanner.sdk.mock; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.enioka.scanner.api.ScannerLedColor; diff --git a/enioka_scan_postech/build.gradle b/enioka_scan_postech/build.gradle index 3d239b1d..ebcdf5e4 100644 --- a/enioka_scan_postech/build.gradle +++ b/enioka_scan_postech/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'scanner.published-library' description 'Scanner provider for Honeywell integrated scanner devices' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_postech/src/main/java/com/enioka/scanner/sdk/postech/PostechSppScanner.java b/enioka_scan_postech/src/main/java/com/enioka/scanner/sdk/postech/PostechSppScanner.java index fd2dd738..dacadfb9 100644 --- a/enioka_scan_postech/src/main/java/com/enioka/scanner/sdk/postech/PostechSppScanner.java +++ b/enioka_scan_postech/src/main/java/com/enioka/scanner/sdk/postech/PostechSppScanner.java @@ -1,7 +1,7 @@ package com.enioka.scanner.sdk.postech; import android.content.Context; -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_proglove/build.gradle b/enioka_scan_proglove/build.gradle index 07303d94..f7f0156f 100644 --- a/enioka_scan_proglove/build.gradle +++ b/enioka_scan_proglove/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'com.android.library' description 'Scanner provider for Proglove BT low energy devices' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_proglove/src/main/java/com/enioka/scanner/sdk/proglove/ProgloveScanner.java b/enioka_scan_proglove/src/main/java/com/enioka/scanner/sdk/proglove/ProgloveScanner.java index 56344bf3..ab2299a8 100644 --- a/enioka_scan_proglove/src/main/java/com/enioka/scanner/sdk/proglove/ProgloveScanner.java +++ b/enioka_scan_proglove/src/main/java/com/enioka/scanner/sdk/proglove/ProgloveScanner.java @@ -5,7 +5,7 @@ import android.content.Intent; import android.os.Bundle; import android.os.Handler; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.enioka.scanner.api.Scanner; diff --git a/enioka_scan_zebra/build.gradle b/enioka_scan_zebra/build.gradle index 42f15b6b..e6a58aa6 100644 --- a/enioka_scan_zebra/build.gradle +++ b/enioka_scan_zebra/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'scanner.published-library' description 'Scanner provider for Zebra devices using the official Zebra/Symbol drivers (not provided)' android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_zebra_dw/build.gradle b/enioka_scan_zebra_dw/build.gradle index d41d5430..2502c596 100644 --- a/enioka_scan_zebra_dw/build.gradle +++ b/enioka_scan_zebra_dw/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'scanner.published-library' description 'Scanner provider for Zebra devices using the Zebra DataWedge service' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwCommand.java b/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwCommand.java index 1f1ba606..cf385647 100644 --- a/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwCommand.java +++ b/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwCommand.java @@ -2,7 +2,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.util.HashSet; diff --git a/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwConfig.java b/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwConfig.java index fe79385f..5f62dce7 100644 --- a/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwConfig.java +++ b/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwConfig.java @@ -1,6 +1,6 @@ package com.enioka.scanner.sdk.zebra.dw; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.ArrayList; import java.util.Collections; diff --git a/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwScanner.java b/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwScanner.java index ccdde1fd..edad46bb 100644 --- a/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwScanner.java +++ b/enioka_scan_zebra_dw/src/main/java/com/enioka/scanner/sdk/zebra/dw/ZebraDwScanner.java @@ -3,7 +3,7 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.Log; import com.enioka.scanner.api.Scanner; diff --git a/enioka_scan_zebraoss/build.gradle b/enioka_scan_zebraoss/build.gradle index f2138217..b48ddd38 100644 --- a/enioka_scan_zebraoss/build.gradle +++ b/enioka_scan_zebraoss/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'scanner.published-library' description 'Scanner provider for Zebra BT low-energy / classic devices' android { - compileSdkVersion 33 + compileSdk 34 defaultConfig { minSdkVersion 19 targetSdkVersion 28 diff --git a/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ZebraOssScanner.java b/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ZebraOssScanner.java index e1dbea81..e58d17ad 100644 --- a/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ZebraOssScanner.java +++ b/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ZebraOssScanner.java @@ -1,7 +1,7 @@ package com.enioka.scanner.sdk.zebraoss; 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_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/parsers/ParamSendParser.java b/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/parsers/ParamSendParser.java index d4ace927..344ec835 100644 --- a/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/parsers/ParamSendParser.java +++ b/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/parsers/ParamSendParser.java @@ -1,6 +1,6 @@ package com.enioka.scanner.sdk.zebraoss.parsers; -import android.support.v4.util.Pair; +import androidx.core.util.Pair; import android.util.Log; import com.enioka.scanner.sdk.zebraoss.data.ParamSend; diff --git a/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ssi/SsiSource.java b/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ssi/SsiSource.java index 94d4e37d..3d436c18 100644 --- a/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ssi/SsiSource.java +++ b/enioka_scan_zebraoss/src/main/java/com/enioka/scanner/sdk/zebraoss/ssi/SsiSource.java @@ -1,6 +1,6 @@ package com.enioka.scanner.sdk.zebraoss.ssi; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; /** * Originator of a message, used both for SsiPackets (source-byte) or config (expected source-byte). diff --git a/gradle.properties b/gradle.properties index f233eea8..dc9fc5b4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,3 +12,7 @@ # org.gradle.parallel=true #Wed Sep 13 11:22:30 CEST 2023 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" + +# Enable AndroidX +android.useAndroidX=true +android.enableJetifier=true diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 37afef8b..ee161f55 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Sep 26 09:23:23 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists