Skip to content

Bugfix: Implicit label kotlin deps error out #56

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bugfix: Implicit label kotlin deps error out #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 17 additions & 8 deletions kotlin/rules.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ _target_types = [_target_type_binary, _target_type_library, _target_type_test]
# Execution phase
# ################################################################

KT_JAVA_TARGET_SUFFIX = "_kt"

# Convert relative labels (eg ':foo', 'foo') to absolute
# Seems like there must be af function for this but I could not find one...
def _str_to_canonical_label(str):
return Label("//" + PACKAGE_NAME).relative(str)

# Convert kotlin target deps into java deps
def _kotlin_target_dep_to_java_dep(dep):
label = _str_to_canonical_label(dep)
kotlin_label = "//" + label.package + ":" + label.name + KT_JAVA_TARGET_SUFFIX
return kotlin_label

def _kotlin_compile_impl(ctx):
kt_jar = ctx.outputs.kt_jar
inputs = []
Expand Down Expand Up @@ -258,10 +271,7 @@ def kotlin_android_library(
**kwargs
)

# Convert kotlin deps into java deps
kt_deps = []
for dep in deps:
kt_deps.append(dep + "_kt")
kt_deps = [_kotlin_target_dep_to_java_dep(dep) for dep in deps]

native.java_import(
name = name + "_kt",
Expand Down Expand Up @@ -332,10 +342,9 @@ def kotlin_binary(name,
verbose = verbose,
)

runtime_deps = [name + "_kt.jar"] + java_deps + [
dep + "_kt"
for dep in deps
] + ["@com_github_jetbrains_kotlin//:runtime"]
kt_deps = [_kotlin_target_dep_to_java_dep(dep) for dep in deps]
runtime_deps = [name + "_kt.jar"] + java_deps + kt_deps \
+ ["@com_github_jetbrains_kotlin//:runtime"]

if len(jars):
native.java_import(
Expand Down