Merge remote-tracking branch 'upstream/master' into nk-compilationAvo…

…idanceKotlin_upstream * upstream/master: Move the KSP and compiler target definitions into rules_kotlin (bazelbuild#1014) Avoid running java_common#compile against KSP generated outputs (bazelbuild#990) Update kt_java_stub_template to 6.2.1 (bazelbuild#992) Disable strict deps for Android example (bazelbuild#1013) Group the all_tests jobs together in presubmit.yml (bazelbuild#1008) Add rules_java 6.4.0 (bazelbuild#1010) Update Bazel to 6.3.2 (bazelbuild#1007) Update rules_jvm_external to 5.3 (bazelbuild#1009) Migrate usages of deprecated `JavaInfo` fields (bazelbuild#1005) Remove unnecessary Java runtime dependencies (bazelbuild#1000)
nkoroste · Sep 15, 2023 · bc3ab47 · bc3ab47
2 parents ce390b2 + 8d79e6a
commit bc3ab47
Show file tree

Hide file tree

Showing 59 changed files with 437 additions and 333 deletions.
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
@@ -1,6 +1,6 @@
 ---
 validate_config: 1
-bazel: 6.1.1
+bazel: 6.3.2
 buildifier:
   version: 6.1.0
   # no lint warnings for the moment. They are basically a smoke alarm in hell.
@@ -12,6 +12,9 @@ tasks:
       - "//:all_tests"
     build_targets:
       - "//:rules_kotlin_release"
+  macos:
+    test_targets:
+      - "//:all_tests"
   rbe_ubuntu1604:
     test_targets:
       - "--"
@@ -24,9 +27,6 @@ tasks:
       # Override the default worker strategy for remote builds (worker strategy
       # cannot be used with remote builds)
       - "--strategy=KotlinCompile=remote"
-  macos:
-    test_targets:
-      - "//:all_tests"
   example-android:
     name: "Example - Android"
     platform: ubuntu1804

diff --git a/.bazelversion b/.bazelversion
@@ -1 +1 @@
-6.1.1
+6.3.2
diff --git a/README.md b/README.md
@@ -320,7 +320,7 @@ kt_compiler_plugin(
         "annotation": "plugin.allopen.OpenForTesting",
     },
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 

diff --git a/docs/kotlin.md b/docs/kotlin.md
@@ -211,7 +211,7 @@ kt_jvm_test(<a href="#kt_jvm_test-name">name</a>, <a href="#kt_jvm_test-associat
         
         **Notes:**
         * The kotlin test library is not added implicitly, it is available with the label
-        `@com_github_jetbrains_kotlin//:kotlin-test`.
+        `@io_bazel_rules_kotlin//kotlin/compiler:kotlin-test`.
 
 
 **ATTRIBUTES**
@@ -330,7 +330,7 @@ kt_compiler_plugin(<a href="#kt_compiler_plugin-name">name</a>, <a href="#kt_com
                 "annotation": "plugin.OpenForTesting",
             },
             deps = [
-                "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+                "//kotlin/compiler:allopen-compiler-plugin",
             ],
         )
         

diff --git a/examples/android/WORKSPACE b/examples/android/WORKSPACE
@@ -33,7 +33,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/android/bzl/BUILD.bazel b/examples/android/bzl/BUILD.bazel
@@ -12,10 +12,6 @@ kt_javac_options(
 define_kt_toolchain(
     name = "experimental_toolchain",
     api_version = "1.5",
-    # TODO(630): enable when the reduced classpath can correctly manage transitive maven dependencies.
-    # experimental_reduce_classpath_mode = "KOTLINBUILDER_REDUCED",
-    experimental_report_unused_deps = "warn",
-    experimental_strict_kotlin_deps = "warn",
     experimental_use_abi_jars = True,
     javac_options = ":default_javac_options",
     kotlinc_options = ":default_kotlinc_options",

diff --git a/examples/android/libKtAndroid/BUILD.bazel b/examples/android/libKtAndroid/BUILD.bazel
@@ -8,7 +8,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.serialization",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlinx-serialization-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlinx-serialization-compiler-plugin",
     ],
 )
 

diff --git a/examples/anvil/WORKSPACE b/examples/anvil/WORKSPACE
@@ -51,7 +51,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/associates/WORKSPACE b/examples/associates/WORKSPACE
@@ -39,7 +39,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/dagger/WORKSPACE b/examples/dagger/WORKSPACE
@@ -21,7 +21,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/deps/WORKSPACE b/examples/deps/WORKSPACE
@@ -31,7 +31,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/jetpack_compose/WORKSPACE b/examples/jetpack_compose/WORKSPACE
@@ -38,7 +38,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/ksp/WORKSPACE b/examples/ksp/WORKSPACE
@@ -32,7 +32,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/node/WORKSPACE b/examples/node/WORKSPACE
@@ -25,7 +25,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 http_archive(

diff --git a/examples/plugin/WORKSPACE b/examples/plugin/WORKSPACE
@@ -23,7 +23,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/examples/plugin/src/allopen/BUILD b/examples/plugin/src/allopen/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 

diff --git a/examples/plugin/src/allopennoarg/BUILD b/examples/plugin/src/allopennoarg/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:allopen-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:allopen-compiler-plugin",
     ],
 )
 
@@ -23,7 +23,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:noarg-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:noarg-compiler-plugin",
     ],
 )
 
@@ -64,7 +64,7 @@ kt_jvm_test(
     test_class = "plugin.allopennoarg.UserHasNoargConstructorTest",
     deps = [
         ":user",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-reflect",
         "@maven//:junit_junit",
     ],
 )
diff --git a/examples/plugin/src/noarg/BUILD b/examples/plugin/src/noarg/BUILD
@@ -10,7 +10,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:noarg-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:noarg-compiler-plugin",
     ],
 )
 
@@ -35,7 +35,7 @@ kt_jvm_test(
     test_class = "plugin.noarg.UserHasNoargConstructorTest",
     deps = [
         ":user",
-        "@com_github_jetbrains_kotlin//:kotlin-reflect",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlin-reflect",
         "@maven//:junit_junit",
     ],
 )
diff --git a/examples/plugin/src/parcelize/BUILD b/examples/plugin/src/parcelize/BUILD
@@ -8,7 +8,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.parcelize",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:parcelize-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:parcelize-compiler-plugin",
     ],
 )
 
@@ -21,7 +21,7 @@ kt_jvm_library(
     ],
     visibility = ["//visibility:public"],
     exports = [
-        "@com_github_jetbrains_kotlin//:parcelize-runtime",
+        "@io_bazel_rules_kotlin//kotlin/compiler:parcelize-runtime",
     ],
 )
 

diff --git a/examples/plugin/src/sam_with_receiver/BUILD b/examples/plugin/src/sam_with_receiver/BUILD
@@ -11,7 +11,7 @@ kt_compiler_plugin(
     },
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:sam-with-receiver-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:sam-with-receiver-compiler-plugin",
     ],
 )
 

diff --git a/examples/plugin/src/serialization/BUILD b/examples/plugin/src/serialization/BUILD
@@ -7,7 +7,7 @@ kt_compiler_plugin(
     id = "org.jetbrains.kotlin.serialization",
     stubs_phase = True,
     deps = [
-        "@com_github_jetbrains_kotlin//:kotlinx-serialization-compiler-plugin",
+        "@io_bazel_rules_kotlin//kotlin/compiler:kotlinx-serialization-compiler-plugin",
     ],
 )
 

diff --git a/examples/trivial/WORKSPACE b/examples/trivial/WORKSPACE
@@ -23,7 +23,10 @@ http_archive(
     name = "rules_jvm_external",
     sha256 = versions.RULES_JVM_EXTERNAL_SHA,
     strip_prefix = "rules_jvm_external-%s" % versions.RULES_JVM_EXTERNAL_TAG,
-    url = "https://github.com/bazelbuild/rules_jvm_external/archive/%s.zip" % versions.RULES_JVM_EXTERNAL_TAG,
+    url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (
+        versions.RULES_JVM_EXTERNAL_TAG,
+        versions.RULES_JVM_EXTERNAL_TAG,
+    ),
 )
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")

diff --git a/kotlin/BUILD b/kotlin/BUILD
@@ -28,6 +28,7 @@ release_archive(
         "BUILD.release.bazel": "BUILD.bazel",
     },
     deps = [
+        "//kotlin/compiler:pkg",
         "//kotlin/internal:pkg",
         "//kotlin/settings:pkg",
     ],

diff --git a/kotlin/compiler/BUILD b/kotlin/compiler/BUILD
@@ -0,0 +1,32 @@
+# 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(":compiler.bzl", "kt_configure_compiler")
+load(":ksp.bzl", "kt_configure_ksp")
+load("//src/main/starlark/release:packager.bzl", "release_archive")
+
+package(default_visibility = ["//visibility:public"])
+
+# Configures the compiler
+kt_configure_compiler()
+
+# Configures the KSP plugins
+kt_configure_ksp()
+
+release_archive(
+    name = "pkg",
+    srcs = glob(["*.bzl"]),
+    src_map = {
+        "BUILD.release.bazel": "BUILD.bazel",
+    },
+)
diff --git a/kotlin/compiler/BUILD.release.bazel b/kotlin/compiler/BUILD.release.bazel
@@ -0,0 +1,23 @@
+# 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(":compiler.bzl", "kt_configure_compiler")
+load(":ksp.bzl", "kt_configure_ksp")
+
+package(default_visibility = ["//visibility:public"])
+
+# Configures the compiler
+kt_configure_compiler()
+
+# Configures the KSP plugins
+kt_configure_ksp()