Release the Kotlin rules in a simplified workspace relying on precomp…

…iled jars. (bazelbuild#271) * Add work around for Intellij SrcJar bug: github.com/bazelbuild/intellij/issues/1616 * Move android_sdk to 3rd_party Move toolchain configuration to the toolchains.bzl Issue: bazelbuild#269 (comment) * Introduce release_archive for packaging the Kotlin rules. Added //:rules_kotlin_release to build a release. Issue: bazelbuild#269 (comment) * Move maven repo back to kotlin_repos Make examples use the release repository Issue: bazelbuild#269 (comment) * Move maven repo back to kotlin_repos Make examples use the release repository Issue: bazelbuild#269 (comment) * Move maven repo back to kotlin_repos Make examples use the release repository Make git ignore profiling artifacts Issue: bazelbuild#269 (comment) * Apply buildifier and update reflow_skylark script to run. * Removed extranous visibility. * Fixing merge errors in packager.bzl * build the release in the parent directory. * rename to retry presubmit * fix accidental target rename.
cgruber · Feb 10, 2020 · ae70089 · ae70089
1 parent f447621
commit ae70089
Show file tree

Hide file tree

Showing 71 changed files with 529 additions and 81 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -3,11 +3,15 @@ validate_config: 1
 bazel: 1.1.0
 tasks:
   ubuntu1604:
+    build_targets:
+      - "//:rules_kotlin_release"
     test_targets:
-    - "//:all_tests"
+      - "//:all_tests"
   ubuntu1804:
     test_targets:
-    - "//:all_tests"
+      - "//:all_tests"
+    build_targets:
+      - "//:rules_kotlin_release"
   rbe_ubuntu1604:
     test_targets:
     - "--"
@@ -26,13 +30,21 @@ tasks:
   example-android:
     name: "Example - Android"
     platform: ubuntu1804
+    shell_command:
+      - "cd .. && bazel build //:rules_kotlin_release_release && rm -rf /tmp/rules_kotlin_release && mkdir -p /tmp/rules_kotlin_release && tar -C /tmp/rules_kotlin_release -xvf bazel-bin/rules_kotlin_release_release.tgz"
     working_directory: examples/android
+    test_flags:
+      - "--override_repository=io_bazel_rules_kotlin_release=/tmp/rules_kotlin_release"
     test_targets:
       - //...
   examples-trivial:
     name: "Example - Trivial"
     platform: ubuntu1804
+    shell_command:
+      - "cd .. && bazel build //:rules_kotlin_release_release && rm -rf /tmp/rules_kotlin_release && mkdir -p /tmp/rules_kotlin_release && tar -C /tmp/rules_kotlin_release -xvf bazel-bin/rules_kotlin_release_release.tgz"
     working_directory: examples/trivial
+    test_flags:
+      - "--override_repository=io_bazel_rules_kotlin_release=/tmp/rules_kotlin_release"
     include_json_profile:
       - build
       - test
@@ -41,10 +53,14 @@ tasks:
   examples-nodejs:
     name: Example - Node
     platform: ubuntu1804
+    shell_command:
+      - "cd bazel build //:rules_kotlin_release_release && rm -rf /tmp/rules_kotlin_release && mkdir -p /tmp/rules_kotlin_release && tar -C /tmp/rules_kotlin_release -xvf bazel-bin/rules_kotlin_release_release.tgz"
     working_directory: examples/node
     include_json_profile:
       - build
       - test
+    test_flags:
+      - "--override_repository=io_bazel_rules_kotlin_release=/tmp/rules_kotlin_release"
     build_targets:
       - //coroutines-helloworld/...
       - //express/...
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 **/.ijwb
 **/.aswb
 **/.vscode
+trace.profile.gz
diff --git a/BUILD b/BUILD
@@ -11,6 +11,8 @@
 # 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/utils:packager.bzl", "release_archive")
+load("//kotlin/internal/utils:utils.bzl", "utils")
 
 exports_files([
     "scripts/noop.sh",
@@ -33,3 +35,17 @@ test_suite(
         "//src/test/kotlin/io/bazel/kotlin:local_assertion_tests",
     ],
 )
+
+# Release target.
+release_archive(
+    name = "rules_kotlin_release",
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+        "WORKSPACE.release.bazel": "WORKSPACE",
+    },
+    deps = [
+        "//kotlin:pkg",
+        "//src/main/kotlin:pkg",
+        "//third_party:pkg",
+    ],
+)
diff --git a/BUILD.release.bazel b/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/WORKSPACE b/WORKSPACE
@@ -80,6 +80,11 @@ rbe_autoconfig(
     name = "buildkite_config",
 )
 
+load(
+    "//third_party/jvm:workspace.bzl", "maven_dependencies",
+)
+
+maven_dependencies()
 load("//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
 
 kotlin_repositories()
@@ -126,3 +131,8 @@ 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",
+)
diff --git a/WORKSPACE.release.bazel b/WORKSPACE.release.bazel
@@ -0,0 +1,14 @@
+# Copyright 2018 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.
+workspace(name = "io_bazel_rules_kotlin")
diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE
@@ -58,6 +58,7 @@ kotlin_repositories()
 
 kt_register_toolchains()
 
+
 # Skylib, for build_test, so don't bother initializing the unit test infrastructure.
 http_archive(
     name = "bazel_skylib",
@@ -66,3 +67,9 @@ http_archive(
         "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.2/bazel-skylib-1.0.2.tar.gz",
     ],
 )
+
+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",
+)
diff --git a/examples/dagger/BUILD b/examples/dagger/BUILD
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 load("@rules_java//java:defs.bzl", "java_binary", "java_library", "java_plugin")
+
 package(default_visibility = ["//visibility:private"])
 
 load("//kotlin:kotlin.bzl", "kt_jvm_library")

diff --git a/examples/node/BUILD b/examples/node/BUILD
@@ -15,22 +15,22 @@ load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_js_import")
 
 # Create kt_js_imports for KotlinX's Coroutines and Atomicfu libraries.
 #
-# These could be imported using package.json and NPM, but they are here as an example of how to 
+# These could be imported using package.json and NPM, but they are here as an example of how to
 # use KotlinJS libraries hosted on Maven directly.
 #
 # Note: It's important that the `name`s correspond to the base name of the library only (ie. not-ending with -js/_js)
 kt_js_import(
     name = "kotlinx-coroutines-core",
     jars = [
-        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_js"
+        "@maven//:org_jetbrains_kotlinx_kotlinx_coroutines_core_js",
     ],
     visibility = ["//:__subpackages__"],
 )
 
 kt_js_import(
     name = "kotlinx-atomicfu",
     jars = [
-        "@maven//:org_jetbrains_kotlinx_atomicfu_js"
+        "@maven//:org_jetbrains_kotlinx_atomicfu_js",
     ],
     visibility = ["//:__subpackages__"],
 )
diff --git a/examples/node/WORKSPACE b/examples/node/WORKSPACE
@@ -47,3 +47,9 @@ maven_install(
         "https://repo1.maven.org/maven2",
     ],
 )
+
+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",
+)
diff --git a/examples/node/coroutines-helloworld/BUILD b/examples/node/coroutines-helloworld/BUILD
@@ -17,16 +17,16 @@ load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
 kt_js_library(
     name = "app",
     srcs = ["Main.kt"],
+    visibility = ["//visibility:public"],
     deps = [
         "//:kotlinx-coroutines-core",
     ],
-    visibility = ["//visibility:public"],
 )
 
 nodejs_binary(
     name = "coroutines-helloworld",
-    node_modules = "@node_ws//:node_modules",
     data = [":app"],
     entry_point = ":app.js",
+    node_modules = "@node_ws//:node_modules",
     visibility = ["//visibility:public"],
 )
diff --git a/examples/node/express/BUILD b/examples/node/express/BUILD
@@ -20,25 +20,25 @@ kt_js_library(
     name = "acme-routes",
     srcs = [":Routes.kt"],
     deps = [
-        "//express/auth:acme-auth", 
         "//:kotlinx-atomicfu",
         "//:kotlinx-coroutines-core",
+        "//express/auth:acme-auth",
     ],
 )
 
 kt_js_library(
-    name ="app",
+    name = "app",
     srcs = [":App.kt"],
     deps = [
-        ":acme-routes", 
+        ":acme-routes",
         "//:kotlinx-coroutines-core",
     ],
 )
 
 # The binary demonstrates an express app composed of three modules. The modules can co-exist in the same directory.
 nodejs_binary(
     name = "express",
-    node_modules = "@node_ws//:node_modules",
     data = [":app"],
     entry_point = ":app.js",
+    node_modules = "@node_ws//:node_modules",
 )
diff --git a/examples/node/express/auth/BUILD b/examples/node/express/auth/BUILD
@@ -16,5 +16,5 @@ load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kt_js_library")
 kt_js_library(
     name = "acme-auth",
     srcs = ["Auth.kt"],
-    visibility=["//visibility:public"]
+    visibility = ["//visibility:public"],
 )
diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE
@@ -42,3 +42,9 @@ maven_install(
         "https://repo1.maven.org/maven2",
     ],
 )
+
+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",
+)
diff --git a/kotlin/BUILD b/kotlin/BUILD
@@ -11,3 +11,12 @@
 # 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/utils:packager.bzl", "release_archive")
+
+release_archive(
+    name = "pkg",
+    srcs = glob(["*.*"]) + ["BUILD"],
+    deps = [
+        "//kotlin/internal:pkg",
+    ],
+)
diff --git a/kotlin/internal/BUILD b/kotlin/internal/BUILD
@@ -1,4 +1,4 @@
-# Copyright 2018 The Bazel Authors. All rights reserved.
+# 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.
@@ -11,23 +11,23 @@
 # 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", "define_kt_toolchain")
 
-config_setting(
-    name = "builder_debug_timings",
-    values = {"define": "kt_timings=1"},
-)
-
-config_setting(
-    name = "builder_debug_trace",
-    values = {"define": "kt_trace=1"},
-)
+load("//kotlin/internal:toolchains.bzl", "kt_configure_toolchains")
+load("//kotlin/internal/utils:packager.bzl", "release_archive")
 
-toolchain_type(
-    name = "kt_toolchain_type",
-    visibility = ["//visibility:public"],
-)
+# Configures the toolchains
+kt_configure_toolchains()
 
-define_kt_toolchain(
-    name = "default_toolchain",
+release_archive(
+    name = "pkg",
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+    deps = [
+        "//kotlin/internal/js:pkg",
+        "//kotlin/internal/jvm:pkg",
+        "//kotlin/internal/repositories:pkg",
+        "//kotlin/internal/utils:pkg",
+    ],
 )
diff --git a/kotlin/internal/BUILD.release.bazel b/kotlin/internal/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/js/BUILD b/kotlin/internal/js/BUILD
@@ -11,9 +11,22 @@
 # 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/utils:packager.bzl", "release_archive")
 
+# TODO(https://github.com/bazelbuild/rules_kotlin/issues/270): Replace with Starlark
 py_binary(
     name = "importer",
     srcs = ["importer.py"],
     visibility = ["//visibility:public"],
 )
+
+release_archive(
+    name = "pkg",
+    srcs = glob([
+        "*.bzl",
+        "*.py",
+    ]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+)
diff --git a/kotlin/internal/js/BUILD.release.bazel b/kotlin/internal/js/BUILD.release.bazel
@@ -0,0 +1,19 @@
+# Copyright 2018 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.
+
+py_binary(
+    name = "importer",
+    srcs = ["importer.py"],
+    visibility = ["//visibility:public"],
+)
diff --git a/kotlin/internal/js/impl.bzl b/kotlin/internal/js/impl.bzl
@@ -111,6 +111,7 @@ def _strip_version(jarfile):
     if not jarfile.endswith(".jar"):
         fail("_strip_version expects paths ending with .jar")
     segments = jarfile[:-len(".jar")].split("-")
+
     # Remove the last segment if all digits separated by dot
     parts = segments[-1].split(".")
     if len([p for p in parts if not p.isdigit()]) == 0: