Merge pull request #19385 from github/redsun82/update-rules-kotlin

Bazel: update `rules_kotlin` to 2.1.3

Author: redsun82

MODULE.bazel

@@ -24,7 +24,7 @@ bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "abseil-cpp", version = "20240116.1", repo_name = "absl")
 bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "json")
 bazel_dep(name = "fmt", version = "10.0.0")
-bazel_dep(name = "rules_kotlin", version = "2.0.0-codeql.1")
+bazel_dep(name = "rules_kotlin", version = "2.1.3-codeql.1")
 bazel_dep(name = "gazelle", version = "0.40.0")
 bazel_dep(name = "rules_dotnet", version = "0.17.4")
 bazel_dep(name = "googletest", version = "1.14.0.bcr.1")

misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/source.json

@@ -1,11 +1,11 @@
 module(
     name = "rules_kotlin",
-    version = "2.0.0-codeql.1",
+    version = "2.1.3-codeql.1",
     compatibility_level = 1,
     repo_name = "rules_kotlin",
 )
 
-bazel_dep(name = "platforms", version = "0.0.10")
+bazel_dep(name = "platforms", version = "0.0.11")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "rules_java", version = "7.2.0")
 bazel_dep(name = "rules_python", version = "0.23.1")

misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/MODULE.bazel renamed to misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.1/MODULE.bazel

@@ -1,13 +1,11 @@
-We need to build different extractor variants with different -language-version options, which is not allowed
-in current kotlin_rules
 diff --git a/src/main/starlark/core/options/opts.kotlinc.bzl b/src/main/starlark/core/options/opts.kotlinc.bzl
-index 5e1461b..b93e6aa 100644
+index 76df826..ef2d6ca 100644
 --- a/src/main/starlark/core/options/opts.kotlinc.bzl
 +++ b/src/main/starlark/core/options/opts.kotlinc.bzl
 @@ -33,6 +33,11 @@ def _map_jdk_release_to_flag(version):
          return None
      return ["-Xjdk-release=%s" % version]
-
+ 
 +def _map_language_version_to_flag(version):
 +    if not version:
 +        return None
@@ -16,7 +14,7 @@ index 5e1461b..b93e6aa 100644
  _KOPTS_ALL = {
      "warn": struct(
          args = dict(
-@@ -417,6 +422,15 @@ _KOPTS_ALL = {
+@@ -429,6 +434,15 @@ _KOPTS_ALL = {
          value_to_flag = None,
          map_value_to_flag = _map_jdk_release_to_flag,
      ),
@@ -30,5 +28,5 @@ index 5e1461b..b93e6aa 100644
 +        map_value_to_flag = _map_language_version_to_flag,
 +    ),
  }
-
- # Filters out options that are not available in current compiler release
+ 
+ def _merge(key, rule_defined):

misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_add_language_version_option.patch renamed to misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.1/patches/codeql_add_language_version_option.patch

@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-4USKVrJGJAeyaI3qht9cN1s2oJkb1HjC3dlMlxaBJeI=",
+    "url": "https://github.com/bazelbuild/rules_kotlin/releases/download/v2.1.3/rules_kotlin-v2.1.3.tar.gz",
+    "patches": {
+        "codeql_do_not_emit_jdeps.patch": "sha256-1ir4Aio1SICxnj1wafQ0GefT/m7bwn2n+SQwq19V3A8=",
+        "codeql_add_language_version_option.patch": "sha256-F7RthnrO6kJlCNcQ76L1Utqll2OwyeFZ/HmT82NwgB4="
+    },
+    "patch_strip": 1
+}

misc/bazel/registry/modules/rules_kotlin/2.0.0-codeql.1/patches/codeql_do_not_emit_jdeps.patch renamed to misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.1/patches/codeql_do_not_emit_jdeps.patch

@@ -21,7 +21,7 @@
         "github:bazelbuild/rules_kotlin"
     ],
     "versions": [
-        "2.0.0-codeql.1"
+        "2.1.3-codeql.1"
     ],
     "yanked_versions": {}
 }