Merge pull request #13 from hsyed/rule-prefix_change
#7 switch to new naming scheme
diff --git a/README.md b/README.md
index 6e12ead..b29e9ed 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,10 @@
[Skydoc documentation](https://bazelbuild.github.io/rules_kotlin)
-# Overview
+# Announcements
+
+* <b>February 5, 2018. JVM rule name change:</b> the prefix has changed from `kotlin_` to `kt_jvm_`.
+
+# Overview
These rules were initially forked from [pubref/rules_kotlin](http://github.com/pubref/rules_kotlin). Key changes:
diff --git a/kotlin/kotlin.bzl b/kotlin/kotlin.bzl
index e2eba75..99065b7 100644
--- a/kotlin/kotlin.bzl
+++ b/kotlin/kotlin.bzl
@@ -213,7 +213,7 @@
_kotlin_library_impl = "kotlin_library_impl",
)
-kotlin_library = rule(
+kt_jvm_library = rule(
attrs = dict(_common_attr.items() + {
"exports": attr.label_list(default = []),
}.items()),
@@ -239,7 +239,7 @@
deps: A list of dependencies of this rule.See general comments about `deps` at [Attributes common to all build rules](https://docs.bazel.build/versions/master/be/common-definitions.html#common-attributes).
"""
-kotlin_binary = rule(
+kt_jvm_binary = rule(
attrs = dict(_runnable_common_attr.items() + {"main_class": attr.string(mandatory = True)}.items()),
executable = True,
outputs = _binary_outputs,
@@ -257,7 +257,7 @@
jvm_flags: A list of flags to embed in the wrapper script generated for running this binary. Note: does not yet support make variable substitution.
"""
-kotlin_test = rule(
+kt_jvm_test = rule(
attrs = dict(_runnable_common_attr.items() + {
"_bazel_test_runner": attr.label(
default = Label("@bazel_tools//tools/jdk:TestRunner_deploy.jar"),
@@ -277,7 +277,7 @@
test_class: The Java class to be loaded by the test runner.
"""
-kotlin_import = rule(
+kt_jvm_import = rule(
attrs = {
"jars": attr.label_list(
allow_files = True,
@@ -302,7 +302,7 @@
```bzl
# Import a collection of class jars and source jars from filegroup labels.
-kotlin_import(
+kt_jvm_import(
name = "kodein",
jars = [
"@com_github_salomonbrys_kodein_kodein//jar:file",
@@ -311,7 +311,7 @@
)
# Import a single kotlin jar.
-kotlin_import(
+kt_jvm_import(
name = "kotlin-runtime",
jars = ["lib/kotlin-runtime.jar"],
srcjar = "lib/kotlin-runtime-sources.jar"
diff --git a/kotlin/workers/bootstrap.bzl b/kotlin/workers/bootstrap.bzl
index 70fccd5..64db6f3 100644
--- a/kotlin/workers/bootstrap.bzl
+++ b/kotlin/workers/bootstrap.bzl
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-load("//kotlin:kotlin.bzl", _for_ide = "kotlin_library")
+load("//kotlin:kotlin.bzl", _for_ide = "kt_jvm_library")
_HEADER = """
function join_by { local IFS="$$1"; shift; echo "$$*"; }
@@ -40,9 +40,6 @@
JAVA_HOME=external/local_jdk ./$(location @com_github_jetbrains_kotlin//:kotlinc) -cp $${CP} -d $(OUTS) $${ARGS} $(SRCS)
""") % (name,args)
-
-
-
def kotlin_worker_lib(srcs =[], args = [], deps=[], runtime_deps=[], exports=[]):
name = "worker"
dep_label = name + "_deps"
diff --git a/kotlin/workers/src/io/bazel/ruleskotlin/workers/compilers/jvm/actions/KotlinMainCompile.kt b/kotlin/workers/src/io/bazel/ruleskotlin/workers/compilers/jvm/actions/KotlinMainCompile.kt
index 0be74ba..33518e6 100644
--- a/kotlin/workers/src/io/bazel/ruleskotlin/workers/compilers/jvm/actions/KotlinMainCompile.kt
+++ b/kotlin/workers/src/io/bazel/ruleskotlin/workers/compilers/jvm/actions/KotlinMainCompile.kt
@@ -65,7 +65,6 @@
args.addAll(Metas.ALL_SOURCES.mustGet(ctx))
- println(args.joinToString(" "))
return args.toTypedArray()
}
diff --git a/tests/smoke/BUILD b/tests/smoke/BUILD
index 5233b03..76c1ec2 100644
--- a/tests/smoke/BUILD
+++ b/tests/smoke/BUILD
@@ -11,7 +11,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-load("//kotlin:kotlin.bzl", "kotlin_library", "kotlin_binary", "kotlin_test")
+load("//kotlin:kotlin.bzl", "kt_jvm_library", "kt_jvm_binary", "kt_jvm_test")
# a test resource library.
java_library(
@@ -20,7 +20,7 @@
resource_strip_prefix = "tests/smoke/resourcejar"
)
-kotlin_test(
+kt_jvm_test(
name = "junittest",
srcs = glob(["junittest/JunitTest.kt"]),
test_class="tests.smoke.junittest.JunitTest",
@@ -29,39 +29,39 @@
deps = ["@junit_junit//jar"]
)
-kotlin_library(
+kt_jvm_library(
name = "test_merge_resourcesjar",
srcs = glob(["testresources/src/*.kt"]),
resource_jars = [":resourcejar"],
)
-kotlin_library(
+kt_jvm_library(
name = "test_embed_resources",
srcs = glob(["testresources/src/*.kt"]),
resources = glob(["testresources/resources/**/*"]),
visibility = ["//visibility:public"]
)
-kotlin_library(
+kt_jvm_library(
name = "test_embed_resources_strip_prefix",
srcs = glob(["testresources/src/*.kt"]),
resources = glob(["testresources/resources/**/*"]),
resource_strip_prefix = "tests/smoke/testresources/resources"
)
-kotlin_library(
+kt_jvm_library(
name = "conventional_strip_resources",
srcs = glob(["testresources/src/*.kt"]),
resources = glob(["conventional_strip_resources/src/main/resources/**/*", "conventional_strip_resources/src/test/resources/**/*"])
)
-kotlin_library(
+kt_jvm_library(
name = "propagation_test_exporter_lib",
srcs = ["propagation/Stub.kt"],
exports = ["@junit_junit//jar"]
)
-kotlin_library(
+kt_jvm_library(
name = "propagation_test_runtime_lib",
srcs = ["propagation/Stub.kt"],
runtime_deps = ["@junit_junit//jar"]
@@ -96,19 +96,19 @@
deps = [":propagation_test_runtime_lib"]
)
-kotlin_binary(
+kt_jvm_binary(
name="helloworld",
srcs=glob(["helloworld/Main.kt"]),
main_class= "helloworld.Main",
data=glob(["data/*"]),
)
-kotlin_library(
+kt_jvm_library(
name = "hellojava",
srcs = glob(["hellojava/*.kt", "hellojava/*.java"]),
)
-kotlin_library(
+kt_jvm_library(
name = "hellojava_withmerge",
resources = glob(["resourcejar/**"]),
srcs = glob(["hellojava/*.kt", "hellojava/*.java"]),
