Dependencies upgrade (#325)

* - upgrade dependencies; * - java version update in CI config; * - ci update; * - type fix;
eu-digital-green-certificates · Nov 21, 2022 · 1e88269 · 1e88269
1 parent 074cff8
commit 1e88269
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 21 deletions.
diff --git a/.github/workflows/ci-release.yml b/.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
@@ -37,7 +37,7 @@ jobs:
     - name: build
       working-directory: ./dgca-verifier-app-android
       run: |-
-        ./gradlew --no-daemon build -PCONFIG_FILE_NAME="verifier-context.jsonc"
+        ./gradlew --no-daemon build
     - name: sign-tst
       working-directory: ./dgca-verifier-app-android
       run: |-

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,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
@@ -39,4 +39,4 @@ jobs:
     - name: build
       working-directory: ./dgca-verifier-app-android
       run: |-
-        ./gradlew --no-daemon build -PCONFIG_FILE_NAME="verifier-context.jsonc"
+        ./gradlew --no-daemon build
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -42,8 +42,8 @@
         </activity>
 
         <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" />
 

diff --git a/...in/java/dgca/verifier/app/android/dcc/ui/verification/VerificationResultDialogFragment.kt b/...in/java/dgca/verifier/app/android/dcc/ui/verification/VerificationResultDialogFragment.kt
@@ -268,11 +268,11 @@ class VerificationResultDialogFragment : BaseVerificationDialogFragment<DialogFr
 
     private fun toggleButton(certificate: CertificateModel) {
         binding.certificateTypeText.text = when {
-            certificate.vaccinations?.isNotEmpty() == true -> getString(
-                R.string.type_vaccination,
-                certificate.vaccinations.first().doseNumber,
-                certificate.vaccinations.first().totalSeriesOfDoses
-            )
+            certificate.vaccinations?.isNotEmpty() == true -> {
+                val doseNumber: Int = certificate.vaccinations.first().doseNumber
+                val totalSeriesOfDoses: Int = certificate.vaccinations.first().totalSeriesOfDoses
+                getString(R.string.type_vaccination, doseNumber, totalSeriesOfDoses)
+            }
             certificate.recoveryStatements?.isNotEmpty() == true -> getString(R.string.type_recovered)
             certificate.tests?.isNotEmpty() == true -> getString(R.string.type_test)
             else -> getString(R.string.type_test)

diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt
@@ -24,7 +24,7 @@ import org.gradle.api.JavaVersion
 
 object Config {
     const val minSdk = 26
-    const val compileSdk = 30
+    const val compileSdk = 31
     const val targetSdk = 30
     val javaVersion = JavaVersion.VERSION_1_8
 

diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -24,7 +24,7 @@ object Versions {
 
     // Base
     const val gradle = "4.1.3"
-    const val kotlin = "1.5.31"
+    const val kotlin = "1.6.21"
     const val androidx_navigation = "2.3.5"
 
     const val androidx_core = "1.6.0"
@@ -34,40 +34,40 @@ object Versions {
 
     const val hilt_version = "2.38.1"
     const val hilt_compiler_version = "2.38.1"
-    const val desugar_jdk_libs = "1.1.5"
+    const val desugar_jdk_libs = "2.0.0"
 
     const val androidx_fragment_ktx = "1.3.6"
-    const val kotlinx_coroutines = "1.5.2"
-    const val kotlinx_coroutines_core = "1.5.1"
+    const val kotlinx_coroutines = "1.6.0"
+    const val kotlinx_coroutines_core = "1.5.2"
     private const val work_hilt = "1.0.0"
     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_lifecycle_livedata_ktx = "2.4.0-alpha02"
     const val room_ktx = "2.4.0-alpha03"
-    const val androidx_worker_ktx = "2.5.0"
+    const val androidx_worker_ktx = "2.7.1"
     const val google_licenses_version = "0.10.4"
     const val retrofit = "2.9.0"
-    const val logging_interceptor = "4.9.1"
+    const val logging_interceptor = "4.10.0"
     const val gson_converter = "2.1.0"
     const val timber = "4.7.1"
     const val gson = "2.9.0"
 
     const val google_licenses = "17.0.0"
-    const val android_tools_desugar_jdk_libs_version = "1.1.5"
+    const val android_tools_desugar_jdk_libs_version = "2.0.0"
 
     // QR
     const val zxing = "4.2.0"
     const val zxing_core = "3.3.0"
     const val guave_conflict_resolver_version = "9999.0-empty-to-avoid-conflict-with-guava"
 
     // Decoder
-    const val kotlin_reflect = "1.4.32"
+    const val kotlin_reflect = "1.6.21"
     const val jackson_cbor = "2.12.3"
     const val java_cose = "1.1.0"
     const val bouncy_castle = "1.68"
-    const val jackson_kotlin = "2.12.0"
+    const val jackson_kotlin = "2.14.0"
     const val jackson_datetype = "jackson-datatype-jsr310"
     const val appache_commons = "2.9.0"
     const val appache_compress = "1.21"