Skip to content

Commit 8b1bfcb

Browse files
restingbullrestingbull
committed
Remove http_jar
1 parent 207a0a9 commit 8b1bfcb

File tree

5 files changed

+28
-29
lines changed

5 files changed

+28
-29
lines changed

‎src/main/kotlin/BUILD.release.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ java_binary(
4747
"//kotlin/compiler:symbol-processing-cmdline",
4848
"//src/main/kotlin/io/bazel/kotlin/compiler",
4949
"@com_github_jetbrains_kotlin//:home",
50-
"@kotlin_build_tools_impl//jar",
51-
"@kotlinx_serialization_core_jvm//jar",
52-
"@kotlinx_serialization_json//jar",
53-
"@kotlinx_serialization_json_jvm//jar",
50+
"@kotlin_build_tools_impl//file",
51+
"@kotlinx_serialization_core_jvm//file",
52+
"@kotlinx_serialization_json//file",
53+
"@kotlinx_serialization_json_jvm//file",
5454
],
5555
jvm_flags = [
56-
"-D@com_github_jetbrains_kotlinx...serialization-core-jvm=$(rlocationpath @kotlinx_serialization_core_jvm//jar)",
57-
"-D@com_github_jetbrains_kotlinx...serialization-json=$(rlocationpath @kotlinx_serialization_json//jar)",
58-
"-D@com_github_jetbrains_kotlinx...serialization-json-jvm=$(rlocationpath @kotlinx_serialization_json_jvm//jar)",
59-
"-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_build_tools_impl//jar)",
56+
"-D@com_github_jetbrains_kotlinx...serialization-core-jvm=$(rlocationpath @kotlinx_serialization_core_jvm//file)",
57+
"-D@com_github_jetbrains_kotlinx...serialization-json=$(rlocationpath @kotlinx_serialization_json//file)",
58+
"-D@com_github_jetbrains_kotlinx...serialization-json-jvm=$(rlocationpath @kotlinx_serialization_json_jvm//file)",
59+
"-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_build_tools_impl//file)",
6060
"-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath //kotlin/compiler:jvm-abi-gen)",
6161
"-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath //kotlin/compiler:kotlin-compiler)",
6262
"-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath //kotlin/compiler:kotlin-annotation-processing)",

‎src/main/kotlin/io/bazel/kotlin/builder/cmd/BUILD.bazel‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ kt_bootstrap_binary(
2626
"//src/main/kotlin:skip-code-gen",
2727
"//src/main/kotlin/io/bazel/kotlin/compiler:compiler.jar",
2828
"@com_github_jetbrains_kotlin//:home",
29-
"@kotlin_build_tools_impl//jar",
30-
"@kotlinx_serialization_core_jvm//jar",
31-
"@kotlinx_serialization_json//jar",
32-
"@kotlinx_serialization_json_jvm//jar",
29+
"@kotlin_build_tools_impl//file",
30+
"@kotlinx_serialization_core_jvm//file",
31+
"@kotlinx_serialization_json//file",
32+
"@kotlinx_serialization_json_jvm//file",
3333
] + _KOTLIN_STDLIBS,
3434
jvm_flags = [
35-
"-D@com_github_jetbrains_kotlinx...serialization-core-jvm=$(rlocationpath @kotlinx_serialization_core_jvm//jar)",
36-
"-D@com_github_jetbrains_kotlinx...serialization-json=$(rlocationpath @kotlinx_serialization_json//jar)",
37-
"-D@com_github_jetbrains_kotlinx...serialization-json-jvm=$(rlocationpath @kotlinx_serialization_json_jvm//jar)",
38-
"-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_build_tools_impl//jar)",
35+
"-D@com_github_jetbrains_kotlinx...serialization-core-jvm=$(rlocationpath @kotlinx_serialization_core_jvm//file)",
36+
"-D@com_github_jetbrains_kotlinx...serialization-json=$(rlocationpath @kotlinx_serialization_json//file)",
37+
"-D@com_github_jetbrains_kotlinx...serialization-json-jvm=$(rlocationpath @kotlinx_serialization_json_jvm//file)",
38+
"-D@com_github_jetbrains_kotlin...build-tools-impl=$(rlocationpath @kotlin_build_tools_impl//file)",
3939
"-D@com_github_jetbrains_kotlin...jvm-abi-gen=$(rlocationpath //kotlin/compiler:jvm-abi-gen)",
4040
"-D@com_github_jetbrains_kotlin...kotlin-compiler=$(rlocationpath //kotlin/compiler:kotlin-compiler)",
4141
"-D@com_github_jetbrains_kotlin...kapt=$(rlocationpath //kotlin/compiler:kotlin-annotation-processing)",

‎src/main/starlark/core/repositories/initialize.release.bzl‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ load(
1818
"@bazel_tools//tools/build_defs/repo:http.bzl",
1919
"http_archive",
2020
"http_file",
21-
"http_jar",
2221
)
2322
load(
2423
"//kotlin/internal:defs.bzl",
@@ -71,25 +70,25 @@ def kotlin_repositories(
7170
)
7271

7372
versions.use_repository(
74-
http_jar,
73+
http_file,
7574
name = "kotlinx_serialization_core_jvm",
7675
version = versions.KOTLINX_SERIALIZATION_CORE_JVM,
7776
)
7877

7978
versions.use_repository(
80-
http_jar,
79+
http_file,
8180
name = "kotlinx_serialization_json",
8281
version = versions.KOTLINX_SERIALIZATION_JSON,
8382
)
8483

8584
versions.use_repository(
86-
http_jar,
85+
http_file,
8786
name = "kotlinx_serialization_json_jvm",
8887
version = versions.KOTLINX_SERIALIZATION_JSON_JVM,
8988
)
9089

9190
versions.use_repository(
92-
http_jar,
91+
http_file,
9392
name = "kotlin_build_tools_impl",
9493
version = versions.KOTLIN_BUILD_TOOLS_IMPL,
9594
)

‎src/test/kotlin/io/bazel/kotlin/builder/KotlinAbstractTestBuilder.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,17 @@ static KotlinToolchain toolchainForTest() {
235235
return KotlinToolchain.createToolchain(
236236
javaHome,
237237
new File(Deps.Dep.fromLabel("//kotlin/compiler:kotlin-compiler").singleCompileJar()),
238-
new File(Deps.Dep.fromLabel("@kotlin_build_tools_impl//jar").singleCompileJar()),
238+
new File(Deps.Dep.fromLabel("@kotlin_build_tools_impl//file").singleCompileJar()),
239239
new File(Deps.Dep.fromLabel("//src/main/kotlin/io/bazel/kotlin/compiler:compiler.jar").singleCompileJar()),
240240
new File(Deps.Dep.fromLabel("//kotlin/compiler:jvm-abi-gen").singleCompileJar()),
241241
new File(Deps.Dep.fromLabel("//src/main/kotlin:skip-code-gen").singleCompileJar()),
242242
new File(Deps.Dep.fromLabel("//src/main/kotlin:jdeps-gen").singleCompileJar()),
243243
new File(Deps.Dep.fromLabel("//kotlin/compiler:kotlin-annotation-processing").singleCompileJar()),
244244
new File(Deps.Dep.fromLabel("//kotlin/compiler:symbol-processing-api").singleCompileJar()),
245245
new File(Deps.Dep.fromLabel("//kotlin/compiler:symbol-processing-cmdline").singleCompileJar()),
246-
new File(Deps.Dep.fromLabel("@kotlinx_serialization_core_jvm//jar").singleCompileJar()),
247-
new File(Deps.Dep.fromLabel("@kotlinx_serialization_json//jar").singleCompileJar()),
248-
new File(Deps.Dep.fromLabel("@kotlinx_serialization_json_jvm//jar").singleCompileJar())
246+
new File(Deps.Dep.fromLabel("@kotlinx_serialization_core_jvm//file").singleCompileJar()),
247+
new File(Deps.Dep.fromLabel("@kotlinx_serialization_json//file").singleCompileJar()),
248+
new File(Deps.Dep.fromLabel("@kotlinx_serialization_json_jvm//file").singleCompileJar())
249249
);
250250
}
251251
}

‎src/test/kotlin/io/bazel/kotlin/defs.bzl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ def kt_rules_test(name, **kwargs):
4444
"//kotlin/compiler:kotlin-stdlib-jdk8",
4545
"//kotlin/compiler:kotlin-annotation-processing",
4646
"@rules_kotlin//kotlin/compiler:kotlin-reflect",
47-
"@kotlinx_serialization_core_jvm//jar",
48-
"@kotlinx_serialization_json//jar",
49-
"@kotlinx_serialization_json_jvm//jar",
50-
"@kotlin_build_tools_impl//jar",
47+
"@kotlinx_serialization_core_jvm//file",
48+
"@kotlinx_serialization_json//file",
49+
"@kotlinx_serialization_json_jvm//file",
50+
"@kotlin_build_tools_impl//file",
5151
] + args["data"]:
5252
if dep not in args["data"]:
5353
args["data"].append(dep)

0 commit comments

Comments
 (0)