Skip to content

Commit 20903dc

Browse files
committed
updated bazel kotlin config
1 parent a028514 commit 20903dc

File tree

8 files changed

+61
-34
lines changed

8 files changed

+61
-34
lines changed

.bazelversion

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.5.0

BUILD

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "define_kt_toolchain")
2+
3+
4+
JVM_VERSION = "1.6"
5+
KOTLIN_VERSION = "1.3"
6+
7+
8+
define_kt_toolchain(
9+
name = "kotlin_toolchain",
10+
jvm_target = JVM_VERSION,
11+
api_version = KOTLIN_VERSION,
12+
language_version = KOTLIN_VERSION,
13+
)

WORKSPACE

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,18 @@
11
workspace(name = "alrogithms")
22

3-
# local_repository(
4-
# name = "kotlin",
5-
# path = "src/kotlin"
6-
# )
73

8-
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
9-
10-
11-
rules_kotlin_version = "legacy-1.3.0"
12-
rules_kotlin_sha = "4fd769fb0db5d3c6240df8a9500515775101964eebdf85a3f9f0511130885fde"
13-
http_archive(
14-
name = "io_bazel_rules_kotlin",
15-
urls = ["https://github.com/bazelbuild/rules_kotlin/archive/%s.zip" % rules_kotlin_version],
16-
type = "zip",
17-
strip_prefix = "rules_kotlin-%s" % rules_kotlin_version,
18-
sha256 = rules_kotlin_sha,
4+
# ------
5+
# Kotlin
6+
# ------
7+
local_repository(
8+
name = "kotlin",
9+
path = "src/kotlin",
1910
)
2011

21-
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
12+
load("@kotlin//:kotlin.bzl", "io_bazel_rules_kotlin")
13+
io_bazel_rules_kotlin()
14+
15+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories")
2216
kotlin_repositories()
23-
kt_register_toolchains()
17+
18+
register_toolchains("//:kotlin_toolchain")

src/kotlin/BUILD

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "define_kt_toolchain")
2+
3+
4+
JVM_VERSION = "1.6"
5+
KOTLIN_VERSION = "1.3"
6+
7+
8+
define_kt_toolchain(
9+
name = "kotlin_toolchain",
10+
jvm_target = JVM_VERSION,
11+
api_version = KOTLIN_VERSION,
12+
language_version = KOTLIN_VERSION,
13+
)

src/kotlin/WORKSPACE

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
1-
# workspace(name = "alrogithms_kotlin")
1+
workspace(name = "alrogithms_kotlin")
22

33

4-
# load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
4+
load("//:kotlin.bzl", "io_bazel_rules_kotlin")
5+
io_bazel_rules_kotlin()
56

7+
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories")
8+
kotlin_repositories()
69

7-
# rules_kotlin_version = "legacy-1.3.0"
8-
# rules_kotlin_sha = "4fd769fb0db5d3c6240df8a9500515775101964eebdf85a3f9f0511130885fde"
9-
# http_archive(
10-
# name = "io_bazel_rules_kotlin",
11-
# urls = ["https://github.com/bazelbuild/rules_kotlin/archive/%s.zip" % rules_kotlin_version],
12-
# type = "zip",
13-
# strip_prefix = "rules_kotlin-%s" % rules_kotlin_version,
14-
# sha256 = rules_kotlin_sha,
15-
# )
16-
17-
# load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
18-
# kotlin_repositories()
19-
# kt_register_toolchains()
10+
register_toolchains("//:kotlin_toolchain")

src/kotlin/_util/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_jvm_library")
22

3-
package(default_visibility = ["//src/kotlin:__subpackages__"])
3+
package(default_visibility = ["//:__subprojects__])
44

55

66
kt_jvm_library(

src/kotlin/kotlin.bzl

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2+
3+
rules_kotlin_version = "legacy-1.3.0"
4+
rules_kotlin_sha = "4fd769fb0db5d3c6240df8a9500515775101964eebdf85a3f9f0511130885fde"
5+
6+
7+
def io_bazel_rules_kotlin():
8+
http_archive(
9+
name = "io_bazel_rules_kotlin",
10+
urls = ["https://github.com/bazelbuild/rules_kotlin/archive/%s.zip" % rules_kotlin_version],
11+
type = "zip",
12+
strip_prefix = "rules_kotlin-%s" % rules_kotlin_version,
13+
sha256 = rules_kotlin_sha,
14+
)

src/kotlin/sequential/sorting/quicksort/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ kt_jvm_binary(
1010
],
1111
main_class = "sequential.sorting.quicksort.QuickSortKt",
1212
deps = [
13-
"//src/kotlin/_util:utils",
13+
"//_util:utils",
1414
]
1515
)

0 commit comments

Comments
 (0)