Skip to content

Commit aba42a9

Browse files
committed
Remove kotlin released references.
1 parent 025e206 commit aba42a9

File tree

8 files changed

+2
-85
lines changed

8 files changed

+2
-85
lines changed

MODULE.bazel

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,26 +22,10 @@ use_repo(
2222
"kotlinx_serialization_core_jvm",
2323
"kotlinx_serialization_json",
2424
"kotlinx_serialization_json_jvm",
25-
"released_rules_kotlin",
2625
)
2726

28-
# Once the released rules_koltin is defined, configure it.
29-
rules_kotlin_bootstrap_extensions = use_extension(
30-
"//src/main/starlark/core/repositories:bzlmod_bootstrap.bzl",
31-
"rules_kotlin_bootstrap_extensions",
32-
)
33-
use_repo(
34-
rules_kotlin_bootstrap_extensions,
35-
"released_com_github_google_ksp",
36-
"released_com_github_jetbrains_kotlin",
37-
)
38-
39-
# Register bootstrap toolchain
40-
register_toolchains("//src/main/kotlin:bootstrap_toolchain")
41-
42-
register_toolchains("//src/main/starlark/core/compile/...")
27+
register_toolchains("//src/main/starlark/core/compile/cli")
4328

44-
# Back to the regularly scheduled configuration.
4529
register_toolchains("//kotlin/internal:default_toolchain")
4630

4731
# TODO(bencodes) We should be able to remove this once rules_android has rolled out official Bzlmod support

WORKSPACE.dev.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ load("//kotlin:repositories.bzl", "kotlin_repositories")
2121

2222
kotlin_repositories()
2323

24-
register_toolchains("//src/main/starlark/core/compile/...")
24+
register_toolchains("//src/main/starlark/core/compile/cli")
2525

2626
register_toolchains("@rules_kotlin//kotlin/internal:default_toolchain")
2727

src/main/kotlin/BUILD

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@released_rules_kotlin//kotlin:core.bzl", "define_kt_toolchain")
21
load("//src/main/starlark/release:packager.bzl", "release_archive")
32
load("//third_party:jarjar.bzl", "jar_jar")
43

@@ -49,10 +48,3 @@ release_archive(
4948
"//src/main/kotlin/io/bazel/kotlin/compiler:pkg",
5049
],
5150
)
52-
53-
define_kt_toolchain(
54-
name = "bootstrap_toolchain",
55-
api_version = "2.0",
56-
jvm_target = "11",
57-
language_version = "2.0",
58-
)

src/main/starlark/core/repositories/bzlmod_bootstrap.bzl

Lines changed: 0 additions & 13 deletions
This file was deleted.

src/main/starlark/core/repositories/bzlmod_setup.bzl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
"""Definitions for bzlmod module extensions."""
22

33
load("@bazel_skylib//lib:modules.bzl", "modules")
4-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
54
load(
65
"//src/main/starlark/core/repositories:initialize.release.bzl",
76
_kotlin_repositories = "kotlin_repositories",
87
_kotlinc_version = "kotlinc_version",
98
_ksp_version = "ksp_version",
109
)
11-
load("//src/main/starlark/core/repositories:versions.bzl", _versions = "versions")
1210
load(":bzlmod_impl.bzl", "configure_modules_and_repositories", "tag_classes")
1311

1412
def _rules_kotlin_extensions_impl(mctx):
@@ -18,20 +16,6 @@ def _rules_kotlin_extensions_impl(mctx):
1816
_kotlinc_version,
1917
_ksp_version,
2018
)
21-
22-
_versions.use_repository(
23-
name = "released_rules_kotlin",
24-
rule = http_archive,
25-
version = _versions.RULES_KOTLIN,
26-
patch_cmds = [
27-
# without repo mapping, force remap the internal dependencies to use the correct version of kotlin
28-
"grep -rl '\"@*{repo}' src kotlin | xargs -I F perl -i -pe 's/\"(@*)({repo})/\"\\1released_\\2/g' F".format(
29-
repo = repo,
30-
)
31-
for repo in ["com_github_jetbrains_kotlin", "com_github_google_ksp"]
32-
],
33-
)
34-
3519
return modules.use_all_repos(mctx, reproducible = True)
3620

3721
rules_kotlin_extensions = module_extension(

src/main/starlark/core/repositories/download.bzl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -124,16 +124,3 @@ def kt_download_local_dev_dependencies():
124124
rule = http_archive,
125125
version = versions.CGRINDEL_BAZEL_STARLIB,
126126
)
127-
128-
versions.use_repository(
129-
name = "released_rules_kotlin",
130-
rule = http_archive,
131-
version = versions.RULES_KOTLIN,
132-
patch_cmds = [
133-
# without repo mapping, force remap the internal dependencies to use the correct version of kotlin
134-
"for f in $(grep -rl '\"@*{repo}' src kotlin); do perl -i -pe 's/\"(@?)({repo})/\"\\1released_\\2/g' $f; done".format(
135-
repo = repo,
136-
)
137-
for repo in ["com_github_jetbrains_kotlin", "com_github_google_ksp"]
138-
],
139-
)

src/main/starlark/core/repositories/setup.bzl

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
1616
load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
1717
load("@io_bazel_stardoc//:setup.bzl", "stardoc_repositories")
18-
load("@released_rules_kotlin//src/main/starlark/core/repositories:initialize.bzl", release_kotlin_repositories = "kotlin_repositories")
1918
load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
2019
load("@rules_cc//cc:repositories.bzl", "rules_cc_dependencies", "rules_cc_toolchains")
2120
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
@@ -25,14 +24,6 @@ load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_
2524

2625
def kt_configure():
2726
"""Setup dependencies. Must be called AFTER kt_download_local_dev_dependencies() """
28-
release_kotlin_repositories(
29-
is_bzlmod = True,
30-
compiler_repository_name = "released_com_github_jetbrains_kotlin",
31-
ksp_repository_name = "released_com_github_google_ksp",
32-
)
33-
34-
native.register_toolchains("@released_rules_kotlin//kotlin/internal:default_toolchain")
35-
3627
rules_cc_dependencies()
3728
rules_cc_toolchains()
3829

src/main/starlark/core/repositories/versions.bzl

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,6 @@ versions = struct(
9191
sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef",
9292
),
9393
# needed for rules_pkg and java
94-
RULES_KOTLIN = version(
95-
version = "1.9.6",
96-
url_templates = [
97-
"https://github.com/bazelbuild/rules_kotlin/releases/download/v{version}/rules_kotlin-v{version}.tar.gz",
98-
],
99-
sha256 = "3b772976fec7bdcda1d84b9d39b176589424c047eb2175bed09aac630e50af43",
100-
),
101-
# needed for rules_pkg and java
10294
RULES_PYTHON = version(
10395
version = "0.23.1",
10496
strip_prefix_template = "rules_python-{version}",

0 commit comments

Comments
 (0)