summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSorin Basca <sorinbasca@google.com>2022-01-14 19:50:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-01-14 19:50:00 +0000
commitf0ec16c204a1809ca8cef080a7019a185f52e197 (patch)
tree8a9198e8cae4489eb68fbba2690eb860a239b0ec
parenta3e8cbbf8d76f2446b26021fe1de6eeb2eeb049d (diff)
parentf18976c094ee36be77f15e0be5b89847fc777b42 (diff)
downloadmockito-f0ec16c204a1809ca8cef080a7019a185f52e197.tar.gz
Merge "Updating byte-buddy from 1.8.15 to 1.9.3" am: f18976c094
Original change: https://android-review.googlesource.com/c/platform/external/mockito/+/1948576 Change-Id: If941abcad58a95716618c3798d3bd70f607d99ed
-rw-r--r--Android.bp4
-rw-r--r--lib/byte-buddy-1.8.15-sources.jarbin959229 -> 0 bytes
-rw-r--r--lib/byte-buddy-1.8.15.jarbin2987269 -> 0 bytes
-rw-r--r--lib/byte-buddy-1.9.3-sources.jarbin0 -> 1141534 bytes
-rw-r--r--lib/byte-buddy-1.9.3.jarbin0 -> 3237047 bytes
-rw-r--r--lib/byte-buddy-1.9.3.jar.txt (renamed from lib/byte-buddy-1.8.15.jar.txt)0
-rw-r--r--lib/byte-buddy-agent-1.8.15-sources.jarbin18700 -> 0 bytes
-rw-r--r--lib/byte-buddy-agent-1.8.15.jarbin41740 -> 0 bytes
-rw-r--r--lib/byte-buddy-agent-1.9.3-sources.jarbin0 -> 21130 bytes
-rw-r--r--lib/byte-buddy-agent-1.9.3.jarbin0 -> 43413 bytes
-rw-r--r--lib/byte-buddy-agent-1.9.3.jar.txt (renamed from lib/byte-buddy-agent-1.8.15.jar.txt)0
11 files changed, 2 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp
index d9dd1ee..fa02f9d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -108,10 +108,10 @@ java_library_host {
// ============================================================
java_import_host {
name: "mockito-byte-buddy",
- jars: ["lib/byte-buddy-1.8.15.jar"],
+ jars: ["lib/byte-buddy-1.9.3.jar"],
}
java_import_host {
name: "mockito-byte-buddy-agent",
- jars: ["lib/byte-buddy-agent-1.8.15.jar"],
+ jars: ["lib/byte-buddy-agent-1.9.3.jar"],
}
diff --git a/lib/byte-buddy-1.8.15-sources.jar b/lib/byte-buddy-1.8.15-sources.jar
deleted file mode 100644
index 523015e..0000000
--- a/lib/byte-buddy-1.8.15-sources.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-1.8.15.jar b/lib/byte-buddy-1.8.15.jar
deleted file mode 100644
index b8c8379..0000000
--- a/lib/byte-buddy-1.8.15.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-1.9.3-sources.jar b/lib/byte-buddy-1.9.3-sources.jar
new file mode 100644
index 0000000..400bdcb
--- /dev/null
+++ b/lib/byte-buddy-1.9.3-sources.jar
Binary files differ
diff --git a/lib/byte-buddy-1.9.3.jar b/lib/byte-buddy-1.9.3.jar
new file mode 100644
index 0000000..c1c2b07
--- /dev/null
+++ b/lib/byte-buddy-1.9.3.jar
Binary files differ
diff --git a/lib/byte-buddy-1.8.15.jar.txt b/lib/byte-buddy-1.9.3.jar.txt
index e06d208..e06d208 100644
--- a/lib/byte-buddy-1.8.15.jar.txt
+++ b/lib/byte-buddy-1.9.3.jar.txt
diff --git a/lib/byte-buddy-agent-1.8.15-sources.jar b/lib/byte-buddy-agent-1.8.15-sources.jar
deleted file mode 100644
index 24ab2ee..0000000
--- a/lib/byte-buddy-agent-1.8.15-sources.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-agent-1.8.15.jar b/lib/byte-buddy-agent-1.8.15.jar
deleted file mode 100644
index 1709e55..0000000
--- a/lib/byte-buddy-agent-1.8.15.jar
+++ /dev/null
Binary files differ
diff --git a/lib/byte-buddy-agent-1.9.3-sources.jar b/lib/byte-buddy-agent-1.9.3-sources.jar
new file mode 100644
index 0000000..cc30ed3
--- /dev/null
+++ b/lib/byte-buddy-agent-1.9.3-sources.jar
Binary files differ
diff --git a/lib/byte-buddy-agent-1.9.3.jar b/lib/byte-buddy-agent-1.9.3.jar
new file mode 100644
index 0000000..51a0bd4
--- /dev/null
+++ b/lib/byte-buddy-agent-1.9.3.jar
Binary files differ
diff --git a/lib/byte-buddy-agent-1.8.15.jar.txt b/lib/byte-buddy-agent-1.9.3.jar.txt
index e06d208..e06d208 100644
--- a/lib/byte-buddy-agent-1.8.15.jar.txt
+++ b/lib/byte-buddy-agent-1.9.3.jar.txt