summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2018-06-07 20:41:00 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-06-07 20:41:00 -0700
commita75a62bd5d7b33d070e0a615ab6fd160eb20ad2d (patch)
tree2a60deb0547611fb9076e7437231ed06dcacb318
parent426d1b1f30e31b8405b8160dc548f89237532cff (diff)
parent481e6ef3b61d389d079427a0566273a61d5741ac (diff)
downloadplatform_external_kotlinc-a75a62bd5d7b33d070e0a615ab6fd160eb20ad2d.tar.gz
platform_external_kotlinc-a75a62bd5d7b33d070e0a615ab6fd160eb20ad2d.tar.bz2
platform_external_kotlinc-a75a62bd5d7b33d070e0a615ab6fd160eb20ad2d.zip
Update Kotlinc to 1.2.41
am: 481e6ef3b6 Change-Id: Ibf5de1761fb1da9a8a149762d3de96b643024cd0
-rw-r--r--METADATA14
-rw-r--r--build.txt2
-rw-r--r--lib/allopen-compiler-plugin.jarbin12704 -> 12951 bytes
-rw-r--r--lib/android-extensions-compiler.jarbin322507 -> 321657 bytes
-rw-r--r--lib/android-extensions-runtime.jarbin8628 -> 8627 bytes
-rw-r--r--lib/kotlin-annotation-processing-runtime.jarbin1178 -> 1178 bytes
-rw-r--r--lib/kotlin-annotation-processing.jarbin259842 -> 262298 bytes
-rw-r--r--lib/kotlin-annotations-android.jarbin2792 -> 2793 bytes
-rw-r--r--lib/kotlin-annotations-jvm-sources.jarbin2910 -> 2910 bytes
-rw-r--r--lib/kotlin-annotations-jvm.jarbin3068 -> 3067 bytes
-rw-r--r--lib/kotlin-ant.jarbin24124 -> 23963 bytes
-rw-r--r--lib/kotlin-compiler.jarbin28651913 -> 28922721 bytes
-rw-r--r--lib/kotlin-daemon-client.jarbin541140 -> 569130 bytes
-rw-r--r--lib/kotlin-jslib-sources.jarbin291046 -> 287111 bytes
-rw-r--r--lib/kotlin-jslib.jarbin665466 -> 665935 bytes
-rw-r--r--lib/kotlin-preloader.jarbin51588 -> 51588 bytes
-rw-r--r--lib/kotlin-reflect-sources.jarbin815950 -> 672619 bytes
-rw-r--r--lib/kotlin-reflect.jarbin2591482 -> 2575389 bytes
-rw-r--r--lib/kotlin-runner.jarbin15912 -> 15892 bytes
-rw-r--r--lib/kotlin-runtime-sources.jarbin293909 -> 293548 bytes
-rw-r--r--lib/kotlin-runtime.jarbin943034 -> 943529 bytes
-rw-r--r--lib/kotlin-script-runtime-sources.jarbin8320 -> 9064 bytes
-rw-r--r--lib/kotlin-script-runtime.jarbin37797 -> 40028 bytes
-rw-r--r--lib/kotlin-source-sections-compiler-plugin.jarbin20279 -> 20324 bytes
-rw-r--r--lib/kotlin-stdlib-jdk7-sources.jarbin2453 -> 2453 bytes
-rw-r--r--lib/kotlin-stdlib-jdk7.jarbin3130 -> 3131 bytes
-rw-r--r--lib/kotlin-stdlib-jdk8-sources.jarbin4556 -> 4556 bytes
-rw-r--r--lib/kotlin-stdlib-jdk8.jarbin12383 -> 12381 bytes
-rw-r--r--lib/kotlin-stdlib-jre7-sources.jarbin2285 -> 2285 bytes
-rw-r--r--lib/kotlin-stdlib-jre7.jarbin2853 -> 2858 bytes
-rw-r--r--lib/kotlin-stdlib-jre8-sources.jarbin4262 -> 4262 bytes
-rw-r--r--lib/kotlin-stdlib-jre8.jarbin11714 -> 11713 bytes
-rw-r--r--lib/kotlin-stdlib-js-sources.jarbin291046 -> 287111 bytes
-rw-r--r--lib/kotlin-stdlib-js.jarbin665466 -> 665935 bytes
-rw-r--r--lib/kotlin-stdlib-sources.jarbin293909 -> 293548 bytes
-rw-r--r--lib/kotlin-stdlib.jarbin943034 -> 943529 bytes
-rw-r--r--lib/kotlin-test-js-sources.jarbin10148 -> 10148 bytes
-rw-r--r--lib/kotlin-test-js.jarbin18450 -> 18448 bytes
-rw-r--r--lib/kotlin-test-junit-sources.jarbin1478 -> 1244 bytes
-rw-r--r--lib/kotlin-test-junit.jarbin4282 -> 4311 bytes
-rw-r--r--lib/kotlin-test-sources.jarbin3212 -> 3212 bytes
-rw-r--r--lib/kotlin-test-testng-sources.jarbin1356 -> 1356 bytes
-rw-r--r--lib/kotlin-test-testng.jarbin4356 -> 4358 bytes
-rw-r--r--lib/kotlin-test.jarbin28203 -> 28200 bytes
-rw-r--r--lib/noarg-compiler-plugin.jarbin24064 -> 24000 bytes
-rw-r--r--lib/sam-with-receiver-compiler-plugin.jarbin11348 -> 11367 bytes
-rw-r--r--license/README.md29
-rwxr-xr-xpost_update.sh9
48 files changed, 34 insertions, 20 deletions
diff --git a/METADATA b/METADATA
index 73cc779..546be1b 100644
--- a/METADATA
+++ b/METADATA
@@ -1,7 +1,5 @@
name: "kotlinc"
-description:
- "Standalone Kotlin command-line compiler tools."
-
+description: "Standalone Kotlin command-line compiler tools."
third_party {
url {
type: HOMEPAGE
@@ -9,13 +7,17 @@ third_party {
}
url {
type: ARCHIVE
- value: "https://github.com/JetBrains/kotlin/releases/download/v1.2.30/kotlin-compiler-1.2.30.zip"
+ value: "https://github.com/JetBrains/kotlin/releases/download/v1.2.41/kotlin-compiler-1.2.41.zip"
}
url {
type: ARCHIVE
value: "https://github.com/JetBrains/intellij-community/raw/171/lib/src/trove4j_src.jar"
}
- version: "1.2.30"
- last_upgrade_date { year: 2018 month: 3 day: 06 }
+ version: "Kotlin 1.2.41"
license_type: RECIPROCAL
+ last_upgrade_date {
+ year: 2018
+ month: 6
+ day: 5
+ }
}
diff --git a/build.txt b/build.txt
index 11f33f5..ca0f8ef 100644
--- a/build.txt
+++ b/build.txt
@@ -1 +1 @@
-1.2.30-release-78 \ No newline at end of file
+1.2.41-release-74 \ No newline at end of file
diff --git a/lib/allopen-compiler-plugin.jar b/lib/allopen-compiler-plugin.jar
index 1d8efb0..3a53d54 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 198252c..bd28e76 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 ae0b0a7..7fca40b 100644
--- a/lib/android-extensions-runtime.jar
+++ b/lib/android-extensions-runtime.jar
Binary files differ
diff --git a/lib/kotlin-annotation-processing-runtime.jar b/lib/kotlin-annotation-processing-runtime.jar
index 886df69..98b5c21 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 8040b1e..73574ad 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 2bf8a5b..d2adb04 100644
--- a/lib/kotlin-annotations-android.jar
+++ b/lib/kotlin-annotations-android.jar
Binary files differ
diff --git a/lib/kotlin-annotations-jvm-sources.jar b/lib/kotlin-annotations-jvm-sources.jar
index c44c718..624a481 100644
--- a/lib/kotlin-annotations-jvm-sources.jar
+++ b/lib/kotlin-annotations-jvm-sources.jar
Binary files differ
diff --git a/lib/kotlin-annotations-jvm.jar b/lib/kotlin-annotations-jvm.jar
index 59a19b3..3f3fa67 100644
--- a/lib/kotlin-annotations-jvm.jar
+++ b/lib/kotlin-annotations-jvm.jar
Binary files differ
diff --git a/lib/kotlin-ant.jar b/lib/kotlin-ant.jar
index a64ddbe..06367b1 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 10e8f8f..966fc37 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 40108d9..0c139ce 100644
--- a/lib/kotlin-daemon-client.jar
+++ b/lib/kotlin-daemon-client.jar
Binary files differ
diff --git a/lib/kotlin-jslib-sources.jar b/lib/kotlin-jslib-sources.jar
index e71ea79..4f925be 100644
--- a/lib/kotlin-jslib-sources.jar
+++ b/lib/kotlin-jslib-sources.jar
Binary files differ
diff --git a/lib/kotlin-jslib.jar b/lib/kotlin-jslib.jar
index 010d87a..57c4a10 100644
--- a/lib/kotlin-jslib.jar
+++ b/lib/kotlin-jslib.jar
Binary files differ
diff --git a/lib/kotlin-preloader.jar b/lib/kotlin-preloader.jar
index 0b7b220..b145f7c 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 6d3034a..ac4e9dd 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 7c5f417..b44caf1 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 f119518..8658eb2 100644
--- a/lib/kotlin-runner.jar
+++ b/lib/kotlin-runner.jar
Binary files differ
diff --git a/lib/kotlin-runtime-sources.jar b/lib/kotlin-runtime-sources.jar
index 0b1b048..489b96c 100644
--- a/lib/kotlin-runtime-sources.jar
+++ b/lib/kotlin-runtime-sources.jar
Binary files differ
diff --git a/lib/kotlin-runtime.jar b/lib/kotlin-runtime.jar
index d1c282d..779e622 100644
--- a/lib/kotlin-runtime.jar
+++ b/lib/kotlin-runtime.jar
Binary files differ
diff --git a/lib/kotlin-script-runtime-sources.jar b/lib/kotlin-script-runtime-sources.jar
index 64cb530..c0ec479 100644
--- a/lib/kotlin-script-runtime-sources.jar
+++ b/lib/kotlin-script-runtime-sources.jar
Binary files differ
diff --git a/lib/kotlin-script-runtime.jar b/lib/kotlin-script-runtime.jar
index e6e9995..144e9c2 100644
--- a/lib/kotlin-script-runtime.jar
+++ b/lib/kotlin-script-runtime.jar
Binary files differ
diff --git a/lib/kotlin-source-sections-compiler-plugin.jar b/lib/kotlin-source-sections-compiler-plugin.jar
index 8469a56..6d773ed 100644
--- a/lib/kotlin-source-sections-compiler-plugin.jar
+++ b/lib/kotlin-source-sections-compiler-plugin.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-jdk7-sources.jar b/lib/kotlin-stdlib-jdk7-sources.jar
index 9471040..364ce1c 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 f803e9a..fb68700 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 9582f24..a7c803e 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 ef445e5..fc61ee4 100644
--- a/lib/kotlin-stdlib-jdk8.jar
+++ b/lib/kotlin-stdlib-jdk8.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-jre7-sources.jar b/lib/kotlin-stdlib-jre7-sources.jar
index d1cbb87..4890b22 100644
--- a/lib/kotlin-stdlib-jre7-sources.jar
+++ b/lib/kotlin-stdlib-jre7-sources.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-jre7.jar b/lib/kotlin-stdlib-jre7.jar
index bf270ca..5deddf6 100644
--- a/lib/kotlin-stdlib-jre7.jar
+++ b/lib/kotlin-stdlib-jre7.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-jre8-sources.jar b/lib/kotlin-stdlib-jre8-sources.jar
index 1d9fe7b..71da787 100644
--- a/lib/kotlin-stdlib-jre8-sources.jar
+++ b/lib/kotlin-stdlib-jre8-sources.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-jre8.jar b/lib/kotlin-stdlib-jre8.jar
index 0ab06e0..b36d623 100644
--- a/lib/kotlin-stdlib-jre8.jar
+++ b/lib/kotlin-stdlib-jre8.jar
Binary files differ
diff --git a/lib/kotlin-stdlib-js-sources.jar b/lib/kotlin-stdlib-js-sources.jar
index e71ea79..4f925be 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 010d87a..57c4a10 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 0b1b048..489b96c 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 d1c282d..779e622 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 4ae4b1a..783ea75 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 26b4f14..b52e26d 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 5badd82..f7634af 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 a86e336..2e403f6 100644
--- a/lib/kotlin-test-junit.jar
+++ b/lib/kotlin-test-junit.jar
Binary files differ
diff --git a/lib/kotlin-test-sources.jar b/lib/kotlin-test-sources.jar
index c8a1ff1..754f815 100644
--- a/lib/kotlin-test-sources.jar
+++ b/lib/kotlin-test-sources.jar
Binary files differ
diff --git a/lib/kotlin-test-testng-sources.jar b/lib/kotlin-test-testng-sources.jar
index 463ca11..e679ead 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 565d1b9..f66e8be 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 794734f..c64b245 100644
--- a/lib/kotlin-test.jar
+++ b/lib/kotlin-test.jar
Binary files differ
diff --git a/lib/noarg-compiler-plugin.jar b/lib/noarg-compiler-plugin.jar
index 82fd573..813ef2c 100644
--- a/lib/noarg-compiler-plugin.jar
+++ b/lib/noarg-compiler-plugin.jar
Binary files differ
diff --git a/lib/sam-with-receiver-compiler-plugin.jar b/lib/sam-with-receiver-compiler-plugin.jar
index 7f35a41..27adbe4 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 b9e37f6..e9b9d41 100644
--- a/license/README.md
+++ b/license/README.md
@@ -39,18 +39,6 @@ the Kotlin IntelliJ IDEA plugin:
- License: BSD (license/third_party/dart_LICENSE.txt)
- Origin: Originally part of the Dart compiler, (c) 2011 the Dart Project Authors,
- - Path: js/js.libraries/src/core/collections
- - License: Apache 2 (license/third_party/gwt_license.txt)
- - Origin: Derived from GWT, (C) 2007-08 Google Inc.
-
- - Path: js/js.libraries/src/js/long.js
- - License: Apache 2 (license/third_party/closure-compiler_LICENSE.txt)
- - Origin: Google Closure Library, Copyright 2009 The Closure Library Authors
-
- - Path: js/js.libraries/src/js/polyfills.js
- - License: Boost Software License 1.0 (license/third_party/boost_LICENSE.txt)
- - Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
-
- Path: js/js.parser/src/com/google
- License: Netscape Public License 1.1 (license/third_party/rhino_LICENSE.txt)
- Origin: Originally part of GWT, (C) 2007-08 Google Inc., distributed under the Apache 2 license. The code
@@ -69,6 +57,18 @@ the Kotlin IntelliJ IDEA plugin:
- License: Boost Software License 1.0 (license/third_party/boost_LICENSE.txt)
- Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
+ - Path: libraries/stdlib/js/src/kotlin/collections
+ - License: Apache 2 (license/third_party/gwt_license.txt)
+ - Origin: Derived from GWT, (C) 2007-08 Google Inc.
+
+ - Path: libraries/stdlib/js/src/js/long.js
+ - License: Apache 2 (license/third_party/closure-compiler_LICENSE.txt)
+ - Origin: Google Closure Library, Copyright 2009 The Closure Library Authors
+
+ - Path: libraries/stdlib/js/src/js/polyfills.js
+ - License: Boost Software License 1.0 (license/third_party/boost_LICENSE.txt)
+ - Origin: Derived from boost special math functions, Copyright Eric Ford & Hubert Holin 2001.
+
- Path: plugins/lint/android-annotations
- License: Apache 2 (license/third_party/aosp_license.txt)
- Origin: Copyright (C) 2011-15 The Android Open Source Project
@@ -102,6 +102,10 @@ any distributions of the compiler, libraries or plugin:
- License: Eclipse Public License v1.0 (license/third_party/testdata/eclipse_license.txt)
- Origin: Eclipse JDT, Copyright (c) 2011, 2013 Stephan Herrmann and others.
+ - Path: third-party/annotations/androidx
+ - License: Apache 2 (license/third_party/aosp_license.txt)
+ - Origin: Copyright (C) 2011-15 The Android Open Source Project
+
- Path: third-party/annotations/edu/umd/cs/findbugs
- License: LGPL 2.1 (license/third_party/testdata/findbugs_license.txt)
- Origin: Bytecode Analysis Framework, Copyright (C) 2005 University of Maryland
@@ -186,4 +190,3 @@ any distributions of the compiler, libraries or plugin:
- Path: libraries/examples/browser-example-with-library/src/js/jquery.js
- License: MIT (license/third_party/jquery_license.txt)
- Origin: jQuery JavaScript Library v1.6.2, Copyright 2011, John Resig
- \ No newline at end of file
diff --git a/post_update.sh b/post_update.sh
new file mode 100755
index 0000000..aa2b76f
--- /dev/null
+++ b/post_update.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# $1 Path to the new version.
+# $2 Path to the old version.
+
+# Copies trove4j_src.jar for GPL compliance.
+cp -a -n $2/lib/trove4j_src.jar $1/lib/
+
+cp -a -n $2/jarjar-rules.txt $1/