Upgrade dependency versions and cleanup (#113)

* Upgrade dependency versions and cleanup Upgrades CameraX version so it now depends on stable Compose artifacts (1.6.1). This change was made in aosp/2960243 Upgrade a couple other library dependency versions to their latest stable/bugfix release Removes dangling camera-viewfinder-compose files that weren't deleted in a previous PR Change single instance of run {} to runTest {} in ImageCaptureDeviceTest * Fix build errors and warnings * Apply spotless
google · Feb 15, 2024 · a860064 · a860064
1 parent 4b18b26
commit a860064
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 605 deletions.
diff --git a/app/src/androidTest/java/com/google/jetpackcamera/ImageCaptureDeviceTest.kt b/app/src/androidTest/java/com/google/jetpackcamera/ImageCaptureDeviceTest.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 The Android Open Source Project
+ * Copyright (C) 2023-2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,7 +57,7 @@ internal class ImageCaptureDeviceTest {
     private val uiDevice = UiDevice.getInstance(instrumentation)
 
     @Test
-    fun image_capture_external() = run {
+    fun image_capture_external() = runTest {
         val timeStamp = System.currentTimeMillis()
         val uri = getTestUri(timeStamp)
         getTestRegistry {

diff --git a/camera-viewfinder-compose/build.gradle.kts b/camera-viewfinder-compose/build.gradle.kts
diff --git a/camera-viewfinder-compose/src/main/java/com/google/jetpackcamera/viewfinder/CameraPreview.kt b/camera-viewfinder-compose/src/main/java/com/google/jetpackcamera/viewfinder/CameraPreview.kt
diff --git a/...nder-compose/src/main/java/com/google/jetpackcamera/viewfinder/surface/CombinedSurface.kt b/...nder-compose/src/main/java/com/google/jetpackcamera/viewfinder/surface/CombinedSurface.kt