summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurimas Liutikas <aurimas@google.com>2021-07-22 23:02:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-07-22 23:02:37 +0000
commit6ae1e52faa454c252b8a6016e26bf9e862c10728 (patch)
treed8714750f7adc263a33ccc002175a8c87b84182c
parent2a37b656278e2fb7f265e96019faabb9c09ef0a7 (diff)
parent5efa9c12b9d96a57f2c875021db66bf5f6ba8d62 (diff)
downloadkotlinc-6ae1e52faa454c252b8a6016e26bf9e862c10728.tar.gz
Upgrade to kotlinc 1.5.21 am: d16115e7c7 am: 5efa9c12b9
Original change: https://android-review.googlesource.com/c/platform/external/kotlinc/+/1775565 Change-Id: I874c94e8aea956001e6fef990902e9a4377c8400
-rw-r--r--METADATA8
-rwxr-xr-xbin/kotlinc4
-rw-r--r--bin/kotlinc.bat10
-rw-r--r--build.txt2
-rw-r--r--lib/allopen-compiler-plugin.jarbin13382 -> 13500 bytes
-rw-r--r--lib/android-extensions-compiler.jarbin488136 -> 488276 bytes
-rw-r--r--lib/android-extensions-runtime.jarbin8940 -> 8862 bytes
-rw-r--r--lib/jvm-abi-gen.jarbin30063 -> 30062 bytes
-rw-r--r--lib/kotlin-annotation-processing-cli.jarbin26469 -> 26342 bytes
-rw-r--r--lib/kotlin-annotation-processing-runtime.jarbin1373 -> 1374 bytes
-rw-r--r--lib/kotlin-annotation-processing.jarbin430422 -> 440033 bytes
-rw-r--r--lib/kotlin-ant.jarbin25593 -> 25594 bytes
-rw-r--r--lib/kotlin-compiler.jarbin47816561 -> 49010831 bytes
-rw-r--r--lib/kotlin-daemon-client.jarbin674558 -> 679392 bytes
-rw-r--r--lib/kotlin-daemon.jarbin721752 -> 726354 bytes
-rw-r--r--lib/kotlin-imports-dumper-compiler-plugin.jarbin274431 -> 274435 bytes
-rw-r--r--lib/kotlin-main-kts.jarbin1638122 -> 1638069 bytes
-rw-r--r--lib/kotlin-preloader.jarbin52235 -> 52236 bytes
-rw-r--r--lib/kotlin-reflect-sources.jarbin684660 -> 690187 bytes
-rw-r--r--lib/kotlin-reflect.jarbin2971925 -> 2993761 bytes
-rw-r--r--lib/kotlin-runner.jarbin30343 -> 30261 bytes
-rw-r--r--lib/kotlin-script-runtime.jarbin41555 -> 41556 bytes
-rw-r--r--lib/kotlin-scripting-common.jarbin218668 -> 218623 bytes
-rw-r--r--lib/kotlin-scripting-compiler-impl.jarbin309799 -> 309873 bytes
-rw-r--r--lib/kotlin-scripting-compiler.jarbin402834 -> 404948 bytes
-rw-r--r--lib/kotlin-scripting-js.jarbin7775 -> 7776 bytes
-rw-r--r--lib/kotlin-scripting-jvm.jarbin195475 -> 195503 bytes
-rw-r--r--lib/kotlin-stdlib-jdk7.jarbin22987 -> 22988 bytes
-rw-r--r--lib/kotlin-stdlib-jdk8.jarbin16119 -> 16120 bytes
-rw-r--r--lib/kotlin-stdlib-js-sources.jarbin496474 -> 498054 bytes
-rw-r--r--lib/kotlin-stdlib-js.jarbin4099184 -> 4109852 bytes
-rw-r--r--lib/kotlin-stdlib-sources.jarbin505671 -> 506666 bytes
-rw-r--r--lib/kotlin-stdlib.jarbin1497594 -> 1497562 bytes
-rw-r--r--lib/kotlin-test-js.jarbin130702 -> 130705 bytes
-rw-r--r--lib/kotlin-test-junit.jarbin5139 -> 5140 bytes
-rw-r--r--lib/kotlin-test-junit5.jarbin5144 -> 5145 bytes
-rw-r--r--lib/kotlin-test-testng.jarbin5139 -> 5140 bytes
-rw-r--r--lib/kotlin-test.jarbin133820 -> 133820 bytes
-rw-r--r--lib/kotlinx-serialization-compiler-plugin.jarbin624877 -> 670741 bytes
-rw-r--r--lib/lombok-compiler-plugin.jarbin0 -> 102393 bytes
-rw-r--r--lib/noarg-compiler-plugin.jarbin48675 -> 45070 bytes
-rw-r--r--lib/parcelize-compiler.jarbin294453 -> 294475 bytes
-rw-r--r--lib/parcelize-runtime.jarbin5150 -> 5151 bytes
-rw-r--r--lib/sam-with-receiver-compiler-plugin.jarbin11778 -> 11778 bytes
-rw-r--r--license/README.md10
-rw-r--r--license/third_party/lombok_LICENSE.txt19
-rw-r--r--license/third_party/testdata/jspecify_license.txt202
47 files changed, 247 insertions, 8 deletions
diff --git a/METADATA b/METADATA
index d181aac..27bf2ef 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://github.com/JetBrains/kotlin/releases/download/v1.5.0/kotlin-compiler-1.5.0.zip"
+ value: "https://github.com/JetBrains/kotlin/releases/download/v1.5.21/kotlin-compiler-1.5.21.zip"
}
url {
type: ARCHIVE
value: "https://github.com/JetBrains/intellij-community/raw/171/lib/src/trove4j_src.jar"
}
- version: "v1.5.0"
+ version: "v1.5.21"
# would be RECIPROCAL save for:
# license/third_party/rhino_LICENSE.txt
# license/third_party/testdata/findbugs_license.txt
@@ -22,7 +22,7 @@ third_party {
license_type: RESTRICTED
last_upgrade_date {
year: 2021
- month: 5
- day: 5
+ month: 7
+ day: 22
}
}
diff --git a/bin/kotlinc b/bin/kotlinc
index b1cd401..c200606 100755
--- a/bin/kotlinc
+++ b/bin/kotlinc
@@ -52,6 +52,10 @@ while [ $# -gt 0 ]; do
;;
-J*)
java_args=("${java_args[@]}" "${1:2}")
+ if [ "x${1:2}" = "x" ]; then
+ echo "error: empty -J argument"
+ exit 1
+ fi
shift
;;
*)
diff --git a/bin/kotlinc.bat b/bin/kotlinc.bat
index 3c60526..c712d51 100644
--- a/bin/kotlinc.bat
+++ b/bin/kotlinc.bat
@@ -28,6 +28,10 @@ set _arg=%~1
if "%_arg%" == "" goto loopend
if "%_arg:~0,2%"=="-J" (
+ if "%_arg:~2%"=="" (
+ echo error: empty -J argument
+ goto error
+ )
set JAVA_OPTS=%JAVA_OPTS% "%_arg:~2%"
) else (
if "%_arg:~0,2%"=="-D" (
@@ -67,7 +71,6 @@ if "!_KOTLIN_RUNNER!"=="1" (
%_KOTLIN_COMPILER% %KOTLIN_OPTS%
)
-exit /b %ERRORLEVEL%
goto end
rem ##########################################################################
@@ -103,5 +106,8 @@ rem Needs to be executed in the EnableDelayedExpansion mode.
)
goto :eof
+:error
+set ERRORLEVEL=1
+
:end
-endlocal
+exit /b %ERRORLEVEL% \ No newline at end of file
diff --git a/build.txt b/build.txt
index 26e33f3..0ef1482 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-1.5.0-release-749 \ No newline at end of file
+1.5.21-release-314 \ No newline at end of file
diff --git a/lib/allopen-compiler-plugin.jar b/lib/allopen-compiler-plugin.jar
index d06d12e..c6b264a 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 9abcb78..e0aef21 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 d95483f..1b3d028 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 687fe1c..5bb30df 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 76087b5..ca924bd 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 4dd89d6..8f29aba 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 b19c9ed..99d51c4 100644
--- a/lib/kotlin-annotation-processing.jar
+++ b/lib/kotlin-annotation-processing.jar
Binary files differ
diff --git a/lib/kotlin-ant.jar b/lib/kotlin-ant.jar
index 8cc0415..61b7763 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 88a3b49..a37b775 100644
--- a/lib/kotlin-compiler.jar
+++ b/lib/kotlin-compiler.jar
Binary files differ
diff --git a/lib/kotlin-daemon-client.jar b/lib/kotlin-daemon-client.jar
index 92945ae..8d9ff4e 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 94465d8..bed7f94 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 4787671..8efa365 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 8208aeb..3bf62ce 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 7b1fee5..f575888 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 6e735d3..6ef42be 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 8b83527..518a3ae 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 ec926c9..aa63bbb 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 2c9c069..ba97e7b 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 5c398ea..ac7366b 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 26e7569..817a337 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 b74b4be..c27cb24 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 844e4f8..fb75230 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 6364596..0b7a023 100644
--- a/lib/kotlin-scripting-jvm.jar
+++ b/lib/kotlin-scripting-jvm.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-jdk7.jar b/lib/kotlin-stdlib-jdk7.jar
index f3afc25..e2a95bf 100644
--- a/lib/kotlin-stdlib-jdk7.jar
+++ b/lib/kotlin-stdlib-jdk7.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-jdk8.jar b/lib/kotlin-stdlib-jdk8.jar
index 47cd20a..8dc19ff 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 dba621d..6140bf3 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 23f1517..9c8b024 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 01a3196..941b678 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 c6cbf5d..9e8f807 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 b8e123a..5b6dae9 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 b16a0e7..c5e6467 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 96fb22b..34bb0c9 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 b166934..bb1113e 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 3f5b600..c9347be 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 48f64d5..a2dc47e 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
new file mode 100644
index 0000000..0e6362d
--- /dev/null
+++ b/lib/lombok-compiler-plugin.jar
Binary files differ
diff --git a/lib/noarg-compiler-plugin.jar b/lib/noarg-compiler-plugin.jar
index 934eb4c..be922d5 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 db6e953..9f7e359 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 44e9797..5fae71c 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 e02425f..21c2841 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 150af1e..4a67f27 100644
--- a/license/README.md
+++ b/license/README.md
@@ -122,7 +122,7 @@ any distributions of the compiler, libraries or plugin:
- License: LGPL 2.1 ([license/third_party/testdata/findbugs_license.txt][findbugs])
- Origin: Bytecode Analysis Framework, Copyright (C) 2005 University of Maryland
- - Path: third-party/jdk8-annotations/org/eclipse
+ - Path: third-party/java8-annotations/org/eclipse
- License: Eclipse Public License v1.0 ([license/third_party/testdata/eclipse_license.txt][eclipse])
- Origin: Eclipse JDT, Copyright (c) 2011, 2013 Stephan Herrmann and others.
@@ -130,6 +130,14 @@ any distributions of the compiler, libraries or plugin:
- License: Apache 2 ([license/third_party/testdata/rxjava_license.txt][rxjava])
- Origin: RxJava, Copyright (c) 2016-present, RxJava Contributors
+ - Path: third-party/java8-annotations/org/jspecify
+ - License: Apache 2 ([license/third_party/testdata/jspecify_license.txt][jspecify])
+ - Origin: JSpecify, Copyright (C) 2020 The JSpecify Authors
+
+ - Path: third-party/java9-annotations/org/jspecify
+ - License: Apache 2 ([license/third_party/testdata/jspecify_license.txt][jspecify])
+ - Origin: JSpecify, Copyright (C) 2020 The JSpecify Authors
+
- Path: third-party/annotations/lombok
- License: MIT ([license/third_party/testdata/lombok_license.txt][lombok])
- Origin: Project Lombok, Copyright (C) 2009-2013 The Project Lombok Authors
diff --git a/license/third_party/lombok_LICENSE.txt b/license/third_party/lombok_LICENSE.txt
new file mode 100644
index 0000000..dd1c24c
--- /dev/null
+++ b/license/third_party/lombok_LICENSE.txt
@@ -0,0 +1,19 @@
+Copyright (C) 2009-2021 The Project Lombok Authors.
+
+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/testdata/jspecify_license.txt b/license/third_party/testdata/jspecify_license.txt
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/license/third_party/testdata/jspecify_license.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.