Upgrade kotlinc to v1.3.20 am: 1cbf4ce59d

am: 38c30b5ecb

Change-Id: I3c0ba90167dd413a2f3b19c079d0924909218793

54 files changed, 63 insertions, 6 deletions

diff --git a/METADATA b/METADATA
index d18d06f..3aea87d 100644
--- a/METADATA
+++ b/METADATA
@@ -7,17 +7,17 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://github.com/JetBrains/kotlin/releases/download/v1.3.11/kotlin-compiler-1.3.11.zip"
+    value: "https://github.com/JetBrains/kotlin/releases/download/v1.3.20/kotlin-compiler-1.3.20.zip"
   }
   url {
     type: ARCHIVE
     value: "https://github.com/JetBrains/intellij-community/raw/171/lib/src/trove4j_src.jar"
   }
-  version: "v1.3.11"
+  version: "v1.3.20"
   license_type: RECIPROCAL
   last_upgrade_date {
     year: 2019
     month: 1
-    day: 17
+    day: 31
   }
 }
diff --git a/bin/kapt b/bin/kapt
new file mode 100755
index 0000000..29be2ad
--- /dev/null
+++ b/bin/kapt
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+# Copyright 2010-2015 JetBrains s.r.o.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+export KOTLIN_TOOL=kotlin-annotation-processing-cli.jar
+
+export KOTLIN_COMPILER=org.jetbrains.kotlin.kapt.cli.KaptCli
+
+DIR="${BASH_SOURCE[0]%/*}"
+: ${DIR:="."}
+
+"${DIR}"/kotlinc "$@"
diff --git a/bin/kapt.bat b/bin/kapt.bat
new file mode 100644
index 0000000..dacbc54
--- /dev/null
+++ b/bin/kapt.bat
@@ -0,0 +1,21 @@
+@echo off

+

+rem Copyright 2010-2015 JetBrains s.r.o.

+rem

+rem Licensed under the Apache License, Version 2.0 (the "License");

+rem you may not use this file except in compliance with the License.

+rem You may obtain a copy of the License at

+rem

+rem http://www.apache.org/licenses/LICENSE-2.0

+rem

+rem Unless required by applicable law or agreed to in writing, software

+rem distributed under the License is distributed on an "AS IS" BASIS,

+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+rem See the License for the specific language governing permissions and

+rem limitations under the License.

+

+setlocal

+set _KOTLIN_COMPILER=org.jetbrains.kotlin.kapt.cli.KaptCli

+set _KOTLIN_TOOL=kotlin-annotation-processing-cli.jar

+

+call %~dps0kotlinc.bat %*

diff --git a/bin/kotlinc b/bin/kotlinc
index 72e9071..7f45ac9 100755
--- a/bin/kotlinc
+++ b/bin/kotlinc
@@ -68,7 +68,13 @@ else
     [ -n "$KOTLIN_COMPILER" ] || KOTLIN_COMPILER=org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
     java_args=("${java_args[@]}" "-noverify")
 
-    kotlin_app=("${KOTLIN_HOME}/lib/kotlin-preloader.jar" "org.jetbrains.kotlin.preloading.Preloader" "-cp" "${KOTLIN_HOME}/lib/kotlin-compiler.jar" $KOTLIN_COMPILER)
+    declare additional_classpath=""
+    if [ -n "$KOTLIN_TOOL" ];
+    then
+        additional_classpath=":${KOTLIN_HOME}/lib/${KOTLIN_TOOL}"
+    fi
+
+    kotlin_app=("${KOTLIN_HOME}/lib/kotlin-preloader.jar" "org.jetbrains.kotlin.preloading.Preloader" "-cp" "${KOTLIN_HOME}/lib/kotlin-compiler.jar${additional_classpath}" $KOTLIN_COMPILER)
 fi
 
 "${JAVACMD:=java}" $JAVA_OPTS "${java_args[@]}" -cp "${kotlin_app[@]}" "${kotlin_args[@]}"
diff --git a/bin/kotlinc.bat b/bin/kotlinc.bat
index 9e60fe9..55e5c15 100644
--- a/bin/kotlinc.bat
+++ b/bin/kotlinc.bat
@@ -31,8 +31,14 @@ if not "%_KOTLIN_RUNNER%"=="" (
   "%_JAVACMD%" %JAVA_OPTS% "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^

     org.jetbrains.kotlin.runner.Main %*

 ) else (

+  SET _ADDITIONAL_CLASSPATH=""

+

+  if not "%_KOTLIN_TOOL%"=="" (

+    set _ADDITIONAL_CLASSPATH=;%_KOTLIN_HOME%\lib\%_KOTLIN_TOOL%

+  )

+

   "%_JAVACMD%" %JAVA_OPTS% -noverify -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^

-    org.jetbrains.kotlin.preloading.Preloader -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^

+    org.jetbrains.kotlin.preloading.Preloader -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar%_ADDITIONAL_CLASSPATH%" ^

     %_KOTLIN_COMPILER% %*

 )

 

diff --git a/build.txt b/build.txt
index 06198e0..6c677ec 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-1.3.11-release-272
\ No newline at end of file
+1.3.20-release-116
\ No newline at end of file
diff --git a/lib/allopen-compiler-plugin.jar b/lib/allopen-compiler-plugin.jar
index 7097e32..9659a0e 100644
--- a/lib/allopen-compiler-plugin.jar
+++ b/lib/allopen-compiler-plugin.jar
diff --git a/lib/android-extensions-compiler.jar b/lib/android-extensions-compiler.jar
index a0a1dc6..ae504c1 100644
--- a/lib/android-extensions-compiler.jar
+++ b/lib/android-extensions-compiler.jar
diff --git a/lib/android-extensions-runtime.jar b/lib/android-extensions-runtime.jar
index 88947a2..545e345 100644
--- a/lib/android-extensions-runtime.jar
+++ b/lib/android-extensions-runtime.jar
diff --git a/lib/jvm-abi-gen.jar b/lib/jvm-abi-gen.jar
new file mode 100644
index 0000000..041a890
--- /dev/null
+++ b/lib/jvm-abi-gen.jar
diff --git a/lib/kotlin-annotation-processing-cli.jar b/lib/kotlin-annotation-processing-cli.jar
new file mode 100644
index 0000000..b3c3470
--- /dev/null
+++ b/lib/kotlin-annotation-processing-cli.jar
diff --git a/lib/kotlin-annotation-processing-runtime.jar b/lib/kotlin-annotation-processing-runtime.jar
index 26e5b48..a9f642e 100644
--- a/lib/kotlin-annotation-processing-runtime.jar
+++ b/lib/kotlin-annotation-processing-runtime.jar
diff --git a/lib/kotlin-annotation-processing.jar b/lib/kotlin-annotation-processing.jar
index b328347..88d1d8d 100644
--- a/lib/kotlin-annotation-processing.jar
+++ b/lib/kotlin-annotation-processing.jar
diff --git a/lib/kotlin-annotations-android.jar b/lib/kotlin-annotations-android.jar
index 840f3de..359a572 100644
--- a/lib/kotlin-annotations-android.jar
+++ b/lib/kotlin-annotations-android.jar
diff --git a/lib/kotlin-annotations-jvm-sources.jar b/lib/kotlin-annotations-jvm-sources.jar
index de071bc..ae54f86 100644
--- a/lib/kotlin-annotations-jvm-sources.jar
+++ b/lib/kotlin-annotations-jvm-sources.jar
diff --git a/lib/kotlin-annotations-jvm.jar b/lib/kotlin-annotations-jvm.jar
index 22b487d..c498d22 100644
--- a/lib/kotlin-annotations-jvm.jar
+++ b/lib/kotlin-annotations-jvm.jar
diff --git a/lib/kotlin-ant.jar b/lib/kotlin-ant.jar
index 7d5d45c..3a519d5 100644
--- a/lib/kotlin-ant.jar
+++ b/lib/kotlin-ant.jar
diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar
index 38fb2bf..0f8671b 100644
--- a/lib/kotlin-compiler.jar
+++ b/lib/kotlin-compiler.jar
diff --git a/lib/kotlin-daemon-client.jar b/lib/kotlin-daemon-client.jar
index 4218532..2e3bff1 100644
--- a/lib/kotlin-daemon-client.jar
+++ b/lib/kotlin-daemon-client.jar
diff --git a/lib/kotlin-imports-dumper-compiler-plugin.jar b/lib/kotlin-imports-dumper-compiler-plugin.jar
index d50504a..3936a63 100644
--- a/lib/kotlin-imports-dumper-compiler-plugin.jar
+++ b/lib/kotlin-imports-dumper-compiler-plugin.jar
diff --git a/lib/kotlin-main-kts.jar b/lib/kotlin-main-kts.jar
index 95315f4..6dbc0ca 100644
--- a/lib/kotlin-main-kts.jar
+++ b/lib/kotlin-main-kts.jar
diff --git a/lib/kotlin-preloader.jar b/lib/kotlin-preloader.jar
index 3ffdac1..2967c25 100644
--- a/lib/kotlin-preloader.jar
+++ b/lib/kotlin-preloader.jar
diff --git a/lib/kotlin-reflect-sources.jar b/lib/kotlin-reflect-sources.jar
index 0e39f96..c1fde4f 100644
--- a/lib/kotlin-reflect-sources.jar
+++ b/lib/kotlin-reflect-sources.jar
diff --git a/lib/kotlin-reflect.jar b/lib/kotlin-reflect.jar
index a1c17a8..61eca58 100644
--- a/lib/kotlin-reflect.jar
+++ b/lib/kotlin-reflect.jar
diff --git a/lib/kotlin-runner.jar b/lib/kotlin-runner.jar
index c32577d..d223809 100644
--- a/lib/kotlin-runner.jar
+++ b/lib/kotlin-runner.jar
diff --git a/lib/kotlin-script-runtime-sources.jar b/lib/kotlin-script-runtime-sources.jar
index 6a087fd..7c2ae5e 100644
--- a/lib/kotlin-script-runtime-sources.jar
+++ b/lib/kotlin-script-runtime-sources.jar
diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar
index 0edcc5f..fbc4ab0 100644
--- a/lib/kotlin-script-runtime.jar
+++ b/lib/kotlin-script-runtime.jar
diff --git a/lib/kotlin-scripting-common.jar b/lib/kotlin-scripting-common.jar
index dd93028..f9d60ef 100644
--- a/lib/kotlin-scripting-common.jar
+++ b/lib/kotlin-scripting-common.jar
diff --git a/lib/kotlin-scripting-compiler.jar b/lib/kotlin-scripting-compiler.jar
index 82e77ca..8c3e9ed 100644
--- a/lib/kotlin-scripting-compiler.jar
+++ b/lib/kotlin-scripting-compiler.jar
diff --git a/lib/kotlin-scripting-jvm.jar b/lib/kotlin-scripting-jvm.jar
index 0b6cae3..46f9e91 100644
--- a/lib/kotlin-scripting-jvm.jar
+++ b/lib/kotlin-scripting-jvm.jar
diff --git a/lib/kotlin-source-sections-compiler-plugin.jar b/lib/kotlin-source-sections-compiler-plugin.jar
index acbfb44..e93d47a 100644
--- a/lib/kotlin-source-sections-compiler-plugin.jar
+++ b/lib/kotlin-source-sections-compiler-plugin.jar
diff --git a/lib/kotlin-stdlib-jdk7-sources.jar b/lib/kotlin-stdlib-jdk7-sources.jar
index a0eeabd..87a2b4c 100644
--- a/lib/kotlin-stdlib-jdk7-sources.jar
+++ b/lib/kotlin-stdlib-jdk7-sources.jar
diff --git a/lib/kotlin-stdlib-jdk7.jar b/lib/kotlin-stdlib-jdk7.jar
index 53b1dbc..1e026b1 100644
--- a/lib/kotlin-stdlib-jdk7.jar
+++ b/lib/kotlin-stdlib-jdk7.jar
diff --git a/lib/kotlin-stdlib-jdk8-sources.jar b/lib/kotlin-stdlib-jdk8-sources.jar
index 161ca17..219796e 100644
--- a/lib/kotlin-stdlib-jdk8-sources.jar
+++ b/lib/kotlin-stdlib-jdk8-sources.jar
diff --git a/lib/kotlin-stdlib-jdk8.jar b/lib/kotlin-stdlib-jdk8.jar
index b19c3e4..1451d36 100644
--- a/lib/kotlin-stdlib-jdk8.jar
+++ b/lib/kotlin-stdlib-jdk8.jar
diff --git a/lib/kotlin-stdlib-js-sources.jar b/lib/kotlin-stdlib-js-sources.jar
index d2fdadb..8500f84 100644
--- a/lib/kotlin-stdlib-js-sources.jar
+++ b/lib/kotlin-stdlib-js-sources.jar
diff --git a/lib/kotlin-stdlib-js.jar b/lib/kotlin-stdlib-js.jar
index 04052ff..65e3743 100644
--- a/lib/kotlin-stdlib-js.jar
+++ b/lib/kotlin-stdlib-js.jar
diff --git a/lib/kotlin-stdlib-sources.jar b/lib/kotlin-stdlib-sources.jar
index 7bc1b59..d447117 100644
--- a/lib/kotlin-stdlib-sources.jar
+++ b/lib/kotlin-stdlib-sources.jar
diff --git a/lib/kotlin-stdlib.jar b/lib/kotlin-stdlib.jar
index a539921..f84dc31 100644
--- a/lib/kotlin-stdlib.jar
+++ b/lib/kotlin-stdlib.jar
diff --git a/lib/kotlin-test-js-sources.jar b/lib/kotlin-test-js-sources.jar
index 69a61aa..5699169 100644
--- a/lib/kotlin-test-js-sources.jar
+++ b/lib/kotlin-test-js-sources.jar
diff --git a/lib/kotlin-test-js.jar b/lib/kotlin-test-js.jar
index 72964f9..6230916 100644
--- a/lib/kotlin-test-js.jar
+++ b/lib/kotlin-test-js.jar
diff --git a/lib/kotlin-test-junit-sources.jar b/lib/kotlin-test-junit-sources.jar
index 2abd360..7b46ec9 100644
--- a/lib/kotlin-test-junit-sources.jar
+++ b/lib/kotlin-test-junit-sources.jar
diff --git a/lib/kotlin-test-junit.jar b/lib/kotlin-test-junit.jar
index 02aa6e3..7ccd125 100644
--- a/lib/kotlin-test-junit.jar
+++ b/lib/kotlin-test-junit.jar
diff --git a/lib/kotlin-test-junit5-sources.jar b/lib/kotlin-test-junit5-sources.jar
index 52b9c8e..1f4f927 100644
--- a/lib/kotlin-test-junit5-sources.jar
+++ b/lib/kotlin-test-junit5-sources.jar
diff --git a/lib/kotlin-test-junit5.jar b/lib/kotlin-test-junit5.jar
index 6f638c1..619f43f 100644
--- a/lib/kotlin-test-junit5.jar
+++ b/lib/kotlin-test-junit5.jar
diff --git a/lib/kotlin-test-sources.jar b/lib/kotlin-test-sources.jar
index 050fce1..fe9b883 100644
--- a/lib/kotlin-test-sources.jar
+++ b/lib/kotlin-test-sources.jar
diff --git a/lib/kotlin-test-testng-sources.jar b/lib/kotlin-test-testng-sources.jar
index 6d18e39..e9ac367 100644
--- a/lib/kotlin-test-testng-sources.jar
+++ b/lib/kotlin-test-testng-sources.jar
diff --git a/lib/kotlin-test-testng.jar b/lib/kotlin-test-testng.jar
index 7100ca7..5c910ce 100644
--- a/lib/kotlin-test-testng.jar
+++ b/lib/kotlin-test-testng.jar
diff --git a/lib/kotlin-test.jar b/lib/kotlin-test.jar
index 39e98ad..ac437c1 100644
--- a/lib/kotlin-test.jar
+++ b/lib/kotlin-test.jar
diff --git a/lib/kotlinx-serialization-compiler-plugin.jar b/lib/kotlinx-serialization-compiler-plugin.jar
index f462450..d2a0679 100644
--- a/lib/kotlinx-serialization-compiler-plugin.jar
+++ b/lib/kotlinx-serialization-compiler-plugin.jar
diff --git a/lib/mutability-annotations-compat.jar b/lib/mutability-annotations-compat.jar
index f985526..21aa9e9 100644
--- a/lib/mutability-annotations-compat.jar
+++ b/lib/mutability-annotations-compat.jar
diff --git a/lib/noarg-compiler-plugin.jar b/lib/noarg-compiler-plugin.jar
index 7deb4af..cf1f2ba 100644
--- a/lib/noarg-compiler-plugin.jar
+++ b/lib/noarg-compiler-plugin.jar
diff --git a/lib/sam-with-receiver-compiler-plugin.jar b/lib/sam-with-receiver-compiler-plugin.jar
index 8bba928..1502726 100644
--- a/lib/sam-with-receiver-compiler-plugin.jar
+++ b/lib/sam-with-receiver-compiler-plugin.jar
diff --git a/lib/trove4j.jar b/lib/trove4j.jar
new file mode 100644
index 0000000..5eb0821
--- /dev/null
+++ b/lib/trove4j.jar