From 654a9e0161ce5088a40d754df4d1609ff74198f4 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 31 Aug 2022 10:58:14 +0200 Subject: [PATCH 1/4] Libraries updates --- app/build.gradle | 14 +++++++------- build.gradle | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1ab9fb5c..bdcfea2a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -103,13 +103,13 @@ dependencies { implementation 'com.google.firebase:firebase-core' implementation 'com.google.firebase:firebase-crashlytics' implementation 'com.google.firebase:firebase-perf' - implementation 'com.google.android.gms:play-services-basement:18.0.0' + implementation 'com.google.android.gms:play-services-basement:18.1.0' implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.5.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.3' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.recyclerview:recyclerview:1.2.1' implementation 'androidx.preference:preference-ktx:1.2.0' @@ -118,13 +118,13 @@ dependencies { implementation 'com.squareup.retrofit2:retrofit:2.9.0' implementation 'com.squareup.retrofit2:converter-gson:2.9.0' implementation 'com.annimon:stream:1.2.2' - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' + implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' - implementation 'androidx.lifecycle:lifecycle-common-java8:2.4.1' + implementation 'androidx.lifecycle:lifecycle-common-java8:2.5.1' implementation 'org.apache.commons:commons-text:1.9' //MVVM - def dagger2_version = '2.40' + def dagger2_version = '2.40.1' api "com.google.dagger:dagger:$dagger2_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version" api "com.google.dagger:dagger-android:$dagger2_version" @@ -143,7 +143,7 @@ dependencies { implementation 'com.github.pedromassango:doubleClick:3.0' //SQLite ROOM - def room_version = "2.4.1" + def room_version = "2.4.3" implementation "androidx.room:room-runtime:$room_version" annotationProcessor "androidx.room:room-compiler:$room_version" diff --git a/build.gradle b/build.gradle index 79f859b9..b82a1801 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.6.10' + kotlin_version = '1.7.10' } repositories { @@ -10,14 +10,14 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.3.10' + classpath 'com.google.gms:google-services:4.3.13' classpath 'com.google.firebase:perf-plugin:1.4.1' // Add the Firebase Crashlytics Gradle plugin. - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' + classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files From ee8abe3ea83ff6a642674bb8e05c1d83a9992da6 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 31 Aug 2022 11:28:02 +0200 Subject: [PATCH 2/4] Libraries updates pt2 --- barcode_base_android_library/build.gradle | 6 +++--- dynamic__base/build.gradle | 2 +- honeywellscannerlibrary/build.gradle | 6 +++--- keyobardemulatorscannerlibrary/build.gradle | 6 +++--- pointmobilescannerlibrary/build.gradle | 6 +++--- zebrascannerlibrary/build.gradle | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle index b13e7245..095006a5 100644 --- a/barcode_base_android_library/build.gradle +++ b/barcode_base_android_library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -34,7 +34,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/dynamic__base/build.gradle b/dynamic__base/build.gradle index ae988304..f3cc22f0 100644 --- a/dynamic__base/build.gradle +++ b/dynamic__base/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { minSdkVersion 21 diff --git a/honeywellscannerlibrary/build.gradle b/honeywellscannerlibrary/build.gradle index 43494729..9280e0b0 100644 --- a/honeywellscannerlibrary/build.gradle +++ b/honeywellscannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -34,7 +34,7 @@ dependencies { implementation project(":honeywellsdk") implementation 'androidx.appcompat:appcompat:1.4.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/keyobardemulatorscannerlibrary/build.gradle b/keyobardemulatorscannerlibrary/build.gradle index 2b890c40..5fd8f6ff 100644 --- a/keyobardemulatorscannerlibrary/build.gradle +++ b/keyobardemulatorscannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles 'consumer-rules.pro' @@ -33,7 +33,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.2' + androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/pointmobilescannerlibrary/build.gradle b/pointmobilescannerlibrary/build.gradle index bc2847d7..bdf939ee 100644 --- a/pointmobilescannerlibrary/build.gradle +++ b/pointmobilescannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -31,7 +31,7 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.appcompat:appcompat:1.4.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) diff --git a/zebrascannerlibrary/build.gradle b/zebrascannerlibrary/build.gradle index 961758a6..11978fdd 100644 --- a/zebrascannerlibrary/build.gradle +++ b/zebrascannerlibrary/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 31 + compileSdkVersion 32 defaultConfig { minSdkVersion 21 - targetSdkVersion 31 + targetSdkVersion 32 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -33,7 +33,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test:runner:1.3.0' + androidTestImplementation 'androidx.test:runner:1.4.0' androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', { exclude group: 'com.android.support', module: 'support-annotations' }) From 9a6211fc46d33cea9dbd42c70fbd9959475c9770 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 31 Aug 2022 13:07:35 +0200 Subject: [PATCH 3/4] Fix su partita mag nulla in spedizione --- .../integrywmsnative/gest/spedizione/SpedizioneViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java index a22c73c0..f6f815d0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java @@ -834,7 +834,7 @@ public class SpedizioneViewModel { tmp.addAll( Stream.of(availableBatchLots) .filter(x -> UtilityString.isNullOrEmpty(x.getDataScadS())) - .sortBy(MtbPartitaMag::getPartitaMag) + .sortBy(x -> UtilityString.isNull(x.getPartitaMag(), "")) .toList()); } From 821099c03748e47a9f1fe8ba8399b4dc65168e58 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 31 Aug 2022 13:08:26 +0200 Subject: [PATCH 4/4] -> v1.29.2 (306) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index bdcfea2a..006a15e0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 305 - def appVersionName = '1.29.1' + def appVersionCode = 306 + def appVersionName = '1.29.2' signingConfigs { release {