Add kotlin stdlin maven dependency to espresso-core and -ktx packages.

PiperOrigin-RevId: 392456650
android · Aug 23, 2021 · 5711116 · 5711116
1 parent 6150aca
commit 5711116
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/build_extensions/axt_versions.bzl b/build_extensions/axt_versions.bzl
@@ -22,6 +22,7 @@ ANDROIDX_VERSION_PATH = "1.0.0"
 GOOGLE_MATERIAL_VERSION = "1.0.0"
 ANDROIDX_LIFECYCLE_VERSION = "2.0.0"
 ANDROIDX_MULTIDEX_VERSION = "2.0.0"
+KOTLIN_VERSION = "1.4.30"
 
 # accessibilitytestframework
 ATF_VERSION = "3.1.2"

diff --git a/espresso/core/java/androidx/test/espresso/BUILD.bazel b/espresso/core/java/androidx/test/espresso/BUILD.bazel
@@ -1,6 +1,6 @@
 load("//build_extensions:release.bzl", "axt_release_lib")
 load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION", "HAMCREST_VERSION", "RUNNER_VERSION")
+load("//build_extensions:axt_versions.bzl", "ESPRESSO_VERSION", "HAMCREST_VERSION", "RUNNER_VERSION", "KOTLIN_VERSION")
 load("//build_extensions:combine_jars.bzl", "combine_jars")
 load("//build_extensions:remove_from_jar.bzl", "remove_from_jar")
 
@@ -278,6 +278,7 @@ maven_artifact(
         "org.hamcrest:hamcrest-library:%s" % HAMCREST_VERSION,
         "org.hamcrest:hamcrest-integration:%s" % HAMCREST_VERSION,
         "com.google.code.findbugs:jsr305:2.0.1",
+        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
     ],
     artifact_id = "espresso-core",
     group_id = "androidx.test.espresso",

diff --git a/ktx/core/java/androidx/test/core/BUILD.bazel b/ktx/core/java/androidx/test/core/BUILD.bazel
@@ -1,5 +1,10 @@
 # androidx.test.core Kotlin extensions
 
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+load("//build_extensions:maven_repo.bzl", "maven_artifact")
+load("//build_extensions:axt_versions.bzl", "ANDROIDX_LIFECYCLE_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "RUNNER_VERSION", "KOTLIN_VERSION")
+
+
 package(
     default_visibility = [
         "//:__subpackages__",
@@ -8,7 +13,7 @@ package(
 
 licenses(["notice"])  # Apache License 2.0
 
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+
 
 kt_android_library(
     name = "core",
@@ -50,15 +55,14 @@ axt_release_lib(
     ],
 )
 
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_LIFECYCLE_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "RUNNER_VERSION")
 
 maven_artifact(
     name = "core_maven_artifact",
     src = ":core_release.aar",
     artifact_deps = [
         "androidx.test:core:%s" % CORE_VERSION,
         "androidx.lifecycle:lifecycle-common:%s" % ANDROIDX_LIFECYCLE_VERSION,
+        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
     ],
     artifact_id = "core-ktx",
     group_id = "androidx.test",

diff --git a/ktx/ext/junit/java/androidx/test/ext/junit/BUILD.bazel b/ktx/ext/junit/java/androidx/test/ext/junit/BUILD.bazel
@@ -1,5 +1,10 @@
 # androidx.ext.junit Kotlin extensions
 
+load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+load("//build_extensions:maven_repo.bzl", "maven_artifact")
+load("//build_extensions:axt_versions.bzl", "ANDROIDX_JUNIT_VERSION", "ANDROIDX_LIFECYCLE_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "RUNNER_VERSION", "KOTLIN_VERSION")
+
+
 licenses(["notice"])  # Apache License 2.0
 
 package(
@@ -8,7 +13,7 @@ package(
     ],
 )
 
-load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_android_library")
+
 
 kt_android_library(
     name = "junit",
@@ -50,15 +55,14 @@ axt_release_lib(
     ],
 )
 
-load("//build_extensions:maven_repo.bzl", "maven_artifact")
-load("//build_extensions:axt_versions.bzl", "ANDROIDX_JUNIT_VERSION", "ANDROIDX_LIFECYCLE_VERSION", "ANDROIDX_VERSION", "CORE_VERSION", "RUNNER_VERSION")
 
 maven_artifact(
     name = "junit_maven_artifact",
     src = ":junit_release.aar",
     artifact_deps = [
         "androidx.test.ext:junit:%s" % ANDROIDX_JUNIT_VERSION,
         "androidx.lifecycle:lifecycle-common:%s" % ANDROIDX_LIFECYCLE_VERSION,
+        "org.jetbrains.kotlin:kotlin-stdlib:%s" % KOTLIN_VERSION,
     ],
     artifact_id = "junit-ktx",
     group_id = "androidx.test.ext",