Skip to content

Move to options capabilities to kotlinc repository #963

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 8 commits into from
May 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
load("//src/main/starlark/release:packager.bzl", "release_archive")
load("//src/main/starlark/core/repositories:versions.bzl", "versions")
load("//kotlin:lint.bzl", "ktlint_config")

exports_files([
Expand Down Expand Up @@ -52,20 +51,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
6 changes: 0 additions & 6 deletions kotlin/internal/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# limitations under the License.
load("//kotlin/internal:toolchains.bzl", "kt_configure_toolchains")
load("//src/main/starlark/release:packager.bzl", "release_archive")
load("//src/main/starlark/core/repositories:versions.bzl", "versions")
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

# Configures the toolchains
Expand All @@ -23,11 +22,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 +44,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.

Loading