Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into legacy_continued
Browse files Browse the repository at this point in the history
* upstream/master:
  Update CHANGELOG.md
  Update to release legacy-1.3.0-rc3
  Support more recent java versions in the kotlin toolchain. (bazelbuild#236)
  • Loading branch information
cgruber committed Dec 6, 2019
2 parents e44be2a + b40d920 commit c420707
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
6 changes: 4 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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). |
Expand Down
4 changes: 4 additions & 0 deletions kotlin/internal/toolchains.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ _kt_toolchain = rule(
values = [
"1.6",
"1.8",
"9",
"10",
"11",
"12",
],
),
"js_target": attr.string(
Expand Down

0 comments on commit c420707

Please sign in to comment.