aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:09:25 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:09:25 +0000
commitd663e8793f6bd591cfe24e5de1c62beff2d7352c (patch)
tree0aaa6c8a4fa87af924826f8641411d0f650730e4
parentfb0c0f56e27d935709e924817cfcdd27fc501a82 (diff)
parent1647dd701f16e1ec4092476406763683dec44960 (diff)
downloadjunit-android14-mainline-sdkext-release.tar.gz
Snap for 10453563 from 1647dd701f16e1ec4092476406763683dec44960 to mainline-sdkext-releaseaml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010android14-mainline-sdkext-release
Change-Id: I683eb72478827fa76b90a9056226d39fd69747c4
-rw-r--r--Android.bp3
-rw-r--r--METADATA12
2 files changed, 9 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index b62e615..94dfb88 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,6 +45,9 @@ java_library_static {
sdk_version: "core_current",
static_libs: ["hamcrest"],
+ // b/267831518: Pin tradefed and dependencies to Java 11.
+ java_version: "11",
+
errorprone: {
javacflags: ["-Xep:DoNotCall:OFF"]
}
diff --git a/METADATA b/METADATA
index 98e7e51..4f2aae4 100644
--- a/METADATA
+++ b/METADATA
@@ -6,14 +6,14 @@ third_party {
value: "https://junit.org/junit4/"
}
url {
- type: ARCHIVE
- value: "https://github.com/junit-team/junit4/archive/r4.12.tar.gz"
+ type: GIT
+ value: "https://github.com/junit-team/junit4.git"
}
- version: "r4.12"
+ version: "r4.13.2"
license_type: RECIPROCAL
last_upgrade_date {
- year: 2016
- month: 12
- day: 14
+ year: 2021
+ month: 3
+ day: 3
}
}