Update kotlinc to 1.7.20 am: 4e3c9ce7ac am: 2383925909
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/2055028
Change-Id: Iad80c49783912c62f6fc15ef13fe3cb7c68dc44f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 2544416..b3ffdc7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -13,6 +13,7 @@
"external_kotlinc_assemblyscript_license",
"external_kotlinc_aosp_license",
"external_kotlinc_asmble_license",
+ "external_kotlinc_sun_license",
],
}
@@ -444,6 +445,19 @@
"license/third_party/scala_license.txt",
],
}
+
+license {
+ name: "external_kotlinc_sun_license",
+ visibility: [":__subpackages__"],
+ copyright_notice: "Copyright (C) 1993 by Sun Microsystems, Inc.",
+ license_kinds: [
+ "legacy_notice",
+ ],
+ license_text: [
+ "license/third_party/sun_license.txt",
+ ],
+}
+
license {
name: "external_kotlinc_teamcity_service_messages_license",
visibility: [":__subpackages__"],
diff --git a/LICENSE b/LICENSE
index 26bb0b3..be5b3c5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1710,6 +1710,14 @@
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
--------------------------------------------------------------------------------
+sun_license.txt:
+Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+Developed at SunSoft, a Sun Microsystems, Inc. business.
+Permission to use, copy, modify, and distribute this
+software is freely granted, provided that this notice
+is preserved.
+--------------------------------------------------------------------------------
trove_license.txt:
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
diff --git a/METADATA b/METADATA
index c2ecbc6..6399362 100644
--- a/METADATA
+++ b/METADATA
@@ -7,22 +7,18 @@
}
url {
type: ARCHIVE
- value: "https://github.com/JetBrains/kotlin/releases/download/v1.6.10/kotlin-compiler-1.6.10.zip"
+ value: "https://github.com/JetBrains/kotlin/releases/download/v1.7.20/kotlin-compiler-1.7.20.zip"
}
url {
type: ARCHIVE
value: "https://github.com/JetBrains/intellij-community/raw/171/lib/src/trove4j_src.jar"
}
- version: "v1.6.10"
- license_note: "would be RECIPROCAL save for:\n"
- " license/third_party/rhino_LICENSE.txt\n"
- " license/third_party/testdata/findbugs_license.txt\n"
- " license/third_party/trove_license.txt\n"
- " license/third_party/trove_readme_license.txt"
+ version: "v1.7.20"
license_type: RESTRICTED
+ license_note: "would be RECIPROCAL save for:\n license/third_party/rhino_LICENSE.txt\n license/third_party/testdata/findbugs_license.txt\n license/third_party/trove_license.txt\n license/third_party/trove_readme_license.txt"
last_upgrade_date {
- year: 2021
- month: 12
- day: 14
+ year: 2022
+ month: 9
+ day: 29
}
}
diff --git a/build.txt b/build.txt
index 754822d..eea7cb2 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-1.6.10-release-923
\ No newline at end of file
+1.7.20-release-201
\ No newline at end of file
diff --git a/lib/allopen-compiler-plugin.jar b/lib/allopen-compiler-plugin.jar
index 2d3076f..c274580 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 deeea78..4f77f4c 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 39e20b4..b176b2f 100644
--- a/lib/android-extensions-runtime.jar
+++ b/lib/android-extensions-runtime.jar
Binary files differ
diff --git a/lib/js.engines.jar b/lib/js.engines.jar
index 03dab9c..33683e4 100644
--- a/lib/js.engines.jar
+++ b/lib/js.engines.jar
Binary files differ
diff --git a/lib/jvm-abi-gen.jar b/lib/jvm-abi-gen.jar
index e06a443..7043a0c 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 4d4763a..576813f 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 c615d7e..2b49c3a 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 2c090fa..de97800 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
deleted file mode 100644
index 536c1a7..0000000
--- a/lib/kotlin-annotations-android.jar
+++ /dev/null
Binary files differ
diff --git a/lib/kotlin-ant.jar b/lib/kotlin-ant.jar
index 9d8788d..148703b 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 2cd6ad7..48fe2dc 100644
--- a/lib/kotlin-compiler.jar
+++ b/lib/kotlin-compiler.jar
Binary files differ
diff --git a/lib/kotlin-coroutines-experimental-compat-sources.jar b/lib/kotlin-coroutines-experimental-compat-sources.jar
deleted file mode 100644
index 9746779..0000000
--- a/lib/kotlin-coroutines-experimental-compat-sources.jar
+++ /dev/null
Binary files differ
diff --git a/lib/kotlin-coroutines-experimental-compat.jar b/lib/kotlin-coroutines-experimental-compat.jar
deleted file mode 100644
index 91e5f2a..0000000
--- a/lib/kotlin-coroutines-experimental-compat.jar
+++ /dev/null
Binary files differ
diff --git a/lib/kotlin-daemon-client.jar b/lib/kotlin-daemon-client.jar
index b8c3baa..38e5ad1 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 effc054..7060740 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 e916491..be875b2 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 fa632bb..b0d4449 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 79f63e4..3e74112 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 c9ce0fe..bd32cf6 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 f3253b2..a35d985 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 bd7ad60..f8d4561 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 75918fb..597a4a9 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 eef6c4a..66962ae 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 8cd89ac..4b16308 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 7aeec3a..c69bf25 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 28f5a15..7fc38af 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 1a92c8d..acdb88f 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 20890c5d..3257af7 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 1101d1e..a25952a 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 8b6bf9b..0d7b0fc 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 e8b18f4..8a35a6d 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 32640b4..e415aab 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 0d2c92d..3b9bb46 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 7d5cf03..03a219d 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 22ade51..db2272f 100644
--- a/lib/kotlin-stdlib.jar
+++ b/lib/kotlin-stdlib.jar
Binary files differ
diff --git a/lib/kotlin-test-js-sources.jar b/lib/kotlin-test-js-sources.jar
index 5493d36..e3d608e 100644
--- a/lib/kotlin-test-js-sources.jar
+++ b/lib/kotlin-test-js-sources.jar
Binary files differ
diff --git a/lib/kotlin-test-js.jar b/lib/kotlin-test-js.jar
index 5fdc0d2..1188030 100644
--- a/lib/kotlin-test-js.jar
+++ b/lib/kotlin-test-js.jar
Binary files differ
diff --git a/lib/kotlin-test-junit.jar b/lib/kotlin-test-junit.jar
index 0e547bd..aefc86e 100644
--- a/lib/kotlin-test-junit.jar
+++ b/lib/kotlin-test-junit.jar
Binary files differ
diff --git a/lib/kotlin-test-junit5.jar b/lib/kotlin-test-junit5.jar
index 2d447be..e956a2d 100644
--- a/lib/kotlin-test-junit5.jar
+++ b/lib/kotlin-test-junit5.jar
Binary files differ
diff --git a/lib/kotlin-test-testng.jar b/lib/kotlin-test-testng.jar
index 1420c89..6e3c1f0 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 eeb862d..0e0b4bc 100644
--- a/lib/kotlin-test.jar
+++ b/lib/kotlin-test.jar
Binary files differ
diff --git a/lib/kotlinx-coroutines-core.jar b/lib/kotlinx-coroutines-core.jar
deleted file mode 100644
index 44d73ec..0000000
--- a/lib/kotlinx-coroutines-core.jar
+++ /dev/null
Binary files differ
diff --git a/lib/kotlinx-serialization-compiler-plugin.jar b/lib/kotlinx-serialization-compiler-plugin.jar
index 0bc2753..2d8e1cc 100644
--- a/lib/kotlinx-serialization-compiler-plugin.jar
+++ b/lib/kotlinx-serialization-compiler-plugin.jar
Binary files differ
diff --git a/lib/lombok-compiler-plugin.jar b/lib/lombok-compiler-plugin.jar
index 56f574e..99a4116 100644
--- a/lib/lombok-compiler-plugin.jar
+++ b/lib/lombok-compiler-plugin.jar
Binary files differ
diff --git a/lib/noarg-compiler-plugin.jar b/lib/noarg-compiler-plugin.jar
index cb57e04..7ffe80d 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
index 9148d62..d5930e2 100644
--- a/lib/parcelize-compiler.jar
+++ b/lib/parcelize-compiler.jar
Binary files differ
diff --git a/lib/parcelize-runtime.jar b/lib/parcelize-runtime.jar
index 6ad778f..e5dd1e9 100644
--- a/lib/parcelize-runtime.jar
+++ 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 266ec7a..4c27ce5 100644
--- a/lib/sam-with-receiver-compiler-plugin.jar
+++ b/lib/sam-with-receiver-compiler-plugin.jar
Binary files differ
diff --git a/license/README.md b/license/README.md
index fac8341..5f0aa9f 100644
--- a/license/README.md
+++ b/license/README.md
@@ -81,6 +81,10 @@
- License: Apache 2 ([license/third_party/gwt_license.txt][gwt])
- Origin: Derived from GWT, (C) 2007-08 Google Inc.
+ - Path: libraries/stdlib/native-wasm/src/kotlin/collections
+ - License: Apache 2 ([license/third_party/gwt_license.txt][gwt])
+ - Origin: Derived from GWT, (C) 2007-08 Google Inc.
+
- Path: libraries/stdlib/js-v1/src/js/long.js
- License: Apache 2 ([license/third_party/closure-compiler_LICENSE.txt][closure-compiler])
- Origin: Google Closure Library, Copyright 2009 The Closure Library Authors
@@ -89,6 +93,10 @@
- License: Boost Software License 1.0 ([license/third_party/boost_LICENSE.txt][boost])
- Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
+ - Path: libraries/stdlib/js/src/kotlin/js/math.polyfills.kt
+ - License: Boost Software License 1.0 ([license/third_party/boost_LICENSE.txt][boost])
+ - Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
+
- Path: libraries/stdlib/wasm/internal/kotlin/wasm/internal/Number2String.kt
- License: Apache 2 ([third_party/assemblyscript_license.txt][assemblyscript])
- Origin: Derived from assemblyscript standard library
@@ -117,6 +125,18 @@
- License: Apache 2 ([license/third_party/aosp_license.txt][aosp])
- Origin: Derived from JetPack Compose compiler plugin code, Copyright 2019 The Android Open Source Project
+ - Path: libraries/stdlib/wasm/src/kotlin/text/FloatingPointConverter.kt
+ - License: MIT ([license/third_party/asmble_license.txt][asmble])
+ - Origin: Copyright (C) 2018 Chad Retz
+
+ - Path: libraries/stdlib/wasm/src/kotlin/math/fdlibm/
+ - License: SUN ([license/third_party/sun_license.txt][sun])
+ - Origin: Copyright (C) 1993 by Sun Microsystems, Inc.
+
+ - Path: kotlin-native/runtime/src/main/cpp/Utils.cpp
+ - License: Boost Software License 1.0 ([license/third_party/boost_LICENSE.txt][boost])
+ - Origin: Derived from boost hash functions, Copyright 2005-2014 Daniel James
+
## Kotlin Test Data
The following source code is used for testing the Kotlin compiler and/or plugin and is not incorporated into
diff --git a/license/third_party/jgit_license.txt b/license/third_party/jgit_license.txt
new file mode 100644
index 0000000..63acd9e
--- /dev/null
+++ b/license/third_party/jgit_license.txt
@@ -0,0 +1,15 @@
+https://www.eclipse.org/jgit/
+
+Eclipse Distribution License - v 1.0
+
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+ Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+ Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/license/third_party/okhttp_license.txt b/license/third_party/okhttp_license.txt
new file mode 100644
index 0000000..9b57b26
--- /dev/null
+++ b/license/third_party/okhttp_license.txt
@@ -0,0 +1,15 @@
+https://github.com/square/okhttp/
+
+Copyright 2019 Square, Inc.
+
+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.
diff --git a/license/third_party/sl4f_license.txt b/license/third_party/sl4f_license.txt
new file mode 100644
index 0000000..fc8ffab
--- /dev/null
+++ b/license/third_party/sl4f_license.txt
@@ -0,0 +1,25 @@
+http://www.slf4j.org
+
+ MIT License
+
+ Copyright (c) 2004-2017 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/license/third_party/sun_license.txt b/license/third_party/sun_license.txt
new file mode 100644
index 0000000..38329b9
--- /dev/null
+++ b/license/third_party/sun_license.txt
@@ -0,0 +1,6 @@
+Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+
+Developed at SunSoft, a Sun Microsystems, Inc. business.
+Permission to use, copy, modify, and distribute this
+software is freely granted, provided that this notice
+is preserved.
\ No newline at end of file
