From d8f9886f820a5e923def850dfc6dcec4aa536554 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Mon, 1 Sep 2025 18:04:45 +0200 Subject: [PATCH] Aggiornamenti librerie --- app/build.gradle | 38 +++++++++---------- .../core/authentication/JwtUtils.java | 8 ++-- barcode_base_android_library/build.gradle | 6 +-- build.gradle | 2 +- honeywellscannerlibrary/build.gradle | 6 +-- keyobardemulatorscannerlibrary/build.gradle | 6 +-- pointmobilescannerlibrary/build.gradle | 6 +-- zebrascannerlibrary/build.gradle | 6 +-- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 665e2bc8..faff06ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -34,7 +34,7 @@ android { defaultConfig { applicationId "it.integry.integrywmsnative" minSdkVersion 21 - targetSdkVersion 35 + targetSdk 36 versionCode appVersionCode versionName appVersionName // testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -53,11 +53,11 @@ android { ext.enableCrashlytics = false // minifyEnabled true // Abilita la minimizzazione del codice // shrinkResources true // Rimuove risorse non utilizzate -// proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } release { -// minifyEnabled true // Abilita la minimizzazione del codice -// shrinkResources true // Rimuove risorse non utilizzate + minifyEnabled true // Abilita la minimizzazione del codice + shrinkResources true // Rimuove risorse non utilizzate proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } @@ -91,7 +91,7 @@ android { abortOnError false } namespace 'it.integry.integrywmsnative' - compileSdk 35 + compileSdk 36 } configurations { @@ -110,18 +110,18 @@ dependencies { implementation 'com.github.lupaulus:logger:2.3.2' // Import the Firebase BoM - implementation platform('com.google.firebase:firebase-bom:33.14.0') + implementation platform('com.google.firebase:firebase-bom:33.16.0') implementation 'com.google.firebase:firebase-analytics' implementation 'com.google.firebase:firebase-crashlytics' implementation 'com.google.firebase:firebase-perf' - implementation 'com.google.android.gms:play-services-basement:18.7.0' + implementation 'com.google.android.gms:play-services-basement:18.7.1' //JJWT - implementation 'io.jsonwebtoken:jjwt-api:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' - runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + implementation 'io.jsonwebtoken:jjwt-api:0.13.0' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.13.0' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.13.0' - implementation 'androidx.appcompat:appcompat:1.7.0' + implementation 'androidx.appcompat:appcompat:1.7.1' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation 'androidx.cardview:cardview:1.0.0' @@ -134,14 +134,14 @@ dependencies { } implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0" - implementation 'com.squareup.retrofit2:retrofit:2.11.0' - implementation 'com.squareup.retrofit2:converter-gson:2.11.0' + implementation 'com.squareup.retrofit2:retrofit:3.0.0' + implementation 'com.squareup.retrofit2:converter-gson:3.0.0' implementation 'com.annimon:stream:1.2.2' - implementation 'androidx.lifecycle:lifecycle-runtime:2.9.0' - implementation 'org.apache.commons:commons-text:1.9' + implementation 'androidx.lifecycle:lifecycle-runtime:2.9.3' + implementation 'org.apache.commons:commons-text:1.14.0' //MVVM - def dagger2_version = '2.55' + def dagger2_version = '2.57.1' implementation "com.google.dagger:dagger:$dagger2_version" annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version" implementation "com.google.dagger:dagger-android:$dagger2_version" @@ -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" @@ -183,8 +183,8 @@ dependencies { implementation 'com.github.harry1453:android-bluetooth-serial:v1.1.2' // RxJava is also required. - implementation 'io.reactivex.rxjava2:rxjava:2.1.12' - implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' + implementation 'io.reactivex.rxjava2:rxjava:2.2.21' + implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' //Barcode generator implementation 'com.journeyapps:zxing-android-embedded:4.3.0' diff --git a/app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java b/app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java index b381d61a..dd8cf9d6 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/authentication/JwtUtils.java @@ -11,11 +11,11 @@ public class JwtUtils { private final static String SIGNING_KEY = "gICy3bjD56i/YFnBZZKe5ibiz3Snsp08nybGGziCV4ZcvyXBbyqWUnJ2wTrRXhOuf/xdljPXX0yBaqdAgvKthQ=="; public static Claims parseJwt(String token) { - Jws jws = Jwts.parserBuilder() - .setSigningKey(Keys.hmacShaKeyFor(Decoders.BASE64.decode(SIGNING_KEY))) + Jws jws = Jwts.parser() + .verifyWith(Keys.hmacShaKeyFor(Decoders.BASE64.decode(SIGNING_KEY))) .build() - .parseClaimsJws(token); + .parseSignedClaims(token); - return jws.getBody(); + return jws.getPayload(); } } diff --git a/barcode_base_android_library/build.gradle b/barcode_base_android_library/build.gradle index a27f8dba..cbb0137a 100644 --- a/barcode_base_android_library/build.gradle +++ b/barcode_base_android_library/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdk 35 + compileSdk 36 defaultConfig { minSdkVersion 21 - targetSdk 35 + targetSdk 36 consumerProguardFiles 'consumer-rules.pro' } @@ -36,5 +36,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 b3153695..10f519d3 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" @@ -38,6 +38,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 27dd3f80..02d27c06 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' @@ -37,6 +37,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 46c9a71a..2e963325 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" } @@ -35,6 +35,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 40bb1543..66a890d6 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" } @@ -37,7 +37,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') }