diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-13 21:10:03 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-05-13 21:10:03 +0000 |
commit | b17aaf4cd1f07d1af5ac62e41743c2d119076b3f (patch) | |
tree | a081613ed74029848a681382071addc16821f811 | |
parent | 87cdcd1a94b0672e7ec0652b616af30563237f3a (diff) | |
parent | 3f86a6c9deae72028f8276d9d489ecf308864275 (diff) | |
download | kotlinc-android12L-d2-s2-release.tar.gz |
Snap for 7358968 from 3f86a6c9deae72028f8276d9d489ecf308864275 to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Change-Id: Ia7163edf66b6d13504241a00c7f083e193af053d
-rw-r--r-- | METADATA | 8 | ||||
-rwxr-xr-x | bin/kapt | 15 | ||||
-rw-r--r-- | bin/kapt.bat | 15 | ||||
-rwxr-xr-x | bin/kotlin | 15 | ||||
-rwxr-xr-x | bin/kotlin-dce-js | 15 | ||||
-rw-r--r-- | bin/kotlin-dce-js.bat | 15 | ||||
-rw-r--r-- | bin/kotlin.bat | 15 | ||||
-rwxr-xr-x | bin/kotlinc | 40 | ||||
-rwxr-xr-x | bin/kotlinc-js | 15 | ||||
-rw-r--r-- | bin/kotlinc-js.bat | 15 | ||||
-rwxr-xr-x | bin/kotlinc-jvm | 15 | ||||
-rw-r--r-- | bin/kotlinc-jvm.bat | 15 | ||||
-rw-r--r-- | bin/kotlinc.bat | 65 | ||||
-rw-r--r-- | build.txt | 2 | ||||
-rw-r--r-- | lib/allopen-compiler-plugin.jar | bin | 13382 -> 13535 bytes | |||
-rw-r--r-- | lib/android-extensions-compiler.jar | bin | 488136 -> 491694 bytes | |||
-rw-r--r-- | lib/android-extensions-runtime.jar | bin | 8940 -> 9062 bytes | |||
-rw-r--r-- | lib/js.engines.jar | bin | 11091 -> 10202 bytes | |||
-rw-r--r-- | lib/jvm-abi-gen.jar | bin | 30063 -> 31010 bytes | |||
-rw-r--r-- | lib/kotlin-annotation-processing-cli.jar | bin | 26469 -> 26494 bytes | |||
-rw-r--r-- | lib/kotlin-annotation-processing-runtime.jar | bin | 1373 -> 1389 bytes | |||
-rw-r--r-- | lib/kotlin-annotation-processing.jar | bin | 430422 -> 431805 bytes | |||
-rw-r--r-- | lib/kotlin-ant.jar | bin | 25593 -> 24588 bytes | |||
-rw-r--r-- | lib/kotlin-compiler.jar | bin | 47816561 -> 48245785 bytes | |||
-rw-r--r-- | lib/kotlin-daemon-client.jar | bin | 674558 -> 678058 bytes | |||
-rw-r--r-- | lib/kotlin-daemon.jar | bin | 721752 -> 725153 bytes | |||
-rw-r--r-- | lib/kotlin-imports-dumper-compiler-plugin.jar | bin | 274431 -> 274515 bytes | |||
-rw-r--r-- | lib/kotlin-main-kts.jar | bin | 1638122 -> 1644929 bytes | |||
-rw-r--r-- | lib/kotlin-preloader.jar | bin | 52235 -> 52235 bytes | |||
-rw-r--r-- | lib/kotlin-reflect-sources.jar | bin | 684660 -> 683883 bytes | |||
-rw-r--r-- | lib/kotlin-reflect.jar | bin | 2971925 -> 2974472 bytes | |||
-rw-r--r-- | lib/kotlin-runner.jar | bin | 30343 -> 31660 bytes | |||
-rw-r--r-- | lib/kotlin-script-runtime.jar | bin | 41555 -> 42041 bytes | |||
-rw-r--r-- | lib/kotlin-scripting-common.jar | bin | 218668 -> 220356 bytes | |||
-rw-r--r-- | lib/kotlin-scripting-compiler-impl.jar | bin | 309799 -> 317797 bytes | |||
-rw-r--r-- | lib/kotlin-scripting-compiler.jar | bin | 402834 -> 385112 bytes | |||
-rw-r--r-- | lib/kotlin-scripting-js.jar | bin | 7775 -> 9795 bytes | |||
-rw-r--r-- | lib/kotlin-scripting-jvm.jar | bin | 195475 -> 196280 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib-jdk7-sources.jar | bin | 12130 -> 12003 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib-jdk7.jar | bin | 22987 -> 22890 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib-jdk8-sources.jar | bin | 6456 -> 6451 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib-jdk8.jar | bin | 16119 -> 16216 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib-js-sources.jar | bin | 496474 -> 479021 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib-js.jar | bin | 4099184 -> 5192110 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib-sources.jar | bin | 505671 -> 494918 bytes | |||
-rw-r--r-- | lib/kotlin-stdlib.jar | bin | 1497594 -> 1495016 bytes | |||
-rw-r--r-- | lib/kotlin-test-js.jar | bin | 130702 -> 67668 bytes | |||
-rw-r--r-- | lib/kotlin-test-junit.jar | bin | 5139 -> 5178 bytes | |||
-rw-r--r-- | lib/kotlin-test-junit5.jar | bin | 5144 -> 5191 bytes | |||
-rw-r--r-- | lib/kotlin-test-sources.jar | bin | 2272 -> 2040 bytes | |||
-rw-r--r-- | lib/kotlin-test-testng.jar | bin | 5139 -> 5181 bytes | |||
-rw-r--r-- | lib/kotlin-test.jar | bin | 133820 -> 25279 bytes | |||
-rw-r--r-- | lib/kotlinx-serialization-compiler-plugin.jar | bin | 624877 -> 604617 bytes | |||
-rw-r--r-- | lib/noarg-compiler-plugin.jar | bin | 48675 -> 49006 bytes | |||
-rw-r--r-- | lib/parcelize-compiler.jar | bin | 294453 -> 295854 bytes | |||
-rw-r--r-- | lib/parcelize-runtime.jar | bin | 5150 -> 5240 bytes | |||
-rw-r--r-- | lib/sam-with-receiver-compiler-plugin.jar | bin | 11778 -> 11900 bytes | |||
-rw-r--r-- | license/COPYRIGHT_HEADER.txt | 4 |
58 files changed, 166 insertions, 103 deletions
@@ -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.4.30/kotlin-compiler-1.4.30.zip" } url { type: ARCHIVE value: "https://github.com/JetBrains/intellij-community/raw/171/lib/src/trove4j_src.jar" } - version: "v1.5.0" + version: "v1.4.30" # 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: 2 + day: 17 } } @@ -1,7 +1,18 @@ #!/usr/bin/env bash -# Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. -# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. +# 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 diff --git a/bin/kapt.bat b/bin/kapt.bat index 245a409..dacbc54 100644 --- a/bin/kapt.bat +++ b/bin/kapt.bat @@ -1,7 +1,18 @@ @echo off
-rem Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
-rem Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+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
@@ -1,7 +1,18 @@ #!/usr/bin/env bash -# Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. -# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. +# 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_RUNNER=1 diff --git a/bin/kotlin-dce-js b/bin/kotlin-dce-js index 5526054..aa4cfdd 100755 --- a/bin/kotlin-dce-js +++ b/bin/kotlin-dce-js @@ -1,7 +1,18 @@ #!/usr/bin/env bash -# Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. -# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. +# Copyright 2010-2017 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_COMPILER=org.jetbrains.kotlin.cli.js.dce.K2JSDce diff --git a/bin/kotlin-dce-js.bat b/bin/kotlin-dce-js.bat index fca25f7..5d0b0c4 100644 --- a/bin/kotlin-dce-js.bat +++ b/bin/kotlin-dce-js.bat @@ -1,7 +1,18 @@ @echo off
-rem Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
-rem Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+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.cli.js.dce.K2JSDce
diff --git a/bin/kotlin.bat b/bin/kotlin.bat index 7cbd49f..fcbbd1f 100644 --- a/bin/kotlin.bat +++ b/bin/kotlin.bat @@ -1,7 +1,18 @@ @echo off
-rem Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
-rem Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+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_RUNNER=1
diff --git a/bin/kotlinc b/bin/kotlinc index b1cd401..7f45ac9 100755 --- a/bin/kotlinc +++ b/bin/kotlinc @@ -1,9 +1,13 @@ #!/usr/bin/env bash - -# Based on scalac from the Scala distribution +# +############################################################################## # Copyright 2002-2011, LAMP/EPFL -# Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. -# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. +# Copyright 2011-2015, JetBrains +# +# This is free software; see the distribution for copying conditions. +# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. +############################################################################## cygwin=false; case "`uname`" in @@ -21,17 +25,6 @@ findKotlinHome() { (cd -P "$(dirname "$source")/.." && pwd) } -findJavaVersion() { - # Note that this only loads the first component of the version, so "1.8.0_265" -> "1". - # But it's fine because major version is 9 for JDK 9, and so on. - regex='^.*version "([[:digit:]]+).*$' - while read -r line; do - if [[ "$line" =~ $regex ]]; then - echo ${BASH_REMATCH[1]} - fi - done <<< $("${JAVACMD:=java}" -version 2>&1) -} - KOTLIN_HOME="$(findKotlinHome)" if $cygwin; then @@ -67,24 +60,17 @@ fi declare -a kotlin_app -java_version="$(findJavaVersion)" -if [[ $java_version -ge 9 ]]; then - # Workaround the illegal reflective access warning from ReflectionUtil to ResourceBundle.setParent, see IDEA-248785. - java_args=("${java_args[@]}" "--add-opens" "java.base/java.util=ALL-UNNAMED") -fi - -if [ -n "$KOTLIN_RUNNER" ]; then +if [ -n "$KOTLIN_RUNNER" ]; +then java_args=("${java_args[@]}" "-Dkotlin.home=${KOTLIN_HOME}") kotlin_app=("${KOTLIN_HOME}/lib/kotlin-runner.jar" "org.jetbrains.kotlin.runner.Main") else [ -n "$KOTLIN_COMPILER" ] || KOTLIN_COMPILER=org.jetbrains.kotlin.cli.jvm.K2JVMCompiler - - if [[ $java_version < 13 ]]; then - java_args=("${java_args[@]}" "-noverify") - fi + java_args=("${java_args[@]}" "-noverify") declare additional_classpath="" - if [ -n "$KOTLIN_TOOL" ]; then + if [ -n "$KOTLIN_TOOL" ]; + then additional_classpath=":${KOTLIN_HOME}/lib/${KOTLIN_TOOL}" fi diff --git a/bin/kotlinc-js b/bin/kotlinc-js index 1ed7904..72a0403 100755 --- a/bin/kotlinc-js +++ b/bin/kotlinc-js @@ -1,7 +1,18 @@ #!/usr/bin/env bash -# Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. -# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. +# 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_COMPILER=org.jetbrains.kotlin.cli.js.K2JSCompiler diff --git a/bin/kotlinc-js.bat b/bin/kotlinc-js.bat index b6c65c0..b3b5c24 100644 --- a/bin/kotlinc-js.bat +++ b/bin/kotlinc-js.bat @@ -1,7 +1,18 @@ @echo off
-rem Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
-rem Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+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.cli.js.K2JSCompiler
diff --git a/bin/kotlinc-jvm b/bin/kotlinc-jvm index 4ca34f7..9725efa 100755 --- a/bin/kotlinc-jvm +++ b/bin/kotlinc-jvm @@ -1,7 +1,18 @@ #!/usr/bin/env bash -# Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. -# Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. +# 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. DIR="${BASH_SOURCE[0]%/*}" : ${DIR:="."} diff --git a/bin/kotlinc-jvm.bat b/bin/kotlinc-jvm.bat index e56d302..a4f620a 100644 --- a/bin/kotlinc-jvm.bat +++ b/bin/kotlinc-jvm.bat @@ -1,6 +1,17 @@ @echo off
-rem Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
-rem Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+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.
call %~dps0kotlinc.bat %*
diff --git a/bin/kotlinc.bat b/bin/kotlinc.bat index 3c60526..81edc5d 100644 --- a/bin/kotlinc.bat +++ b/bin/kotlinc.bat @@ -1,9 +1,13 @@ @echo off
-
-rem Based on scalac.bat from the Scala distribution
-rem Copyright 2002-2011, LAMP/EPFL
-rem Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
-rem Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+rem based on scalac.bat from the Scala distribution
+rem ##########################################################################
+rem # Copyright 2002-2011, LAMP/EPFL
+rem # Copyright 2011-2015, JetBrains
+rem #
+rem # This is free software; see the distribution for copying conditions.
+rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+rem # PARTICULAR PURPOSE.
+rem ##########################################################################
rem We adopt the following conventions:
rem - System/user environment variables start with a letter
@@ -15,10 +19,11 @@ call :set_home if "%_KOTLIN_COMPILER%"=="" set _KOTLIN_COMPILER=org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
if not "%JAVA_HOME%"=="" (
- rem Prepend JAVA_HOME to local PATH to be able to simply execute "java" later in the script.
- set "PATH=%JAVA_HOME%\bin;%PATH%"
+ if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe"
)
+if "%_JAVACMD%"=="" set _JAVACMD=java
+
rem We use the value of the JAVA_OPTS environment variable if defined
if "%JAVA_OPTS%"=="" set JAVA_OPTS=-Xmx256M -Xms32M
@@ -40,29 +45,18 @@ shift goto loop
:loopend
-setlocal EnableDelayedExpansion
-
-call :set_java_version
-if !_java_major_version! geq 9 (
- rem Workaround the illegal reflective access warning from ReflectionUtil to ResourceBundle.setParent, see IDEA-248785.
- set JAVA_OPTS=!JAVA_OPTS! "--add-opens" "java.base/java.util=ALL-UNNAMED"
-)
-
-if "!_KOTLIN_RUNNER!"=="1" (
- java !JAVA_OPTS! "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^
+if "%_KOTLIN_RUNNER%"=="1" (
+ "%_JAVACMD%" %JAVA_OPTS% "-Dkotlin.home=%_KOTLIN_HOME%" -cp "%_KOTLIN_HOME%\lib\kotlin-runner.jar" ^
org.jetbrains.kotlin.runner.Main %KOTLIN_OPTS%
) else (
- set _ADDITIONAL_CLASSPATH=
-
- if !_java_major_version! lss 13 (
- set JAVA_OPTS=!JAVA_OPTS! "-noverify"
- )
+ setlocal EnableDelayedExpansion
+ SET _ADDITIONAL_CLASSPATH=
if not "%_KOTLIN_TOOL%"=="" (
set _ADDITIONAL_CLASSPATH=;%_KOTLIN_HOME%\lib\%_KOTLIN_TOOL%
)
- java !JAVA_OPTS! -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
+ "%_JAVACMD%" %JAVA_OPTS% -noverify -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^
org.jetbrains.kotlin.preloading.Preloader -cp "%_KOTLIN_HOME%\lib\kotlin-compiler.jar!_ADDITIONAL_CLASSPATH!" ^
%_KOTLIN_COMPILER% %KOTLIN_OPTS%
)
@@ -79,29 +73,6 @@ rem # subroutines set _KOTLIN_HOME=%_BIN_DIR%..
goto :eof
-rem Parses "java -version" output and stores the major version to _java_major_version.
-rem Note that this only loads the first component of the version, so "1.8.0_265" -> "1".
-rem But it's fine because major version is 9 for JDK 9, and so on.
-rem Needs to be executed in the EnableDelayedExpansion mode.
-:set_java_version
- set _version=
- rem Parse output and take the third token from the string containing " version ".
- rem It should be something like "1.8.0_275" or "15.0.1".
- for /f "tokens=3" %%i in ('java -version 2^>^&1 ^| findstr /i " version "') do (
- rem Split the string by "-" or "." and take the first token.
- for /f "delims=-. tokens=1" %%j in ("%%i") do (
- rem At this point, _version should be something like "1 or "15. Note the leading quote.
- set _version=%%j
- )
- )
- if "!_version!"=="" (
- rem If failed to parse the output, set the version to 1.
- set _java_major_version=1
- ) else (
- rem Strip the leading quote.
- set _java_major_version=!_version:~1!
- )
-goto :eof
-
:end
endlocal
+
@@ -1 +1 @@ -1.5.0-release-749
\ No newline at end of file +1.4.30-release-302
\ No newline at end of file diff --git a/lib/allopen-compiler-plugin.jar b/lib/allopen-compiler-plugin.jar Binary files differindex d06d12e..8aad3b3 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 Binary files differindex 9abcb78..c7f5a2c 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 Binary files differindex d95483f..0f9f519 100644 --- a/lib/android-extensions-runtime.jar +++ b/lib/android-extensions-runtime.jar diff --git a/lib/js.engines.jar b/lib/js.engines.jar Binary files differindex 377d608..935bb7b 100644 --- a/lib/js.engines.jar +++ b/lib/js.engines.jar diff --git a/lib/jvm-abi-gen.jar b/lib/jvm-abi-gen.jar Binary files differindex 687fe1c..07f7807 100644 --- a/lib/jvm-abi-gen.jar +++ b/lib/jvm-abi-gen.jar diff --git a/lib/kotlin-annotation-processing-cli.jar b/lib/kotlin-annotation-processing-cli.jar Binary files differindex 76087b5..605ec4d 100644 --- a/lib/kotlin-annotation-processing-cli.jar +++ b/lib/kotlin-annotation-processing-cli.jar diff --git a/lib/kotlin-annotation-processing-runtime.jar b/lib/kotlin-annotation-processing-runtime.jar Binary files differindex 4dd89d6..2282892 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 Binary files differindex b19c9ed..6b94c97 100644 --- a/lib/kotlin-annotation-processing.jar +++ b/lib/kotlin-annotation-processing.jar diff --git a/lib/kotlin-ant.jar b/lib/kotlin-ant.jar Binary files differindex 8cc0415..6f1190d 100644 --- a/lib/kotlin-ant.jar +++ b/lib/kotlin-ant.jar diff --git a/lib/kotlin-compiler.jar b/lib/kotlin-compiler.jar Binary files differindex 88a3b49..8569317 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 Binary files differindex 92945ae..42a1132 100644 --- a/lib/kotlin-daemon-client.jar +++ b/lib/kotlin-daemon-client.jar diff --git a/lib/kotlin-daemon.jar b/lib/kotlin-daemon.jar Binary files differindex 94465d8..d8eabe5 100644 --- a/lib/kotlin-daemon.jar +++ b/lib/kotlin-daemon.jar diff --git a/lib/kotlin-imports-dumper-compiler-plugin.jar b/lib/kotlin-imports-dumper-compiler-plugin.jar Binary files differindex 4787671..1e2f882 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 Binary files differindex 8208aeb..9fb178b 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 Binary files differindex 7b1fee5..1f76885 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 Binary files differindex 6e735d3..1a7573e 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 Binary files differindex 8b83527..5fba5f5 100644 --- a/lib/kotlin-reflect.jar +++ b/lib/kotlin-reflect.jar diff --git a/lib/kotlin-runner.jar b/lib/kotlin-runner.jar Binary files differindex ec926c9..4a2c2fd 100644 --- a/lib/kotlin-runner.jar +++ b/lib/kotlin-runner.jar diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar Binary files differindex 2c9c069..cf275c6 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 Binary files differindex 5c398ea..fa44343 100644 --- a/lib/kotlin-scripting-common.jar +++ b/lib/kotlin-scripting-common.jar diff --git a/lib/kotlin-scripting-compiler-impl.jar b/lib/kotlin-scripting-compiler-impl.jar Binary files differindex 26e7569..14cbc86 100644 --- a/lib/kotlin-scripting-compiler-impl.jar +++ b/lib/kotlin-scripting-compiler-impl.jar diff --git a/lib/kotlin-scripting-compiler.jar b/lib/kotlin-scripting-compiler.jar Binary files differindex b74b4be..81c93d1 100644 --- a/lib/kotlin-scripting-compiler.jar +++ b/lib/kotlin-scripting-compiler.jar diff --git a/lib/kotlin-scripting-js.jar b/lib/kotlin-scripting-js.jar Binary files differindex 844e4f8..f7d101c 100644 --- a/lib/kotlin-scripting-js.jar +++ b/lib/kotlin-scripting-js.jar diff --git a/lib/kotlin-scripting-jvm.jar b/lib/kotlin-scripting-jvm.jar Binary files differindex 6364596..300f2cb 100644 --- a/lib/kotlin-scripting-jvm.jar +++ b/lib/kotlin-scripting-jvm.jar diff --git a/lib/kotlin-stdlib-jdk7-sources.jar b/lib/kotlin-stdlib-jdk7-sources.jar Binary files differindex 20890c5..5dbca97 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 Binary files differindex f3afc25..251a931 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 Binary files differindex def9b42..74f0d7a 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 Binary files differindex 47cd20a..1eb78bf 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 Binary files differindex dba621d..969b851 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 Binary files differindex 23f1517..264f8e8 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 Binary files differindex 01a3196..216950e 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 Binary files differindex c6cbf5d..9084794 100644 --- a/lib/kotlin-stdlib.jar +++ b/lib/kotlin-stdlib.jar diff --git a/lib/kotlin-test-js.jar b/lib/kotlin-test-js.jar Binary files differindex b8e123a..b0fff68 100644 --- a/lib/kotlin-test-js.jar +++ b/lib/kotlin-test-js.jar diff --git a/lib/kotlin-test-junit.jar b/lib/kotlin-test-junit.jar Binary files differindex b16a0e7..dd93e0e 100644 --- a/lib/kotlin-test-junit.jar +++ b/lib/kotlin-test-junit.jar diff --git a/lib/kotlin-test-junit5.jar b/lib/kotlin-test-junit5.jar Binary files differindex 96fb22b..e6b7e0c 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 Binary files differindex 212e8f9..a4e895b 100644 --- a/lib/kotlin-test-sources.jar +++ b/lib/kotlin-test-sources.jar diff --git a/lib/kotlin-test-testng.jar b/lib/kotlin-test-testng.jar Binary files differindex b166934..15f7051 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 Binary files differindex 3f5b600..43fef60 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 Binary files differindex 48f64d5..4f561b2 100644 --- a/lib/kotlinx-serialization-compiler-plugin.jar +++ b/lib/kotlinx-serialization-compiler-plugin.jar diff --git a/lib/noarg-compiler-plugin.jar b/lib/noarg-compiler-plugin.jar Binary files differindex 934eb4c..04d59cc 100644 --- a/lib/noarg-compiler-plugin.jar +++ b/lib/noarg-compiler-plugin.jar diff --git a/lib/parcelize-compiler.jar b/lib/parcelize-compiler.jar Binary files differindex db6e953..f2d3b8c 100644 --- a/lib/parcelize-compiler.jar +++ b/lib/parcelize-compiler.jar diff --git a/lib/parcelize-runtime.jar b/lib/parcelize-runtime.jar Binary files differindex 44e9797..8b0d1e4 100644 --- a/lib/parcelize-runtime.jar +++ b/lib/parcelize-runtime.jar diff --git a/lib/sam-with-receiver-compiler-plugin.jar b/lib/sam-with-receiver-compiler-plugin.jar Binary files differindex e02425f..8a08c0a 100644 --- a/lib/sam-with-receiver-compiler-plugin.jar +++ b/lib/sam-with-receiver-compiler-plugin.jar diff --git a/license/COPYRIGHT_HEADER.txt b/license/COPYRIGHT_HEADER.txt deleted file mode 100644 index 41296a4..0000000 --- a/license/COPYRIGHT_HEADER.txt +++ /dev/null @@ -1,4 +0,0 @@ -/* - * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */
\ No newline at end of file |