Skip to content

Commit

Permalink
Move to the option strategy presented in #900
Browse files Browse the repository at this point in the history
This simplifies the option resolution for head.

Multiple kotlin toolchains can be more simply handled via bzlmod.
  • Loading branch information
restingbull committed Apr 21, 2023
1 parent f92d4b7 commit 7e0d422
Show file tree
Hide file tree
Showing 80 changed files with 1,163 additions and 2,215 deletions.
11 changes: 0 additions & 11 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,9 @@ test_suite(
],
)

[
release_archive(
name = version,
deps = [
"@%s//:pkg" % version,
],
)
for version in versions.CORE
]

# Release target.
release_archive(
name = "rules_kotlin_release",
srcs = ["%s.tgz" % v for v in versions.CORE],
src_map = {
"BUILD.release.bazel": "BUILD.bazel",
"WORKSPACE.release.bazel": "WORKSPACE",
Expand Down
5 changes: 0 additions & 5 deletions kotlin/internal/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ release_archive(
name = "pkg",
srcs = glob(
["*.bzl"],
exclude = ["opts.bzl"],
),
src_map = {
"BUILD.release.bazel": "BUILD.bazel",
"opts.release.bzl": "opts.bzl",
},
deps = [
"//kotlin/internal/js:pkg",
Expand All @@ -47,8 +45,5 @@ bzl_library(
"//kotlin/internal/lint",
"//kotlin/internal/utils",
"//src/main/starlark",
] + [
"@%s//starlark" % v
for v in versions.CORE
],
)
4 changes: 2 additions & 2 deletions kotlin/internal/opts.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
# limitations under the License.

load(
"@rkt_1_8//starlark/kotlin:opts.bzl",
"//src/main/starlark/core/options:opts.kotlinc.bzl",
_KotlincOptions = "KotlincOptions",
_kotlinc_options_to_flags = "kotlinc_options_to_flags",
_kt_kotlinc_options = "kt_kotlinc_options",
)
load(
"@rkt_1_8//starlark/jvm:opts.bzl",
"//src/main/starlark/core/options:opts.javac.bzl",
_JavacOptions = "JavacOptions",
_javac_options_to_flags = "javac_options_to_flags",
_kt_javac_options = "kt_javac_options",
Expand Down
13 changes: 0 additions & 13 deletions src/legacy/BUILD.bazel

This file was deleted.

Empty file removed src/legacy/BUILD.release.bazel
Empty file.
1 change: 0 additions & 1 deletion src/legacy/WORKSPACE

This file was deleted.

10 changes: 0 additions & 10 deletions src/legacy/starlark/BUILD.bazel

This file was deleted.

24 changes: 0 additions & 24 deletions src/legacy/starlark/jvm/BUILD.bazel

This file was deleted.

Empty file.
82 changes: 0 additions & 82 deletions src/legacy/starlark/jvm/opts.bzl

This file was deleted.

21 changes: 0 additions & 21 deletions src/legacy/starlark/kotlin/BUILD.bazel

This file was deleted.

Empty file.
165 changes: 0 additions & 165 deletions src/legacy/starlark/kotlin/opts.bzl

This file was deleted.

3 changes: 3 additions & 0 deletions src/main/starlark/core/options/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,7 @@ bzl_library(
name = "options",
srcs = glob(["*.bzl"]),
visibility = ["//:__subpackages__"],
deps = [
"@com_github_jetbrains_kotlin//:capabilities",
],
)
Loading

0 comments on commit 7e0d422

Please sign in to comment.