From 02b84b257c9db0dff61df7058a62e077cd65961a Mon Sep 17 00:00:00 2001
From: Paul Konstantin Gerke <paulkgerke@craftware.info>
Date: Sun, 1 Sep 2024 23:16:18 +0200
Subject: [PATCH] Update all libraries, add babybuddy test version

---
 app/build.gradle                              | 20 +++++++++----------
 .../babybuddywidgets/MainActivity.kt          |  6 +++---
 tools/babybuddy-version-array/versions        |  1 +
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 335da68..92980ee 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -105,7 +105,7 @@ android {
     namespace 'eu.pkgsoftware.babybuddywidgets'
 }
 
-ext.camerax_version = "1.3.2"
+ext.camerax_version = "1.3.4"
 
 dependencies {
     implementation 'com.squareup.phrase:phrase:1.2.0'
@@ -115,24 +115,24 @@ dependencies {
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-jackson:2.9.0'
 
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.9.10'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.10'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.10.1'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.1'
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.10'
 
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.7.7'
     implementation 'androidx.navigation:navigation-ui-ktx:2.7.7'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.concurrent:concurrent-futures:1.1.0'
+    implementation 'androidx.concurrent:concurrent-futures:1.2.0'
 
     implementation "androidx.camera:camera-core:$camerax_version"
     implementation "androidx.camera:camera-camera2:$camerax_version"
     implementation "androidx.camera:camera-lifecycle:$camerax_version"
     implementation "androidx.camera:camera-view:$camerax_version"
 
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
@@ -142,9 +142,9 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4"
     testImplementation 'org.json:json:20230618'
 
-    androidTestImplementation 'androidx.test:core-ktx:1.5.0'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test:core-ktx:1.6.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
     androidTestImplementation 'tools.fastlane:screengrab:2.1.1'
 
     implementation project(':zxing-cpp')
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
index be162f2..111e9c9 100644
--- a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
+++ b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/MainActivity.kt
@@ -184,11 +184,11 @@ class MainActivity : AppCompatActivity() {
         return super.dispatchTouchEvent(ev)
     }
 
-    override fun dispatchKeyEvent(ev: KeyEvent?): Boolean {
-        ev?.let {
+    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+        event?.let {
             invokeInputEventListeners(it)
         }
-        return super.dispatchKeyEvent(ev)
+        return super.dispatchKeyEvent(event)
     }
 
     fun <X> storeActivity(
diff --git a/tools/babybuddy-version-array/versions b/tools/babybuddy-version-array/versions
index ba82076..b2813ac 100644
--- a/tools/babybuddy-version-array/versions
+++ b/tools/babybuddy-version-array/versions
@@ -1,3 +1,4 @@
+v2.6.0
 v2.5.0
 v2.3.0
 v2.2.1