diff --git a/app/build.gradle b/app/build.gradle index cf4fe82f..8e3ec7db 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ android { defaultConfig { applicationId "it.integry.integrywmsnative" minSdkVersion 21 - targetSdkVersion 36 + targetSdk 36 versionCode appVersionCode versionName appVersionName // testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -157,7 +157,7 @@ dependencies { implementation 'com.github.pedromassango:doubleClick:3.0' //SQLite ROOM - def room_version = "2.7.1" + def room_version = "2.7.2" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index a368f763..c4b62ead 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -158,7 +158,7 @@ public class LoginViewModel { public void loadDepo(Runnable onComplete) { this.mSystemRESTConsumer.getAvailableCodMdeps(availableCodMdeps -> { - SettingsManager.iDB().setAvailableCodMdep(availableCodMdeps); + SettingsManager.iDB().setAvailableDepos(availableCodMdeps); if (availableCodMdeps == null || availableCodMdeps.isEmpty()) { this.sendError(new InvalidUserDepositException()); diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle index 781b6894..58fde71a 100644 --- a/barcode_base_android_library/build.gradle +++ b/barcode_base_android_library/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdkVersion 21 @@ -38,5 +38,5 @@ configurations { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' } diff --git a/build.gradle b/build.gradle index e7045486..cb7ea5d2 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { kotlin_version = '2.1.0' - agp_version = '8.11.1' + agp_version = '8.12.2' } repositories { diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle index 6ea4550b..6a6bef88 100644 --- a/honeywellscannerlibrary/build.gradle +++ b/honeywellscannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdkVersion 21 - targetSdk 35 + targetSdk 36 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -41,6 +41,6 @@ dependencies { // implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) implementation project(":honeywellsdk") - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' implementation project(path: ':barcode_base_android_library') } diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle index 4e70c5eb..46ebdebc 100644 --- a/keyobardemulatorscannerlibrary/build.gradle +++ b/keyobardemulatorscannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdkVersion 21 - targetSdk 35 + targetSdk 36 // testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -40,6 +40,6 @@ configurations { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' implementation project(':barcode_base_android_library') } diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle index 70c01442..7aefd8c5 100644 --- a/pointmobilescannerlibrary/build.gradle +++ b/pointmobilescannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdkVersion 21 - targetSdk 35 + targetSdk 36 // testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -38,6 +38,6 @@ configurations { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' implementation project(':barcode_base_android_library') } diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle index 4b24cdd5..c73c61bc 100644 --- a/zebrascannerlibrary/build.gradle +++ b/zebrascannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdkVersion 21 - targetSdk 35 + targetSdk 36 // testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -40,7 +40,7 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' testImplementation 'junit:junit:4.13.2' implementation project(path: ':barcode_base_android_library') }