From 0d650677126444e9e65b8869e35c49351157eb2c Mon Sep 17 00:00:00 2001 From: Christian Edward Gruber Date: Fri, 6 Dec 2019 14:06:26 -0800 Subject: [PATCH 1/3] Support more recent java versions in the kotlin toolchain. (#236) * Support more recent java versions in the kotlin toolchain. * Update the readme instructions for java language level. --- README.md | 2 +- kotlin/internal/toolchains.bzl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 05e5e62d1..8f72db673 100644 --- a/README.md +++ b/README.md @@ -94,7 +94,7 @@ load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "define_kt_toolchain") define_kt_toolchain( name = "kotlin_toolchain", api_version = KOTLIN_LANGUAGE_LEVEL, # "1.1", "1.2", or "1.3" - jvm_target = JAVA_LANGUAGE_LEVEL, # "1.6" or "1.8" + jvm_target = JAVA_LANGUAGE_LEVEL, # "1.6", "1.8", "9", "10", "11", or "12", language_version = KOTLIN_LANGUAGE_LEVEL, # "1.1", "1.2", or "1.3" ) ``` diff --git a/kotlin/internal/toolchains.bzl b/kotlin/internal/toolchains.bzl index 39aa92560..20601a7f9 100644 --- a/kotlin/internal/toolchains.bzl +++ b/kotlin/internal/toolchains.bzl @@ -141,6 +141,10 @@ _kt_toolchain = rule( values = [ "1.6", "1.8", + "9", + "10", + "11", + "12", ], ), "js_target": attr.string( From 3a243d5e5f7a7e835aa5452c336d66cdcf630b1a Mon Sep 17 00:00:00 2001 From: Christian Edward Gruber Date: Fri, 6 Dec 2019 14:47:49 -0800 Subject: [PATCH 2/3] Update to release legacy-1.3.0-rc3 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8f72db673..fc009f468 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ Current release: ***`legacy-1.3.0-rc1`***
Main branch: `master` # News! +* Dec 6, 2019. Released version [1.3.0-rc3](https://github.com/bazelbuild/rules_kotlin/releases/tag/legacy-1.3.0-rc3). +* Dec 6, 2019. Add support for later java versions as target platforms (#236). * Dec 5, 2019. Released version [1.3.0-rc2](https://github.com/bazelbuild/rules_kotlin/releases/tag/legacy-1.3.0-rc2). * Dec 5, 2019. Fix for problem with jdeps generation (#235). * Oct 29, 2019. Released version [1.3.0-rc1](https://github.com/bazelbuild/rules_kotlin/releases/tag/legacy-1.3.0-rc1). @@ -52,8 +54,8 @@ this: ```build load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") -rules_kotlin_version = "legacy-1.3.0-rc2" -rules_kotlin_sha = "dc1c76f91228ddaf4f7ca4190b82d61939e95369f61dea715e8be28792072b1b" +rules_kotlin_version = "legacy-1.3.0-rc3" +rules_kotlin_sha = "54678552125753d9fc0a37736d140f1d2e69778d3e52cf454df41a913b964ede" http_archive( name = "io_bazel_rules_kotlin", urls = ["https://github.com/bazelbuild/rules_kotlin/archive/%s.zip" % rules_kotlin_version], From b40d920c5a5e044c541513f0d5e9260d0a4579c0 Mon Sep 17 00:00:00 2001 From: Christian Edward Gruber Date: Fri, 6 Dec 2019 14:48:45 -0800 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc1b9a5f5..e02254e25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,10 @@ | Date                   | News | | :----------- | -------- | -| Dec 5, 2019 | Released version [1.3.0-rc2](https://github.com/bazelbuild/rules_kotlin/releases/tag/legacy-1.3.0-rc2). | -| Dec 5, 2019 | Fix for problem with jdeps generation (#235). | +| Dec 6, 2019 | Released version [1.3.0-rc3](https://github.com/bazelbuild/rules_kotlin/releases/tag/legacy-1.3.0-rc3). | +| Dec 6, 2019 | Add support for later java versions as target platforms (#236). | +| Dec 5, 2019 | Released version [1.3.0-rc2](https://github.com/bazelbuild/rules_kotlin/releases/tag/legacy-1.3.0-rc2). | +| Dec 5, 2019 | Fix for problem with jdeps generation (#235). | | Oct 29, 2019 | Released version [1.3.0-rc1](https://github.com/bazelbuild/rules_kotlin/releases/tag/legacy-1.3.0-rc1). | | Oct 28, 2019 | Fix various regressions (#217, #221, #222). | | Oct 28, 2019 | Improve file handling for maven-packaged JS jars in `kt_js_import()` (#223). |