# HG changeset patch
# User Da Risk <da_risk@geekorum.com>
# Date 1683428492 14400
# Node ID 3eec74c864bf3b5a7a929d0f714bf3cc2b1a1b0d
# Parent  e8e44d416387b42ccad5011153dad49a6767f171
geekdroid: update dependencies

diff -r e8e44d416387 -r 3eec74c864bf buildSrc/src/main/kotlin/AndroidTests.kt
--- a/buildSrc/src/main/kotlin/AndroidTests.kt	Sat May 06 22:57:17 2023 -0400
+++ b/buildSrc/src/main/kotlin/AndroidTests.kt	Sat May 06 23:01:32 2023 -0400
@@ -31,15 +31,12 @@
 import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.dsl.DependencyConstraintHandler
 import org.gradle.api.artifacts.dsl.DependencyHandler
-import org.gradle.kotlin.dsl.closureOf
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin
+import org.gradle.kotlin.dsl.*
 
-const val espressoVersion = "3.5.0-alpha07" // alpha for this bug https://github.com/robolectric/robolectric/issues/6593
-const val androidxTestRunnerVersion = "1.4.0"
-const val androidxTestCoreVersion = "1.4.0"
-const val robolectricVersion = "4.8.2"
+const val espressoVersion = "3.5.1"
+const val androidxTestRunnerVersion = "1.5.2"
+const val androidxTestCoreVersion = "1.5.0"
+const val robolectricVersion = "4.10.2"
 
 private typealias BaseExtension = CommonExtension<*, *, DefaultConfig, *>
 
@@ -71,12 +68,12 @@
     dependencies {
         dualTestImplementation(kotlin("test-junit"))
 
-        androidTestUtil("androidx.test:orchestrator:$androidxTestRunnerVersion")
+        androidTestUtil("androidx.test:orchestrator:1.4.2")
         androidTestImplementation("androidx.test:runner:$androidxTestRunnerVersion")
         dualTestImplementation("androidx.test.ext:junit-ktx:1.1.1")
 
         dualTestImplementation("androidx.test:core-ktx:$androidxTestCoreVersion")
-        dualTestImplementation("androidx.test:rules:$androidxTestRunnerVersion")
+        dualTestImplementation("androidx.test:rules:1.5.0")
         // fragment testing is usually declared on debugImplementation configuration and need these dependencies
         constraints {
             debugImplementation("androidx.test:core:$androidxTestCoreVersion")
@@ -84,7 +81,9 @@
         }
 
         dualTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
-        dualTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
+        dualTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion") {
+            exclude("com.google.protobuf", "protobuf-lite")
+        }
         dualTestImplementation("androidx.test.espresso:espresso-intents:$espressoVersion")
 
         // assertions
@@ -92,8 +91,8 @@
         dualTestImplementation("androidx.test.ext:truth:1.3.0-alpha01")
 
         // mock
-        testImplementation("io.mockk:mockk:1.13.2")
-        androidTestImplementation("io.mockk:mockk-android:1.13.2")
+        testImplementation("io.mockk:mockk:1.13.5")
+        androidTestImplementation("io.mockk:mockk-android:1.13.5")
         testImplementation("org.robolectric:robolectric:$robolectricVersion")
 
         constraints {
diff -r e8e44d416387 -r 3eec74c864bf geekdroid-firebase/build.gradle.kts
--- a/geekdroid-firebase/build.gradle.kts	Sat May 06 22:57:17 2023 -0400
+++ b/geekdroid-firebase/build.gradle.kts	Sat May 06 23:01:32 2023 -0400
@@ -31,6 +31,12 @@
         abortOnError = false
     }
 
+    packaging {
+        resources {
+            excludes += listOf("META-INF/LICENSE.md", "META-INF/LICENSE-notice.md")
+        }
+    }
+
     publishing {
         singleVariant("release") {
             withSourcesJar()
diff -r e8e44d416387 -r 3eec74c864bf geekdroid/build.gradle.kts
--- a/geekdroid/build.gradle.kts	Sat May 06 22:57:17 2023 -0400
+++ b/geekdroid/build.gradle.kts	Sat May 06 23:01:32 2023 -0400
@@ -61,6 +61,12 @@
         enable = true
     }
 
+    packaging {
+        resources {
+            excludes += listOf("META-INF/LICENSE.md", "META-INF/LICENSE-notice.md")
+        }
+    }
+
     publishing {
         singleVariant("release") {
             withSourcesJar()
diff -r e8e44d416387 -r 3eec74c864bf geekdroid/src/main/java/com/geekorum/geekdroid/app/lifecycle/EventObserver.kt
--- a/geekdroid/src/main/java/com/geekorum/geekdroid/app/lifecycle/EventObserver.kt	Sat May 06 22:57:17 2023 -0400
+++ b/geekdroid/src/main/java/com/geekorum/geekdroid/app/lifecycle/EventObserver.kt	Sat May 06 23:01:32 2023 -0400
@@ -61,7 +61,7 @@
     private val onEventUnhandled: (T) -> Unit
 ) : Observer<Event<T>> {
 
-    override fun onChanged(event: Event<T>?) {
-        event?.getContentIfNotHandled()?.let(onEventUnhandled)
+    override fun onChanged(event: Event<T>) {
+        event.getContentIfNotHandled()?.let(onEventUnhandled)
     }
 }
diff -r e8e44d416387 -r 3eec74c864bf gradle/libs.versions.toml
--- a/gradle/libs.versions.toml	Sat May 06 22:57:17 2023 -0400
+++ b/gradle/libs.versions.toml	Sat May 06 23:01:32 2023 -0400
@@ -9,17 +9,17 @@
 dagger = "2.45"
 firebase-bom = "32.0.0"
 fragment = "1.5.7"
-kotlinx-coroutines-bom = "1.6.4"
-lifecycle = "2.5.1"
+kotlinx-coroutines-bom = "1.7.0"
+lifecycle = "2.6.1"
 material = "1.9.0"
 navigation = "2.5.3"
 okhttp = "4.10.0"
 paging-runtime-ktx = "3.1.1"
 play-services-location = "21.0.1"
-recyclerview = "1.2.1"
-room = "2.5.0"
+recyclerview = "1.3.0"
+room = "2.5.1"
 timber = "5.0.1"
-workmanager = "2.8.0"
+workmanager = "2.8.1"
 
 [plugins]