Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,7 @@ define_kt_toolchain(
maven_repository(
name = "axt_m2repository",
testonly = 1,
srcs = [
"//core/java/androidx/test/core:core_maven_artifact",
"//espresso/accessibility/java/androidx/test/espresso/accessibility:accessibility_checks_maven_artifact",
"//espresso/contrib/java/androidx/test/espresso/contrib:espresso_contrib_maven_artifact",
"//espresso/core/java/androidx/test/espresso:espresso_core_maven_artifact",
"//espresso/device/java/androidx/test/espresso/device:device_maven_artifact",
"//espresso/idling_resource/concurrent/java/androidx/test/espresso/idling/concurrent:idling_concurrent_maven_artifact",
"//espresso/idling_resource/java/androidx/test/espresso:espresso_idling_resource_maven_artifact",
"//espresso/idling_resource/net/java/androidx/test/espresso/idling/net:idling_net_maven_artifact",
"//espresso/intents/java/androidx/test/espresso/intent:espresso_intents_maven_artifact",
"//espresso/remote/java/androidx/test/espresso/remote:espresso_remote_maven_artifact",
"//espresso/web/java/androidx/test/espresso/web:espresso_web_maven_artifact",
"//ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
"//ext/truth/java/androidx/test/ext/truth:truth_maven_artifact",
"//ktx/core/java/androidx/test/core:core_maven_artifact",
"//ktx/ext/junit/java/androidx/test/ext/junit:junit_maven_artifact",
"//runner/android_junit_runner/java/androidx/test:runner_maven_artifact",
"//runner/android_test_orchestrator/stubapp:orchestrator_release_maven_artifact",
"//runner/monitor/java/androidx/test:monitor_maven_artifact",
"//runner/rules/java/androidx/test:rules_maven_artifact",
"//services:test_services_maven_artifact",
"//services/storage/java/androidx/test/services/storage:test_storage_maven_artifact",
],
srcs = ["//runner/monitor/java/androidx/test:monitor_maven_artifact"],

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

The srcs list for the axt_m2repository has been reduced to a single artifact. This repository is intended to contain all AndroidX Test artifacts for Bazel-based testing. Removing almost all artifacts will likely break builds that depend on this. This change seems to be a result of an error in the release automation script (tools/release/validate_and_propagate_versions.sh). Please verify that this change is intentional. If not, the list of artifacts should be restored.

)

java_test(
Expand Down
18 changes: 9 additions & 9 deletions build_extensions/axt_versions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ Use tools/release/validate_and_propagate_versions.sh to propagate these versions
//:axt_m2_repository and gradle-tests/settings.gradle
"""

RUNNER_VERSION = "1.8.0-alpha01"
RULES_VERSION = "1.8.0-alpha01"
RUNNER_VERSION = "1.7.0"
RULES_VERSION = "1.7.0"
MONITOR_VERSION = "1.9.0-alpha01"
ESPRESSO_VERSION = "3.8.0-alpha01"
CORE_VERSION = "1.8.0-alpha01"
ESPRESSO_DEVICE_VERSION = "1.2.0-alpha01"
ANDROIDX_JUNIT_VERSION = "1.4.0-alpha01"
ANDROIDX_TRUTH_VERSION = "1.8.0-alpha01"
ORCHESTRATOR_VERSION = "1.7.0-alpha01"
SERVICES_VERSION = "1.7.0-alpha01"
ESPRESSO_VERSION = "3.7.0"
CORE_VERSION = "1.7.0"
ESPRESSO_DEVICE_VERSION = "1.1.0"
ANDROIDX_JUNIT_VERSION = "1.3.0"
ANDROIDX_TRUTH_VERSION = "1.7.0"
ORCHESTRATOR_VERSION = "1.6.1"
SERVICES_VERSION = "1.6.0"
Comment on lines +7 to +16

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

There's an inconsistency in the version updates. Most versions are being reverted to older, stable releases (e.g., RUNNER_VERSION from 1.8.0-alpha01 to 1.7.0), but MONITOR_VERSION remains at 1.9.0-alpha01. Could you clarify if this is intentional? If all versions are meant to be for a specific release, they should probably be consistent.


# Full maven artifact strings for apks.
SERVICES_APK_ARTIFACT = "androidx.test.services:test-services:%s" % SERVICES_VERSION
Expand Down
4 changes: 3 additions & 1 deletion gradle-tests/espresso/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@ dependencies {
androidTestImplementation libs.ext.truth
androidTestImplementation libs.espresso.core
androidTestImplementation libs.espresso.intents

androidTestImplementation libs.runner
androidTestImplementation libs.monitor
androidTestImplementation libs.core
}
1 change: 1 addition & 0 deletions gradle-tests/orchestrator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ android {
dependencies {
androidTestImplementation libs.ext.junit
androidTestImplementation libs.runner
androidTestImplementation libs.monitor
androidTestImplementation libs.ext.truth
androidTestUtil libs.orchestrator
}
1 change: 1 addition & 0 deletions gradle-tests/runner/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ android {

dependencies {
androidTestImplementation libs.runner
androidTestImplementation libs.monitor
}

25 changes: 13 additions & 12 deletions gradle-tests/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,19 @@ dependencyResolutionManagement {
}
versionCatalogs {
libs {
library('core', 'androidx.test:core:1.8.0-alpha01')
library('runner', 'androidx.test:runner:1.8.0-alpha01')
library('ext.junit', 'androidx.test.ext:junit:1.4.0-alpha01')
library('ext.truth', 'androidx.test.ext:truth:1.8.0-alpha01')
library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.8.0-alpha01')
library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.8.0-alpha01')
library('espresso.core', 'androidx.test.espresso:espresso-core:3.8.0-alpha01')
library('espresso.device', 'androidx.test.espresso:espresso-device:1.2.0-alpha01')
library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.8.0-alpha01')
library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.8.0-alpha01')
library('espresso.web', 'androidx.test.espresso:espresso-web:3.8.0-alpha01')
library('orchestrator', 'androidx.test:orchestrator:1.7.0-alpha01')
library('core', 'androidx.test:core:1.7.0')
library('monitor', 'androidx.test:monitor:1.9.0-alpha01')
library('runner', 'androidx.test:runner:1.7.0')
library('ext.junit', 'androidx.test.ext:junit:1.3.0')
library('ext.truth', 'androidx.test.ext:truth:1.7.0')
library('espresso.accessibility', 'androidx.test.espresso:espresso-accessibility:3.7.0')
library('espresso.contrib', 'androidx.test.espresso:espresso-contrib:3.7.0')
library('espresso.core', 'androidx.test.espresso:espresso-core:3.7.0')
library('espresso.device', 'androidx.test.espresso:espresso-device:1.1.0')
library('espresso.idlingresource', 'androidx.test.espresso:espresso-idling-resource:3.7.0')
library('espresso.intents', 'androidx.test.espresso:espresso-intents:3.7.0')
library('espresso.web', 'androidx.test.espresso:espresso-web:3.7.0')
library('orchestrator', 'androidx.test:orchestrator:1.6.1')

}
}
Expand Down
1 change: 1 addition & 0 deletions gradle-tests/settings.gradle.template
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ dependencyResolutionManagement {
versionCatalogs {
libs {
library('core', 'androidx.test:core:{CORE_VERSION}')
library('monitor', 'androidx.test:monitor:{MONITOR_VERSION}')

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

For better maintainability and readability, it's a good practice to keep the library definitions in the version catalog sorted alphabetically by their alias. Please consider reordering all library definitions within the libs block alphabetically. Since settings.gradle is auto-generated from this template, this is the correct place to apply the change.

library('runner', 'androidx.test:runner:{RUNNER_VERSION}')
library('ext.junit', 'androidx.test.ext:junit:{ANDROIDX_JUNIT_VERSION}')
library('ext.truth', 'androidx.test.ext:truth:{ANDROIDX_TRUTH_VERSION}')
Expand Down
Loading