From cd92f106075dbe1a6488cbea4ba75e829e7e288c Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Wed, 28 Apr 2021 11:06:51 -0700 Subject: [PATCH] Upgrade to Kotlin 1.5.0 --- gradle.properties | 2 +- third_party/prebuilt/README.md | 2 +- ...0-RC.jar => test-infrastructure-utils-1.5.0.jar} | Bin ...-1.5.0-RC.jar => tests-compiler-utils-1.5.0.jar} | Bin ...sts-mutes-1.5.0-RC.jar => tests-mutes-1.5.0.jar} | Bin 5 files changed, 2 insertions(+), 2 deletions(-) rename third_party/prebuilt/repo/{test-infrastructure-utils-1.5.0-RC.jar => test-infrastructure-utils-1.5.0.jar} (100%) rename third_party/prebuilt/repo/{tests-compiler-utils-1.5.0-RC.jar => tests-compiler-utils-1.5.0.jar} (100%) rename third_party/prebuilt/repo/{tests-mutes-1.5.0-RC.jar => tests-mutes-1.5.0.jar} (100%) diff --git a/gradle.properties b/gradle.properties index 3664cc237c..e130e48577 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Copied from kotlinc org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx2200m -Dfile.encoding=UTF-8 -kotlinBaseVersion=1.5.0-RC +kotlinBaseVersion=1.5.0 agpBaseVersion=4.2.0-beta02 intellijVersion=202.7660.26 junitVersion=4.12 diff --git a/third_party/prebuilt/README.md b/third_party/prebuilt/README.md index 0e6344dd4e..c8d142ba1a 100644 --- a/third_party/prebuilt/README.md +++ b/third_party/prebuilt/README.md @@ -7,7 +7,7 @@ To build and copy the jars: ``` $ # setup kotlin build environment. see https://github.com/JetBrains/kotlin $ cd path_to_kotlin_compiler_src -$ ./gradlew :compiler:tests-mutes:build :compiler:test-infrastructure-utils:build :compiler:tests-compiler-utils:build +$ ./gradlew :compiler:tests-mutes:build :compiler:test-infrastructure-utils:testJar :compiler:tests-compiler-utils:testJar $ cp compiler/tests-mutes/build/libs/*.jar .../repo $ cp compiler/tests-compiler-utils/build/libs/tests-compiler-utils--tests.jar \ .../repo/tests-compiler-utils-.jar diff --git a/third_party/prebuilt/repo/test-infrastructure-utils-1.5.0-RC.jar b/third_party/prebuilt/repo/test-infrastructure-utils-1.5.0.jar similarity index 100% rename from third_party/prebuilt/repo/test-infrastructure-utils-1.5.0-RC.jar rename to third_party/prebuilt/repo/test-infrastructure-utils-1.5.0.jar diff --git a/third_party/prebuilt/repo/tests-compiler-utils-1.5.0-RC.jar b/third_party/prebuilt/repo/tests-compiler-utils-1.5.0.jar similarity index 100% rename from third_party/prebuilt/repo/tests-compiler-utils-1.5.0-RC.jar rename to third_party/prebuilt/repo/tests-compiler-utils-1.5.0.jar diff --git a/third_party/prebuilt/repo/tests-mutes-1.5.0-RC.jar b/third_party/prebuilt/repo/tests-mutes-1.5.0.jar similarity index 100% rename from third_party/prebuilt/repo/tests-mutes-1.5.0-RC.jar rename to third_party/prebuilt/repo/tests-mutes-1.5.0.jar