Fix release packaging to exclude references to non-release targets.

Corbin Smith · cgruber · commit 19658cdc178c · 2020-11-16T00:52:38.000-08:00
Added a query check to release.sh to ensure that the release graph is correct.
diff --git a/WORKSPACE b/WORKSPACE
@@ -13,20 +13,24 @@
 # limitations under the License.
 workspace(name = "io_bazel_rules_kotlin")
 
-
 load("//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies")
+
 kt_download_local_dev_dependencies()
 
 load("//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
+
 kotlin_repositories()
+
 kt_register_toolchains()
 
 # Creates toolchain configuration for remote execution with BuildKite CI
 # for rbe_ubuntu1604
 load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
+
 rbe_autoconfig(
     name = "buildkite_config",
 )
 
 android_sdk_repository(name = "androidsdk")
+
 android_ndk_repository(name = "androidndk")
diff --git a/WORKSPACE.release.bazel b/WORKSPACE.release.bazel
@@ -11,4 +11,4 @@
 # 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.
-workspace(name = "io_bazel_rules_kotlin")
+workspace(name = "io_bazel_rules_kotlin")
diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE
@@ -52,8 +52,8 @@ local_repository(
     path = "../..",
 )
 
-
 load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies")
+
 kt_download_local_dev_dependencies()
 
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
@@ -62,7 +62,6 @@ kotlin_repositories()
 
 kt_register_toolchains()
 
-
 # Skylib, for build_test, so don't bother initializing the unit test infrastructure.
 http_archive(
     name = "bazel_skylib",
@@ -74,6 +73,6 @@ http_archive(
 
 http_archive(
     name = "rules_pkg",
-    url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
     sha256 = "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
-)
+    url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
+)
diff --git a/examples/node/WORKSPACE b/examples/node/WORKSPACE
@@ -3,14 +3,17 @@ workspace(name = "kotlin_node_examples")
 # Directly load the kotlin rules from the parent repo.
 local_repository(
     name = "io_bazel_rules_kotlin",
-    path = "../.."
+    path = "../..",
 )
 
 load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies")
+
 kt_download_local_dev_dependencies()
 
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
+
 kotlin_repositories()
+
 kt_register_toolchains()
 
 # Node example dependencies
@@ -40,4 +43,4 @@ yarn_install(
     name = "node_ws",
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
-)
+)
diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE
@@ -6,6 +6,7 @@ local_repository(
 )
 
 load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies")
+
 kt_download_local_dev_dependencies()
 
 load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
@@ -48,6 +49,6 @@ maven_install(
 
 http_archive(
     name = "rules_pkg",
-    url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
     sha256 = "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
+    url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
 )
diff --git a/kotlin/BUILD b/kotlin/BUILD
@@ -17,7 +17,10 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 release_archive(
     name = "pkg",
-    srcs = glob(["*.*"]) + ["BUILD"],
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
     deps = [
         "//kotlin/internal:pkg",
     ],
@@ -37,6 +40,18 @@ stardoc(
     out = "kotlin.md",
     input = "rules.bzl",
     rule_template = "//kotlin:doc-templates/rule.vm",
+    symbol_names = [
+        "define_kt_toolchain",
+        "kt_js_library",
+        "kt_js_import",
+        "kt_register_toolchains",
+        "kt_jvm_binary",
+        "kt_jvm_import",
+        "kt_jvm_library",
+        "kt_jvm_test",
+        "kt_android_library",
+        "kt_compiler_plugin",
+    ],
     deps = [
         "kotlin",
     ],
diff --git a/kotlin/BUILD.release.bazel b/kotlin/BUILD.release.bazel
@@ -0,0 +1,13 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
diff --git a/kotlin/internal/defs.bzl b/kotlin/internal/defs.bzl
@@ -15,6 +15,10 @@
 # The Kotlin Toolchain type.
 TOOLCHAIN_TYPE = "@io_bazel_rules_kotlin//kotlin/internal:kt_toolchain_type"
 
+# Java toolchains
+JAVA_TOOLCHAIN_TYPE = "@bazel_tools//tools/jdk:toolchain_type"
+JAVA_RUNTIME_TOOLCHAIN_TYPE = "@bazel_tools//tools/jdk:runtime_toolchain_type"
+
 # The name of the Kotlin compiler workspace.
 KT_COMPILER_REPO = "com_github_jetbrains_kotlin"
 
diff --git a/kotlin/internal/jvm/BUILD b/kotlin/internal/jvm/BUILD
@@ -17,11 +17,17 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 release_archive(
     name = "pkg",
-    srcs = glob(["*.bzl"]) + ["BUILD"],
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
 )
 
 bzl_library(
     name = "jvm",
     srcs = glob(["*.bzl"]),
     visibility = ["//kotlin:__subpackages__"],
+    deps = [
+        "//third_party:java_tools_bzl",
+    ],
 )
diff --git a/kotlin/internal/jvm/BUILD.release.bazel b/kotlin/internal/jvm/BUILD.release.bazel
@@ -0,0 +1,17 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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/internal:toolchains.bzl", "kt_configure_toolchains")
+
+kt_configure_toolchains()
diff --git a/kotlin/internal/repositories/BUILD b/kotlin/internal/repositories/BUILD
@@ -16,11 +16,11 @@ load("//kotlin/internal/utils:packager.bzl", "release_archive")
 release_archive(
     name = "pkg",
     srcs = [
-        "BUILD",
         "BUILD.com_github_jetbrains_kotlin",
         "download.bzl",
     ],
     src_map = {
         "release_repositories.bzl": "repositories.bzl",
+        "BUILD.release.bazel": "BUILD.bazel",
     },
 )
diff --git a/kotlin/internal/repositories/BUILD.release.bazel b/kotlin/internal/repositories/BUILD.release.bazel
@@ -0,0 +1,17 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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/internal:toolchains.bzl", "kt_configure_toolchains")
+
+kt_configure_toolchains()
diff --git a/kotlin/internal/utils/BUILD b/kotlin/internal/utils/BUILD
@@ -16,7 +16,13 @@ load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 release_archive(
     name = "pkg",
-    srcs = glob(["*.bzl"]) + ["BUILD"],
+    srcs = glob(
+        ["*.bzl"],
+        exclude = ["packager.bzl"],
+    ),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
 )
 
 bzl_library(
diff --git a/kotlin/internal/utils/BUILD.release.bazel b/kotlin/internal/utils/BUILD.release.bazel
@@ -0,0 +1,17 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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/internal:toolchains.bzl", "kt_configure_toolchains")
+
+kt_configure_toolchains()
diff --git a/src/main/kotlin/BUILD b/src/main/kotlin/BUILD
@@ -55,6 +55,6 @@ release_archive(
         "BUILD.release.bazel": "BUILD.bazel",
     },
     deps = [
-        "//src/main/kotlin/io/bazel/kotlin/compiler:pkg"
-    ]
+        "//src/main/kotlin/io/bazel/kotlin/compiler:pkg",
+    ],
 )
diff --git a/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.release.bazel b/src/main/kotlin/io/bazel/kotlin/compiler/BUILD.release.bazel
@@ -1,7 +1,20 @@
+# Copyright 2020 The Bazel Authors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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("@rules_java//java:defs.bzl", "java_import")
 
 java_import(
     name = "compiler",
     jars = ["compiler.jar"],
-    visibility = ["//src:__subpackages__"]
+    visibility = ["//src:__subpackages__"],
 )
diff --git a/src/test/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel b/src/test/kotlin/io/bazel/kotlin/builder/tasks/BUILD.bazel
@@ -31,21 +31,30 @@ kt_rules_test(
 
 kt_rules_test(
     name = "KotlinBuilderJvmBasicTest",
+    size = "large",
     srcs = ["jvm/KotlinBuilderJvmBasicTest.java"],
-    size = "large"
 )
 
 kt_jvm_test(
     name = "BazelWorkerTest",
     srcs = ["BazelWorkerTest.kt"],
     test_class = "io.bazel.kotlin.builder.tasks.BazelWorkerTest",
     deps = [
-      "//src/main/kotlin/io/bazel/kotlin/builder/tasks:tasks",
-      "//src/test/kotlin/io/bazel/kotlin/builder:test_lib",
-      artifact("org.jetbrains.kotlinx:kotlinx-coroutines-core", repository_name="kotlin_rules_maven"),
-      artifact("org.jetbrains.kotlinx:kotlinx-coroutines-test", repository_name="kotlin_rules_maven"),
-      artifact("org.jetbrains.kotlinx:kotlinx-coroutines-debug", repository_name="kotlin_rules_maven"),
-    ]
+        "//src/main/kotlin/io/bazel/kotlin/builder/tasks",
+        "//src/test/kotlin/io/bazel/kotlin/builder:test_lib",
+        artifact(
+            "org.jetbrains.kotlinx:kotlinx-coroutines-core",
+            repository_name = "kotlin_rules_maven",
+        ),
+        artifact(
+            "org.jetbrains.kotlinx:kotlinx-coroutines-test",
+            repository_name = "kotlin_rules_maven",
+        ),
+        artifact(
+            "org.jetbrains.kotlinx:kotlinx-coroutines-debug",
+            repository_name = "kotlin_rules_maven",
+        ),
+    ],
 )
 
 # TODO(bazelbuild/rules_kotlin/issues/275): Remove full jar reference when the kt_rules_test handles jvm_import data better.
diff --git a/third_party/BUILD b/third_party/BUILD
@@ -16,6 +16,7 @@ package(default_visibility = ["//visibility:public"])
 load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_plugin")
 load("//kotlin:kotlin.bzl", "kt_jvm_import")
 load("//kotlin/internal/utils:packager.bzl", "release_archive")
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
 
 exports_files(["empty.jar"])
 
@@ -68,6 +69,11 @@ java_import(
     visibility = ["//visibility:public"],
 )
 
+bzl_library(
+    name = "java_tools_bzl",
+    srcs = ["@bazel_tools//tools:bzl_srcs"],
+)
+
 release_archive(
     name = "pkg",
     srcs = ["empty.jar"],

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ local_repository(`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`load("@io_bazel_rules_kotlin//kotlin:dependencies.bzl", "kt_download_local_dev_dependencies")`
	`9`	`+`
`9`	`10`	`kt_download_local_dev_dependencies()`
`10`	`11`
`11`	`12`	`load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")`
`@@ -48,6 +49,6 @@ maven_install(`
`48`	`49`
`49`	`50`	`http_archive(`
`50`	`51`	`name = "rules_pkg",`
`51`		`- url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",`
`52`	`52`	`sha256 = "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",`
	`53`	`+ url = "https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",`
`53`	`54`	`)`