Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/GestioneDocumentiLavorazione

Browse Source 
# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailPickedQuantityDTO.java
#	app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_lu_prod/adapter/DialogInputLUProdTipoColloAdapter.java
#	build.gradle
This commit is contained in:
Giuseppe Scorrano
2025-01-20 18:19:28 +01:00
parent fbe9244000 9dc0935cc1
commit 09cebb1c7e
56 changed files with 1470 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zebrascannerlibrary/build.gradle
View File

@@ -1,13 +1,13 @@
apply plugin: 'com.android.library'
android {
compileSdk 34
compileSdk 35
defaultConfig {
minSdkVersion 21
targetSdk 34
targetSdk 35
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
@@ -28,6 +28,11 @@ android {
}
configurations {
all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'
all*.exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk8'
}
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])