Merge pull request #2362 from android:upgradeAndroidXConcurrent

PiperOrigin-RevId: 739267199

Author: copybara-androidxtest

MODULE.bazel

@@ -40,9 +40,9 @@ maven.artifact(
 maven.install(
     name = "maven",
     artifacts = [
-        "androidx.annotation:annotation:1.7.0-beta01",
-        "androidx.concurrent:concurrent-futures:1.1.0",
-        "androidx.concurrent:concurrent-futures-ktx:1.1.0",
+        "androidx.annotation:annotation:1.7.0",
+        "androidx.concurrent:concurrent-futures:1.2.0",
+        "androidx.concurrent:concurrent-futures-ktx:1.2.0",
         "androidx.core:core:1.6.0",
         "androidx.lifecycle:lifecycle-common:2.3.1",
         "androidx.multidex:multidex:2.0.0",

build_extensions/axt_deps_versions.bzl

@@ -1,35 +1,10 @@
 """Defines versions of androidx.test dependencies."""
 
-# Maven dependency versions
-ANDROIDX_ANNOTATION_VERSION = "1.7.0-beta01"
-ANDROIDX_ANNOTATION_EXPERIMENTAL_VERSION = "1.1.0"
-ANDROIDX_COMPAT_VERSION = "1.3.1"
-
-# TODO(i336855276): update to 1.2.0 release when available
-ANDROIDX_CONCURRENT_VERSION = "1.1.0"
-ANDROIDX_CORE_VERSION = "1.6.0"
-ANDROIDX_FRAGMENT_VERSION = "1.3.6"
-ANDROIDX_CURSOR_ADAPTER_VERSION = "1.0.0"
-ANDROIDX_DRAWER_LAYOUT_VERSION = "1.1.1"
-ANDROIDX_LEGACY_SUPPORT_VERSION = "1.0.0"
-ANDROIDX_LIFECYCLE_VERSION = "2.3.1"
-ANDROIDX_MULTIDEX_VERSION = "2.0.0"
-ANDROIDX_RECYCLERVIEW_VERSION = "1.2.1"
-ANDROIDX_TRACING_VERSION = "1.1.0"
-ANDROIDX_VIEWPAGER_VERSION = "1.0.0"
-ANDROIDX_WINDOW_VERSION = "1.1.0"
-GOOGLE_MATERIAL_VERSION = "1.4.0"
-UIAUTOMATOR_VERSION = "2.2.0"
-JANK_VERSION = "1.0.1"
+# These must match versions specified in MODULE.bazel
+# Unfortunately MODULE.bazel files do not support load
+# so there is no known way to share these constants
 
-# this should match the kotlin toolchain version eg bazel_rules/rules_kotlin/toolchains/kotlin_jvm/kt_jvm_toolchains.bzl KT_VERSION
-# and WORKSPACE:KOTLIN_VERSION
+# Maven dependency versions
+ANDROIDX_ANNOTATION_VERSION = "1.7.0"
 KOTLIN_VERSION = "2.1.0"
 GRPC_VERSION = "1.54.1"  # needs to match WORKSPACE:GRPC_VERSION
-
-ATF_VERSION = "3.1.2"  # accessibilitytestframework
-JUNIT_VERSION = "4.13.2"
-HAMCREST_VERSION = "1.3"
-TRUTH_VERSION = "1.1.3"
-GUAVA_VERSION = "30.1.1-android"
-GUAVA_LISTENABLEFUTURE_VERSION = "1.0"

core/CHANGELOG.md

@@ -7,6 +7,7 @@
 **Bug Fixes**
 
 * Update build toolchain to bazel 7.5 and kotlin 2.1.0
+* Update to androidx.concurrent 1.2.0
 
 **New Features**
 

core/java/androidx/test/core/view/SuspendToFutureAdapter.kt

@@ -33,6 +33,7 @@ import android.view.ViewTreeObserver.OnDrawListener
 import android.view.WindowManager
 import androidx.annotation.RequiresApi
 import androidx.annotation.RestrictTo
+import androidx.concurrent.futures.SuspendToFutureAdapter
 import androidx.test.core.internal.os.HandlerExecutor
 import androidx.test.internal.platform.ServiceLoaderWrapper
 import androidx.test.internal.platform.os.ControlledLooper

core/java/androidx/test/core/view/ViewCapture.kt

@@ -25,6 +25,7 @@ import android.os.Looper
 import android.view.PixelCopy
 import android.view.Window
 import androidx.annotation.RequiresApi
+import androidx.concurrent.futures.SuspendToFutureAdapter
 import androidx.test.platform.graphics.HardwareRendererCompat
 import com.google.common.util.concurrent.ListenableFuture
 import kotlin.coroutines.resumeWithException