Dependencies update (#170)

eu-digital-green-certificates · Jul 29, 2021 · 6f40d1a · 6f40d1a
1 parent 1ed1a7f
commit 6f40d1a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -103,14 +103,14 @@ dependencies {
     implementation Deps.androidx_constraint
     implementation Deps.androidx_navigation_fragment
     implementation Deps.androidx_navigation_ui
+    implementation Deps.androidx_lifecycle_livedata_ktx
     implementation Deps.room_runtime
     implementation Deps.room_ktx
     implementation Deps.androidx_worker_ktx
     implementation Deps.kotlinx_coroutines
     implementation(Deps.zxing) { transitive = false }
     implementation Deps.zxing_core
     implementation Deps.guava_conflict_resolver
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-alpha02"
 
     implementation Deps.hilt
     kapt Deps.hilt_compiler
@@ -131,5 +131,5 @@ dependencies {
     testImplementation Deps.test_junit
 //    testImplementation Deps.mockito_core
 //    testImplementation Deps.mockito_kotlin
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+    coreLibraryDesugaring Deps.android_tools_desugar_jdk_libs
 }
diff --git a/buildSrc/src/main/java/AppConfig.kt b/buildSrc/src/main/java/AppConfig.kt
@@ -28,8 +28,8 @@ object Config {
     const val targetSdk = 29
     val javaVersion = JavaVersion.VERSION_1_8
 
-    const val versionCode = 17
-    const val versionName = "1.1.9"
+    const val versionCode = 18
+    const val versionName = "1.1.10"
 
     const val androidTestInstrumentation = "androidx.test.runner.AndroidJUnitRunner"
     const val proguardConsumerRules = "consumer-rules.pro"

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -36,14 +36,16 @@ object Deps {
     const val androidx_navigation_ui = "androidx.navigation:navigation-ui-ktx:${Versions.androidx_navigation}"
     const val androidx_navigation = "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_navigation}"
     const val androidx_hilt_compiler = "androidx.hilt:hilt-compiler:${Versions.androidx_hilt_compiler}"
+    const val androidx_lifecycle_livedata_ktx = "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.androidx_lifecycle_livedata_ktx}"
     const val room_runtime = "androidx.room:room-runtime:${Versions.androidx_room}"
     const val room_compiler = "androidx.room:room-compiler:${Versions.androidx_room}"
     const val room_ktx = "androidx.room:room-ktx:${Versions.room_ktx}"
     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 log_interceptor = "com.squareup.okhttp3:logging-interceptor:${Versions.logging_interceptor}"
     const val gson_converter = "com.squareup.retrofit2:converter-jackson:${Versions.gson_converter}"
-    const val lifecycle_livedata_version = "androidx.lifecycle:lifecycle-livedata-ktx:${Versions.lifecycle_livedata_version}"
+
+    const val android_tools_desugar_jdk_libs = "com.android.tools:desugar_jdk_libs:${Versions.android_tools_desugar_jdk_libs_version}"
 
     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}"
@@ -59,7 +61,6 @@ object Deps {
     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 jackson_kotlin = "com.fasterxml.jackson.module:jackson-module-kotlin:${Versions.jackson_kotlin}"

diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -38,6 +38,7 @@ object Versions {
     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 hilt_version = "2.33-beta"
@@ -46,8 +47,9 @@ object Versions {
     const val logging_interceptor = "4.0.1"
     const val gson_converter = "2.1.0"
     const val timber = "4.7.1"
+
     const val google_licenses = "17.0.0"
-    const val lifecycle_livedata_version = "2.4.0-alpha02"
+    const val android_tools_desugar_jdk_libs_version = "1.1.5"
 
     // QR
     const val zxing = "4.2.0"
@@ -65,7 +67,6 @@ object Versions {
 
     // Validation
     const val json_validation = "2.2.14"
-    const val json_validation_rhino = "1.0"
 
     // Tests
     const val junit = "4.13.1"