Merge branch 'main' into redsun82/kotlin-2.2.0-support

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.1.3-codeql.3")
+bazel_dep(name = "rules_kotlin", version = "2.1.3-codeql.4")
 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")

go/extractor/go.mod

@@ -10,7 +10,7 @@ toolchain go1.24.0
 //    bazel mod tidy
 require (
 	golang.org/x/mod v0.24.0
-	golang.org/x/tools v0.32.0
+	golang.org/x/tools v0.33.0
 )
 
-require golang.org/x/sync v0.13.0 // indirect
+require golang.org/x/sync v0.14.0 // indirect

go/extractor/go.sum

@@ -2,7 +2,7 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
 golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
-golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
-golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
-golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
+golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
+golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
+golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=

misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.3/MODULE.bazel renamed to misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.4/MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "rules_kotlin",
-    version = "2.1.3-codeql.3",
+    version = "2.1.3-codeql.4",
     compatibility_level = 1,
     repo_name = "rules_kotlin",
 )

misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.3/patches/codeql_add_language_version_option.patch renamed to misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.4/patches/codeql_add_language_version_option.patch

@@ -0,0 +1,13 @@
+diff --git a/src/main/starlark/core/repositories/kotlin/artifacts.bzl b/src/main/starlark/core/repositories/kotlin/artifacts.bzl
+index a837b1c..941671d 100644
+--- a/src/main/starlark/core/repositories/kotlin/artifacts.bzl
++++ b/src/main/starlark/core/repositories/kotlin/artifacts.bzl
+@@ -46,7 +46,7 @@ KOTLINC_ARTIFACTS = struct(
+         compile = {
+             "android-extensions-compiler": "lib/android-extensions-compiler.jar",
+             "android-extensions-runtime": "lib/android-extensions-runtime.jar",
+-            "annotations": "lib/annotations-13_0.jar",
++            "annotations": "lib/annotations-13.0.jar",
+             "kotlin-annotation-processing": "lib/kotlin-annotation-processing.jar",
+             "kotlin-annotation-processing-cli": "lib/kotlin-annotation-processing-cli.jar",
+             "kotlin-annotation-processing-compiler": "lib/kotlin-annotation-processing-compiler.jar",

misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.3/patches/codeql_do_not_emit_jdeps.patch renamed to misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.4/patches/codeql_do_not_emit_jdeps.patch

@@ -2,8 +2,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=",
         "fix_jdeps_merged_on_windows.patch": "sha256-MjLSrFVo0XnaIgO7FjsXJyWGb2563WJptr22P5tvmng=",
+        "fix_annotations_path.patch": "sha256-Q49xJoP1M1wYVWdWe9JX6h0PNdFceUIsyYE+TGLQJlc=",
+        "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.1.3-codeql.4/patches/fix_annotations_path.patch

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

misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.3/patches/fix_jdeps_merged_on_windows.patch renamed to misc/bazel/registry/modules/rules_kotlin/2.1.3-codeql.4/patches/fix_jdeps_merged_on_windows.patch

@@ -23,6 +23,7 @@ fn class_name(type_name: &str) -> String {
         "Literal" => "LiteralExpr".to_owned(),
         "ArrayExpr" => "ArrayExprInternal".to_owned(),
         "AsmOptions" => "AsmOptionsList".to_owned(),
+        "MacroStmts" => "MacroBlockExpr".to_owned(),
         _ if type_name.starts_with("Record") => type_name.replacen("Record", "Struct", 1),
         _ if type_name.ends_with("Type") => format!("{}Repr", type_name),
         _ => type_name.to_owned(),
@@ -36,6 +37,7 @@ fn property_name(type_name: &str, field_name: &str) -> String {
         ("MatchExpr", "expr") => "scrutinee",
         ("Variant", "expr") => "discriminant",
         ("FieldExpr", "expr") => "container",
+        ("MacroBlockExpr", "expr") => "tail_expr",
         (_, "name_ref") => "identifier",
         (_, "then_branch") => "then",
         (_, "else_branch") => "else_",