Merge pull request #236 from ministero-salute/refactor/update-depende…

…ncies

chore: update dependencies

.github/workflows/ci-release.yml

@@ -25,7 +25,7 @@ jobs:
         path: dgca-verifier-app-android
     - uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
         distribution: adopt
     - uses: android-actions/setup-android@v2
     - uses: actions/cache@v2

.github/workflows/ci.yml

@@ -29,7 +29,7 @@ jobs:
         path: dgca-verifier-app-android
     - uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 11
         distribution: adopt
     - uses: android-actions/setup-android@v2
     - uses: actions/cache@v2

app/build.gradle

@@ -100,7 +100,7 @@ android {
     buildTypes {
         debug {
             minifyEnabled false
-            debuggable false
+            debuggable true
         }
 
         release {
@@ -156,13 +156,11 @@ dependencies {
     implementation Deps.androidx_room_runtime
     implementation Deps.androidx_worker_ktx
     implementation Deps.kotlinx_coroutines
+
     implementation Deps.zxing
     implementation Deps.guava_conflict_resolver
 
     implementation Deps.hilt
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     kapt Deps.hilt_compiler
     implementation Deps.hilt_viewmodel
     implementation Deps.hilt_work
@@ -174,7 +172,6 @@ dependencies {
     implementation Deps.gson_converter
 
     testImplementation Deps.test_junit
-    testImplementation "io.mockk:mockk:1.11.0"
-    testImplementation 'androidx.arch.core:core-testing:2.1.0'
-    testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.0'
+    testImplementation Deps.test_coroutines
 }
+

app/src/main/AndroidManifest.xml

@@ -39,6 +39,7 @@
         <activity
             android:name=".ui.SplashScreenActivity"
             android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -61,10 +62,15 @@
             android:screenOrientation="portrait" />
 
         <provider
-            android:name="androidx.work.impl.WorkManagerInitializer"
-            android:authorities="${applicationId}.workmanager-init"
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
             android:exported="false"
-            tools:node="remove" />
+            tools:node="merge">
+            <meta-data
+                android:name="androidx.work.WorkManagerInitializer"
+                android:value="androidx.startup"
+                tools:node="remove" />
+        </provider>
     </application>
 
 </manifest>

build.gradle

@@ -28,6 +28,11 @@ allprojects {
         google()
         jcenter()
     }
+    project.configurations.all {
+        resolutionStrategy {
+            force Deps.androidx_worker_ktx
+        }
+    }
 }
 
 task clean(type: Delete) {

buildSrc/src/main/java/AppConfig.kt

@@ -24,8 +24,8 @@ import org.gradle.api.JavaVersion
 
 object Config {
     const val minSdk = 24
-    const val compileSdk = 30
-    const val targetSdk = 30
+    const val compileSdk = 31
+    const val targetSdk = 31
     val javaVersion = JavaVersion.VERSION_1_8
 
     const val versionCode = 13

buildSrc/src/main/java/Dependencies.kt

@@ -22,13 +22,30 @@
 
 object Deps {
 
+    //Decoder Deps
+    const val bouncy_castle = "org.bouncycastle:bcpkix-jdk15to18:${Versions.bouncy_castle}"
+    const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
+    const val kotlin_reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin_reflect}"
+    const val java_cose = "com.augustcellars.cose:cose-java:${Versions.java_cose}"
+    const val json_validation = "com.github.java-json-tools:json-schema-validator:${Versions.json_validation}"
+    const val json_validation_rhino = "io.apisense:rhino-android:${Versions.json_validation_rhino}"
+    const val jackson_cbor = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${Versions.jackson_cbor}"
+    const val test_junit_jupiter_api = "org.junit.jupiter:junit-jupiter-api:${Versions.junit_jupiter}"
+    const val test_junit_jupiter_params = "org.junit.jupiter:junit-jupiter-params:${Versions.junit_jupiter}"
+    const val test_runtime_only = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit_jupiter}"
+    const val test_hamcrest = "org.hamcrest:hamcrest:${Versions.hamcrest}"
+
+    //Others
     const val tools_gradle_android = "com.android.tools.build:gradle:${Versions.gradle}"
     const val tools_kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}"
     const val desugar_jdk_libs = "com.android.tools:desugar_jdk_libs:${Versions.desugar_jdk_libs}"
+    const val test_junit = "junit:junit:${Versions.junit}"
+    const val test_mockk = "io.mockk:mockk:${Versions.mockk}"
+
 
-    const val kotlin_stdlib = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
     const val kotlinx_coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.kotlinx_coroutines}"
     const val androidx_core = "androidx.core:core-ktx:${Versions.androidx_core}"
+    const val androidx_startup = "androidx.startup:startup-runtime:${Versions.androidx_startup}"
     const val androidx_appcompat = "androidx.appcompat:appcompat:${Versions.androidx_appcompat}"
     const val androidx_material = "com.google.android.material:material:${Versions.androidx_material}"
     const val androidx_constraint = "androidx.constraintlayout:constraintlayout:${Versions.androidx_constraint}"
@@ -38,11 +55,17 @@ object Deps {
     const val androidx_hilt_compiler = "androidx.hilt:hilt-compiler:${Versions.androidx_hilt_compiler}"
     const val androidx_room_runtime = "androidx.room:room-runtime:${Versions.androidx_room}"
     const val androidx_room_compiler = "androidx.room:room-compiler:${Versions.androidx_room}"
+    const val androidx_core_testing = "androidx.arch.core:core-testing:${Versions.androidx_core_testing}"
+    const val test_coroutines = "org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.test_coroutines}"
     const val androidx_worker_ktx = "androidx.work:work-runtime-ktx:${Versions.androidx_worker_ktx}"
     const val retrofit2 = "com.squareup.retrofit2:retrofit:${Versions.retrofit}"
+
+    const val okhttp = "com.squareup.okhttp3:okhttp:${Versions.okhttp}"
     const val log_interceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.logging_interceptor}"
     const val gson_converter = "com.squareup.retrofit2:converter-gson:${Versions.gson_converter}"
 
+    const val dokka_plugin = "org.jetbrains.dokka:kotlin-as-java-plugin:${Versions.dokka}"
+
     const val hilt_plugin = "com.google.dagger:hilt-android-gradle-plugin:${Versions.hilt_version}"
     const val hilt = "com.google.dagger:hilt-android:${Versions.hilt_version}"
     const val hilt_compiler = "com.google.dagger:hilt-android-compiler:${Versions.hilt_version}"
@@ -51,16 +74,5 @@ object Deps {
 
     const val zxing = "com.journeyapps:zxing-android-embedded:${Versions.zxing}"
     const val guava_conflict_resolver = "com.google.guava:listenablefuture:${Versions.guave_conflict_resolver_version}"
-    const val kotlin_reflect = "org.jetbrains.kotlin:kotlin-reflect:${Versions.kotlin_reflect}"
-    const val java_cose = "com.augustcellars.cose:cose-java:${Versions.java_cose}"
-    const val json_validation = "com.github.java-json-tools:json-schema-validator:${Versions.json_validation}"
-    const val json_validation_rhino = "io.apisense:rhino-android:${Versions.json_validation_rhino}"
-    const val jackson_cbor = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${Versions.jackson_cbor}"
-    const val bouncy_castle = "org.bouncycastle:bcpkix-jdk15to18:${Versions.bouncy_castle}"
 
-    const val test_junit = "junit:junit:${Versions.junit}"
-    const val test_junit_jupiter_api = "org.junit.jupiter:junit-jupiter-api:${Versions.junit_jupiter}"
-    const val test_junit_jupiter_params = "org.junit.jupiter:junit-jupiter-params:${Versions.junit_jupiter}"
-    const val test_runtime_only = "org.junit.jupiter:junit-jupiter-engine:${Versions.junit_jupiter}"
-    const val test_hamcrest = "org.hamcrest:hamcrest:${Versions.hamcrest}"
 }

buildSrc/src/main/java/Versions.kt

@@ -22,27 +22,36 @@
 
 object Versions {
 
+
     // Base
     const val gradle = "4.1.3"
     const val kotlin = "1.4.32"
     const val desugar_jdk_libs = "1.1.5"
+    const val mockk = "1.11.0"
 
-    const val androidx_core = "1.4.0-alpha01"
-    const val androidx_appcompat = "1.2.0"
+    const val androidx_core = "1.7.0"
+    const val androidx_startup = "1.1.0"
+    const val androidx_appcompat = "1.4.0"
     const val androidx_navigation = "2.3.5"
     const val androidx_material = "1.3.0"
-    const val androidx_constraint = "2.0.4"
+    const val androidx_constraint = "2.1.2"
+    const val logging_interceptor = "4.9.3"
+    const val okhttp = "4.9.3"
     const val kotlinx_coroutines = "1.3.9"
+    const val retrofit = "2.9.0"
+    const val androidx_room = "2.4.0"
+    const val androidx_core_testing = "2.1.0"
+    const val test_coroutines = "1.5.0"
+    const val gson_converter = "2.9.0"
+
+    const val dokka = "1.5.0"
+
     private const val work_hilt = "1.0.0-beta01"
     const val androidx_hilt_viewmodel = "1.0.0-alpha02"
     const val androidx_hilt_work = work_hilt
     const val androidx_hilt_compiler = work_hilt
-    const val androidx_room = "2.3.0"
-    const val androidx_worker_ktx = "2.5.0"
+    const val androidx_worker_ktx = "2.7.1"
     const val hilt_version = "2.33-beta"
-    const val retrofit = "2.9.0"
-    const val logging_interceptor = "4.0.1"
-    const val gson_converter = "2.6.0"
 
     // QR
     const val zxing = "4.2.0"
@@ -53,12 +62,8 @@ object Versions {
     const val jackson_cbor = "2.12.3"
     const val java_cose = "1.1.0"
     const val bouncy_castle = "1.68"
-
-    // Validation
     const val json_validation = "2.2.14"
     const val json_validation_rhino = "1.0"
-
-    // Tests
     const val junit = "4.13.1"
     const val junit_jupiter = "5.7.1"
     const val hamcrest = "2.2"