Merge "Mark ab/6881855 as merged" into stage-aosp-master

commit: 36738a119cfe89ce6199308839ecc1b0bb1aa07e [log] [tgz]
author: TreeHugger Robot <treehugger-gerrit@google.com> Tue Nov 24 00:45:08 2020 +0000
committer: Android (Google) Code Review <android-gerrit@google.com> Tue Nov 24 00:45:08 2020 +0000
tree: abeba694aa3aa61f951e3efe0d99f505cf0c4fd2
parent: 487dccdafa2c4e46cea612e3db753452c505c322 [diff]
parent: 5c6faba5ad6c0a66dcb4f61525a8fe481b82a695 [diff]
diff --git a/METADATA b/METADATA
index 7d6c49b..90581f3 100644
--- a/METADATA
+++ b/METADATA

@@ -7,17 +7,17 @@
   }
   url {
     type: ARCHIVE
-    value: "https://github.com/JetBrains/kotlin/releases/download/v1.4.10/kotlin-compiler-1.4.10.zip"
+    value: "https://github.com/JetBrains/kotlin/releases/download/v1.4.20/kotlin-compiler-1.4.20.zip"
   }
   url {
     type: ARCHIVE
     value: "https://github.com/JetBrains/intellij-community/raw/171/lib/src/trove4j_src.jar"
   }
-  version: "v1.4.10"
+  version: "v1.4.20"
   license_type: RECIPROCAL
   last_upgrade_date {
     year: 2020
-    month: 9
-    day: 10
+    month: 11
+    day: 19
   }
 }

diff --git a/build.txt b/build.txt
index 6e23deb..12529d1 100644
--- a/build.txt
+++ b/build.txt

@@ -1 +1 @@
-1.4.10-release-411
\ No newline at end of file
+1.4.20-release-308
\ No newline at end of file

diff --git a/lib/allopen-compiler-plugin.jar b/lib/allopen-compiler-plugin.jar
index 317c12b..f6f40a8 100644
--- a/lib/allopen-compiler-plugin.jar
+++ b/lib/allopen-compiler-plugin.jar
Binary files differ

diff --git a/lib/android-extensions-compiler.jar b/lib/android-extensions-compiler.jar
index ccf0250..9546553 100644
--- a/lib/android-extensions-compiler.jar
+++ b/lib/android-extensions-compiler.jar
Binary files differ

diff --git a/lib/android-extensions-runtime.jar b/lib/android-extensions-runtime.jar
index 9069e9c..04fa7d4 100644
--- a/lib/android-extensions-runtime.jar
+++ b/lib/android-extensions-runtime.jar
Binary files differ

diff --git a/lib/jvm-abi-gen.jar b/lib/jvm-abi-gen.jar
index 57b7d09..7ea1ac0 100644
--- a/lib/jvm-abi-gen.jar
+++ b/lib/jvm-abi-gen.jar
Binary files differ

diff --git a/lib/kotlin-annotation-processing-cli.jar b/lib/kotlin-annotation-processing-cli.jar
index dcb4c64..91e2636 100644
--- a/lib/kotlin-annotation-processing-cli.jar
+++ b/lib/kotlin-annotation-processing-cli.jar
Binary files differ

diff --git a/lib/kotlin-annotation-processing-runtime.jar b/lib/kotlin-annotation-processing-runtime.jar
index f806790..50f3207 100644
--- a/lib/kotlin-annotation-processing-runtime.jar
+++ b/lib/kotlin-annotation-processing-runtime.jar
Binary files differ

diff --git a/lib/kotlin-annotation-processing.jar b/lib/kotlin-annotation-processing.jar
index c25bed9..0877a80 100644
--- a/lib/kotlin-annotation-processing.jar
+++ b/lib/kotlin-annotation-processing.jar
Binary files differ

diff --git a/lib/kotlin-annotations-android.jar b/lib/kotlin-annotations-android.jar
index 92ea66d..a1da927 100644
--- a/lib/kotlin-annotations-android.jar
+++ b/lib/kotlin-annotations-android.jar
Binary files differ

diff --git a/lib/kotlin-ant.jar b/lib/kotlin-ant.jar
index c8d4ca2..d87b594 100644
--- a/lib/kotlin-ant.jar
+++ b/lib/kotlin-ant.jar
Binary files differ

diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar
index 6512623..3ca0149 100644
--- a/lib/kotlin-compiler.jar
+++ b/lib/kotlin-compiler.jar
Binary files differ

diff --git a/lib/kotlin-coroutines-experimental-compat.jar b/lib/kotlin-coroutines-experimental-compat.jar
index 8eaa81b..d2ba702 100644
--- a/lib/kotlin-coroutines-experimental-compat.jar
+++ b/lib/kotlin-coroutines-experimental-compat.jar
Binary files differ

diff --git a/lib/kotlin-daemon-client.jar b/lib/kotlin-daemon-client.jar
index 68d08b7..7ab9ff0 100644
--- a/lib/kotlin-daemon-client.jar
+++ b/lib/kotlin-daemon-client.jar
Binary files differ

diff --git a/lib/kotlin-daemon.jar b/lib/kotlin-daemon.jar
index 292d90e..8fd7dbd 100644
--- a/lib/kotlin-daemon.jar
+++ b/lib/kotlin-daemon.jar
Binary files differ

diff --git a/lib/kotlin-imports-dumper-compiler-plugin.jar b/lib/kotlin-imports-dumper-compiler-plugin.jar
index 3e83fa8..c714692 100644
--- a/lib/kotlin-imports-dumper-compiler-plugin.jar
+++ b/lib/kotlin-imports-dumper-compiler-plugin.jar
Binary files differ

diff --git a/lib/kotlin-main-kts.jar b/lib/kotlin-main-kts.jar
index 3dc4713..e27ba0a 100644
--- a/lib/kotlin-main-kts.jar
+++ b/lib/kotlin-main-kts.jar
Binary files differ

diff --git a/lib/kotlin-preloader.jar b/lib/kotlin-preloader.jar
index de89ab0..35630c2 100644
--- a/lib/kotlin-preloader.jar
+++ b/lib/kotlin-preloader.jar
Binary files differ

diff --git a/lib/kotlin-reflect-sources.jar b/lib/kotlin-reflect-sources.jar
index bf0fb81..5851d9e 100644
--- a/lib/kotlin-reflect-sources.jar
+++ b/lib/kotlin-reflect-sources.jar
Binary files differ

diff --git a/lib/kotlin-reflect.jar b/lib/kotlin-reflect.jar
index 53b918c..4fc1f37 100644
--- a/lib/kotlin-reflect.jar
+++ b/lib/kotlin-reflect.jar
Binary files differ

diff --git a/lib/kotlin-runner.jar b/lib/kotlin-runner.jar
index 92ccb3d..c7f84aa 100644
--- a/lib/kotlin-runner.jar
+++ b/lib/kotlin-runner.jar
Binary files differ

diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar
index b444089..1885955 100644
--- a/lib/kotlin-script-runtime.jar
+++ b/lib/kotlin-script-runtime.jar
Binary files differ

diff --git a/lib/kotlin-scripting-common.jar b/lib/kotlin-scripting-common.jar
index df67430..a9d5789 100644
--- a/lib/kotlin-scripting-common.jar
+++ b/lib/kotlin-scripting-common.jar
Binary files differ

diff --git a/lib/kotlin-scripting-compiler-impl.jar b/lib/kotlin-scripting-compiler-impl.jar
index 16de9b1..bea971c 100644
--- a/lib/kotlin-scripting-compiler-impl.jar
+++ b/lib/kotlin-scripting-compiler-impl.jar
Binary files differ

diff --git a/lib/kotlin-scripting-compiler.jar b/lib/kotlin-scripting-compiler.jar
index 13878d1..f84ed67 100644
--- a/lib/kotlin-scripting-compiler.jar
+++ b/lib/kotlin-scripting-compiler.jar
Binary files differ

diff --git a/lib/kotlin-scripting-js.jar b/lib/kotlin-scripting-js.jar
index a73123c..2e71e42 100644
--- a/lib/kotlin-scripting-js.jar
+++ b/lib/kotlin-scripting-js.jar
Binary files differ

diff --git a/lib/kotlin-scripting-jvm.jar b/lib/kotlin-scripting-jvm.jar
index 3bc5c9c..ea14e4e 100644
--- a/lib/kotlin-scripting-jvm.jar
+++ b/lib/kotlin-scripting-jvm.jar
Binary files differ

diff --git a/lib/kotlin-stdlib-jdk7-sources.jar b/lib/kotlin-stdlib-jdk7-sources.jar
index 4767d1a..290e0a4 100644
--- a/lib/kotlin-stdlib-jdk7-sources.jar
+++ b/lib/kotlin-stdlib-jdk7-sources.jar
Binary files differ

diff --git a/lib/kotlin-stdlib-jdk7.jar b/lib/kotlin-stdlib-jdk7.jar
index 271e7cd..53fa5f8 100644
--- a/lib/kotlin-stdlib-jdk7.jar
+++ b/lib/kotlin-stdlib-jdk7.jar
Binary files differ

diff --git a/lib/kotlin-stdlib-jdk8-sources.jar b/lib/kotlin-stdlib-jdk8-sources.jar
index 14174f1..74f0d7a 100644
--- a/lib/kotlin-stdlib-jdk8-sources.jar
+++ b/lib/kotlin-stdlib-jdk8-sources.jar
Binary files differ

diff --git a/lib/kotlin-stdlib-jdk8.jar b/lib/kotlin-stdlib-jdk8.jar
index 7366ac8..00767cd 100644
--- a/lib/kotlin-stdlib-jdk8.jar
+++ b/lib/kotlin-stdlib-jdk8.jar
Binary files differ

diff --git a/lib/kotlin-stdlib-js-sources.jar b/lib/kotlin-stdlib-js-sources.jar
index b9ac1ff..255b665 100644
--- a/lib/kotlin-stdlib-js-sources.jar
+++ b/lib/kotlin-stdlib-js-sources.jar
Binary files differ

diff --git a/lib/kotlin-stdlib-js.jar b/lib/kotlin-stdlib-js.jar
index 6f53b11..16a5858 100644
--- a/lib/kotlin-stdlib-js.jar
+++ b/lib/kotlin-stdlib-js.jar
Binary files differ

diff --git a/lib/kotlin-stdlib-sources.jar b/lib/kotlin-stdlib-sources.jar
index a58f1cc..640b4fa 100644
--- a/lib/kotlin-stdlib-sources.jar
+++ b/lib/kotlin-stdlib-sources.jar
Binary files differ

diff --git a/lib/kotlin-stdlib.jar b/lib/kotlin-stdlib.jar
index 1d15a0c..aecb602 100644
--- a/lib/kotlin-stdlib.jar
+++ b/lib/kotlin-stdlib.jar
Binary files differ

diff --git a/lib/kotlin-test-js.jar b/lib/kotlin-test-js.jar
index c36c87c..644ab2a 100644
--- a/lib/kotlin-test-js.jar
+++ b/lib/kotlin-test-js.jar
Binary files differ

diff --git a/lib/kotlin-test-junit-sources.jar b/lib/kotlin-test-junit-sources.jar
index edaa13e..81cd4ca 100644
--- a/lib/kotlin-test-junit-sources.jar
+++ b/lib/kotlin-test-junit-sources.jar
Binary files differ

diff --git a/lib/kotlin-test-junit.jar b/lib/kotlin-test-junit.jar
index c3f3961..66dd0ab 100644
--- a/lib/kotlin-test-junit.jar
+++ b/lib/kotlin-test-junit.jar
Binary files differ

diff --git a/lib/kotlin-test-junit5-sources.jar b/lib/kotlin-test-junit5-sources.jar
index 09d78e8..f20a7e3 100644
--- a/lib/kotlin-test-junit5-sources.jar
+++ b/lib/kotlin-test-junit5-sources.jar
Binary files differ

diff --git a/lib/kotlin-test-junit5.jar b/lib/kotlin-test-junit5.jar
index 3dd8edf..093c713 100644
--- a/lib/kotlin-test-junit5.jar
+++ b/lib/kotlin-test-junit5.jar
Binary files differ

diff --git a/lib/kotlin-test-testng-sources.jar b/lib/kotlin-test-testng-sources.jar
index d4fd54e..f7830ee 100644
--- a/lib/kotlin-test-testng-sources.jar
+++ b/lib/kotlin-test-testng-sources.jar
Binary files differ

diff --git a/lib/kotlin-test-testng.jar b/lib/kotlin-test-testng.jar
index 8519e18..0e90515 100644
--- a/lib/kotlin-test-testng.jar
+++ b/lib/kotlin-test-testng.jar
Binary files differ

diff --git a/lib/kotlin-test.jar b/lib/kotlin-test.jar
index ba0bc0e..37bba55 100644
--- a/lib/kotlin-test.jar
+++ b/lib/kotlin-test.jar
Binary files differ

diff --git a/lib/kotlinx-serialization-compiler-plugin.jar b/lib/kotlinx-serialization-compiler-plugin.jar
index fac2989..7f7ae1d 100644
--- a/lib/kotlinx-serialization-compiler-plugin.jar
+++ b/lib/kotlinx-serialization-compiler-plugin.jar
Binary files differ

diff --git a/lib/noarg-compiler-plugin.jar b/lib/noarg-compiler-plugin.jar
index bd2712e..3274f5a 100644
--- a/lib/noarg-compiler-plugin.jar
+++ b/lib/noarg-compiler-plugin.jar
Binary files differ

diff --git a/lib/parcelize-compiler.jar b/lib/parcelize-compiler.jar
new file mode 100644
index 0000000..f881795
--- /dev/null
+++ b/lib/parcelize-compiler.jar
Binary files differ

diff --git a/lib/parcelize-runtime.jar b/lib/parcelize-runtime.jar
new file mode 100644
index 0000000..65e99d3
--- /dev/null
+++ b/lib/parcelize-runtime.jar
Binary files differ

diff --git a/lib/sam-with-receiver-compiler-plugin.jar b/lib/sam-with-receiver-compiler-plugin.jar
index 69f8845..6f4bd14 100644
--- a/lib/sam-with-receiver-compiler-plugin.jar
+++ b/lib/sam-with-receiver-compiler-plugin.jar
Binary files differ

diff --git a/lib/trove4j.jar b/lib/trove4j.jar
index b687dc0..fd74d75 100644
--- a/lib/trove4j.jar
+++ b/lib/trove4j.jar
Binary files differ
commit	36738a119cfe89ce6199308839ecc1b0bb1aa07e	[log] [tgz]
author	TreeHugger Robot <treehugger-gerrit@google.com>	Tue Nov 24 00:45:08 2020 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Nov 24 00:45:08 2020 +0000
tree	abeba694aa3aa61f951e3efe0d99f505cf0c4fd2
parent	487dccdafa2c4e46cea612e3db753452c505c322 [diff]
parent	5c6faba5ad6c0a66dcb4f61525a8fe481b82a695 [diff]