upgrading to 2.17.5

java/documentation/library-coverage/coverage.csv

@@ -78,7 +78,7 @@ jakarta.xml.bind.attachment,,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,
 java.applet,,,14,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,14,
 java.awt,1,,5,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,2,3
 java.beans,,,193,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,193,
-java.io,51,1,256,,,,,,,,,22,,,,,,,,,,,,,,,29,,,,,,,,,,,,,,,,,,,,,,1,,249,7
+java.io,66,1,256,,,,,,,,,22,,,,,,,,,,,,,,,44,,,,,,,,,,,,,,,,,,,,,,1,,249,7
 java.lang,38,3,759,,13,,,,,,1,,,,,,,,,,,,8,,,,11,,,4,,,1,,,,,,,,,,,,,,,3,,,681,78
 java.math,,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9
 java.net,23,3,278,,,,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,21,,,,,,,,,,,,,,3,274,4

java/documentation/library-coverage/coverage.rst

@@ -18,10 +18,10 @@ Java framework & library support
    `Google Guava <https://guava.dev/>`_,``com.google.common.*``,,730,43,9,,,,,
    JBoss Logging,``org.jboss.logging``,,,324,,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
-   Java Standard Library,``java.*``,10,4267,240,80,,9,,,26
+   Java Standard Library,``java.*``,10,4267,255,95,,9,,,26
    Java extensions,"``javax.*``, ``jakarta.*``",69,3257,85,5,4,2,1,1,4
    Kotlin Standard Library,``kotlin*``,,1849,16,14,,,,,2
    `Spring <https://spring.io/>`_,``org.springframework.*``,38,481,122,5,,28,14,,35
    Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.mongodb``, ``com.opensymphony.xwork2``, ``com.rabbitmq.client``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.struts.beanvalidation.validation.interceptor``, ``org.apache.struts2``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.hibernate``, ``org.influxdb``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.jooq``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.w3c.dom``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``, ``sun.awt``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.management.spi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.nio.ch``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``, ``sun.util.logging.internal``",131,10596,893,125,6,22,18,,208
-   Totals,,310,25130,2569,338,16,128,33,1,409
+   Totals,,310,25130,2584,353,16,128,33,1,409
 

java/downgrades/BUILD.bazel

@@ -0,0 +1,12 @@
+load("@rules_pkg//:mappings.bzl", "pkg_files", "strip_prefix")
+
+pkg_files(
+    name = "downgrades",
+    srcs = glob(
+        ["**"],
+        exclude = ["BUILD.bazel"],
+    ),
+    prefix = "downgrades",
+    strip_prefix = strip_prefix.from_pkg(),
+    visibility = ["//visibility:public"],
+)

java/kotlin-extractor/BUILD.bazel

@@ -0,0 +1,185 @@
+"""
+# Usage overview
+Building the extractor can be done with bazel. If building from the internal repository, it is recommended to use
+`tools/bazel` from there.
+
+A specific kotlin extractor variant can be built with
+```
+bazel build @codeql//java/kotlin-extractor:codeql-extractor-kotlin-<variant>-<version>
+```
+where `<variant>` is either `standalone` or `embeddable`, and `<version>` is one of the supported versions.
+```
+bazel build @codeql//java/kotlin-extractor
+```
+will build a default variant:
+* standalone, unless `CODEQL_KOTLIN_SINGLE_VERSION_EMBEDDABLE` is set to true, in which case it will go for embeddable
+* the version will be taken as the last supported version less than the version of the currently installed `kotlinc`
+    * if `CODEQL_KOTLIN_SINGLE_VERSION` is set, that will be used instead
+    * if `kotlinc` is not installed, `1.9.20-Beta` will be used
+
+If `kotlinc` is updated, bazel won't be aware of it and will therefore keep the same default version. Possible workarounds for that:
+* `bazel clean`
+* `bazel fetch --force @codeql//java/kotlin-extractor`
+* `bazel fetch --force @codeql_kotlin_defaults//:all` (only from `codeql`)
+
+If building from the `codeql` repository, `@codeql` can be skipped.
+"""
+
+# This file is used in the `@codeql_kotlin_embeddable` external repo, which means we need to
+# reference explicitly @codeql
+load(
+    "@codeql//java/kotlin-extractor:versions.bzl",
+    "VERSIONS",
+    "get_compatilibity_sources",
+    "get_language_version",
+    "version_less",
+)
+load("@rules_kotlin//kotlin:core.bzl", "kt_javac_options", "kt_kotlinc_options")
+load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_library")
+
+package(default_visibility = ["//java/kotlin-extractor:__subpackages__"])
+
+_for_embeddable = repo_name().endswith("codeql_kotlin_embeddable")
+
+_common_extractor_name_prefix = "codeql-extractor-kotlin"
+
+_extractor_name_prefix = "%s-%s" % (
+    _common_extractor_name_prefix,
+    "embeddable" if _for_embeddable else "standalone",
+)
+
+py_binary(
+    name = "generate_dbscheme",
+    srcs = ["generate_dbscheme.py"],
+)
+
+_resources = [
+    (
+        r,
+        r[len("src/main/resources/"):],
+    )
+    for r in glob(["src/main/resources/**"])
+]
+
+kt_javac_options(
+    name = "javac-options",
+    release = "8",
+)
+
+[
+    (
+        kt_kotlinc_options(
+            name = "kotlinc-options-%s" % v,
+            include_stdlibs = "none",
+            jvm_target = "1.8",
+            language_version = get_language_version(v),
+            warn = "error",
+            x_optin = [
+                "kotlin.RequiresOptIn",
+                "org.jetbrains.kotlin.ir.symbols.%s" %
+                ("IrSymbolInternals" if version_less(v, "2.0.0") else "UnsafeDuringIrConstructionAPI"),
+            ],
+            x_suppress_version_warnings = True,
+        ),
+        # * extractor.name is different for each version, so we need to put it in different output dirs
+        # * in order to put it in `resources`, we need to define `resource_strip_prefix` to strip this version
+        # * `resource_strip_prefix` is unique per jar, so we must also put other resources under the same version prefix
+        genrule(
+            name = "resources-%s" % v,
+            srcs = [src for src, _ in _resources],
+            outs = [
+                "%s/com/github/codeql/extractor.name" % v,
+            ] + [
+                "%s/%s" % (v, target)
+                for _, target in _resources
+            ],
+            cmd = "\n".join([
+                "echo %s-%s > $(RULEDIR)/%s/com/github/codeql/extractor.name" % (_extractor_name_prefix, v, v),
+            ] + [
+                "cp $(execpath %s) $(RULEDIR)/%s/%s" % (source, v, target)
+                for source, target in _resources
+            ]),
+        ),
+        kt_jvm_library(
+            name = "%s-%s" % (_extractor_name_prefix, v),
+            srcs =
+                ["@codeql//java/kotlin-extractor:generated-dbscheme"] +
+                glob(
+                    [
+                        "src/**/*.kt",
+                        "src/**/*.java",
+                    ],
+                    exclude = ["src/main/kotlin/utils/versions/**"],
+                ) + get_compatilibity_sources(v, "src/main/kotlin/utils/versions"),
+            javac_opts = ":javac-options",
+            kotlinc_opts = ":kotlinc-options-%s" % v,
+            module_name = "codeql-kotlin-extractor",
+            # resource_strip_prefix is very nit-picky: the following makes it work from
+            # `codeql`, `@codeql_kotlin_embeddable` and `semmle-code`
+            resource_strip_prefix = (
+                ("../%s/" % repo_name() if repo_name() else "") +
+                ("%s/" % package_name() if package_name() else "") +
+                v
+            ),
+            resources = [
+                ":resources-%s" % v,
+            ],
+            visibility = ["//visibility:public"],
+            deps = [
+                "@kotlin-compiler%s-%s" % (
+                    "-embeddable" if _for_embeddable else "",
+                    v,
+                ),
+                "@kotlin-stdlib-%s" % v,
+            ],
+        ),
+        # if in main repository, alias the embeddable versions from the modified @codeql_kotlin_embeddable repo
+        alias(
+            name = "%s-embeddable-%s" % (_common_extractor_name_prefix, v),
+            actual = "@codeql_kotlin_embeddable//:%s-embeddable-%s" % (_common_extractor_name_prefix, v),
+            visibility = ["//visibility:public"],
+        ) if not _for_embeddable else None,
+    )
+    for v in VERSIONS
+]
+
+(
+    genrule(
+        name = "generated-dbscheme",
+        srcs = ["@codeql//java:dbscheme"],
+        outs = ["KotlinExtractorDbScheme.kt"],
+        cmd = "$(execpath :generate_dbscheme) $< $@",
+        tools = [":generate_dbscheme"],
+        visibility = ["@codeql_kotlin_embeddable//:__pkg__"],
+    ),
+    [
+        alias(
+            name = n,
+            actual = "//java/kotlin-extractor/defaults:%s" % n,
+            visibility = ["//visibility:public"],
+        )
+        for n in (
+            "%s-standalone" % _common_extractor_name_prefix,
+            "%s-embeddable" % _common_extractor_name_prefix,
+            _common_extractor_name_prefix,
+        )
+    ],
+    alias(
+        name = "kotlin-extractor",
+        actual = _common_extractor_name_prefix,
+        visibility = ["//visibility:public"],
+    ),
+    filegroup(
+        name = "many",
+        srcs = ["%s-%s-%s" % (
+            _common_extractor_name_prefix,
+            variant,
+            version,
+        ) for variant in ("standalone", "embeddable") for version in VERSIONS],
+        visibility = ["//visibility:public"],
+    ),
+    sh_binary(
+        name = "print-default-version",
+        srcs = ["//java/kotlin-extractor/defaults:default-version-printer"],
+    ),
+) if not _for_embeddable else None

java/kotlin-extractor/current_kotlin_version.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+
+import subprocess
+import re
+import shutil
+
+kotlinc = shutil.which('kotlinc')
+if kotlinc is None:
+    raise Exception("kotlinc not found")
+res = subprocess.run([kotlinc, "-version"], text=True, stdout=subprocess.DEVNULL, stderr=subprocess.PIPE)
+if res.returncode != 0:
+    raise Exception(f"kotlinc -version failed: {res.stderr}")
+m = re.match(r'.* kotlinc-jvm ([0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z][a-zA-Z0-9]*)?) .*', res.stderr)
+if m is None:
+    raise Exception(f'Cannot detect version of kotlinc (got {res.stderr})')
+print(m[1])

java/kotlin-extractor/defaults/BUILD.bazel

@@ -0,0 +1,36 @@
+load("@codeql_kotlin_defaults//:defaults.bzl", "kotlin_extractor_defaults")
+
+package(default_visibility = ["//java/kotlin-extractor:__pkg__"])
+
+_common_extractor_name_prefix = "codeql-extractor-kotlin"
+
+alias(
+    name = "%s-standalone" % _common_extractor_name_prefix,
+    actual = "//java/kotlin-extractor:%s-standalone-%s" % (
+        _common_extractor_name_prefix,
+        kotlin_extractor_defaults.extractor_version,
+    ),
+)
+
+alias(
+    name = "%s-embeddable" % _common_extractor_name_prefix,
+    actual = "//java/kotlin-extractor:%s-embeddable-%s" % (
+        _common_extractor_name_prefix,
+        kotlin_extractor_defaults.extractor_version,
+    ),
+)
+
+alias(
+    name = _common_extractor_name_prefix,
+    actual = "//java/kotlin-extractor:%s-%s-%s" % (
+        _common_extractor_name_prefix,
+        kotlin_extractor_defaults.variant,
+        kotlin_extractor_defaults.extractor_version,
+    ),
+)
+
+genrule(
+    name = "default-version-printer",
+    outs = ["print-default-version.sh"],
+    cmd = "echo echo %s > $@" % kotlin_extractor_defaults.version,
+)

java/kotlin-extractor/deps.bzl

@@ -0,0 +1,132 @@
+load("//java/kotlin-extractor:versions.bzl", "VERSIONS", "version_less")
+load("//misc/bazel:lfs.bzl", "lfs_smudge")
+
+_kotlin_dep_build = """
+load("@rules_kotlin//kotlin:jvm.bzl", "kt_jvm_import")
+
+kt_jvm_import(
+    name = "{name}",
+    jar = "{name}.jar",
+    visibility = ["//visibility:public"],
+)
+"""
+
+_empty_zip = "PK\005\006\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000\000"
+
+def _get_dep(repository_ctx, name):
+    return repository_ctx.path(Label("//java/kotlin-extractor/deps:%s" % name))
+
+def _kotlin_dep_impl(repository_ctx):
+    _, _, name = repository_ctx.name.rpartition("~")
+    lfs_smudge(repository_ctx, [_get_dep(repository_ctx, name + ".jar")])
+
+    # for some reason rules_kotlin warns about these jars missing, this is to silence those warnings
+    repository_ctx.file("empty.zip", _empty_zip)
+    for jar in (
+        "annotations-13.0.jar",
+        "kotlin-stdlib.jar",
+        "kotlin-reflect.jar",
+        "kotlin-script-runtime.jar",
+        "trove4j.jar",
+    ):
+        repository_ctx.symlink("empty.zip", jar)
+    repository_ctx.file("BUILD.bazel", _kotlin_dep_build.format(name = name))
+
+_kotlin_dep = repository_rule(
+    implementation = _kotlin_dep_impl,
+)
+
+def _walk(dir):
+    res = []
+    next_dirs = [dir]
+
+    # loops must be bounded in starlark
+    for i in range(100):
+        current_dirs = next_dirs
+        next_dirs = []
+        for d in current_dirs:
+            children = d.readdir()
+            next_dirs.extend([c for c in children if c.is_dir])
+            res.extend([c for c in children if not c.is_dir])
+        if not next_dirs:
+            return res
+    fail("%s directory too deep" % dir)
+
+def _embeddable_source_impl(repository_ctx):
+    src_dir = repository_ctx.path(Label("//java/kotlin-extractor:src"))
+    repository_ctx.watch_tree(src_dir)
+    for src in _walk(src_dir):
+        contents = repository_ctx.read(src)
+        contents = contents.replace(
+            "import com.intellij",
+            "import org.jetbrains.kotlin.com.intellij",
+        )
+        repository_ctx.file(str(src).replace(str(src_dir), "src"), contents)
+    repository_ctx.symlink(
+        Label("//java/kotlin-extractor:BUILD.bazel"),
+        "BUILD.bazel",
+    )
+
+_embeddable_source = repository_rule(implementation = _embeddable_source_impl)
+
+def _get_default_version(repository_ctx):
+    default_version = repository_ctx.getenv("CODEQL_KOTLIN_SINGLE_VERSION")
+    if default_version:
+        return default_version
+    kotlin_plugin_versions = repository_ctx.path(Label("//java/kotlin-extractor:current_kotlin_version.py"))
+    python = repository_ctx.which("python3") or repository_ctx.which("python")
+    env = {}
+    repository_ctx.watch(Label("//java/kotlin-extractor:dev/.kotlinc_version"))
+    if not repository_ctx.which("kotlinc"):
+        # take default from the kotlinc wrapper
+        path = repository_ctx.getenv("PATH")
+        path_to_add = repository_ctx.path(Label("//java/kotlin-extractor:dev"))
+        if not path:
+            path = str(path_to_add)
+        elif repository_ctx.os.name == "windows":
+            path = "%s;%s" % (path, path_to_add)
+        else:
+            path = "%s:%s" % (path, path_to_add)
+        env["PATH"] = path
+    res = repository_ctx.execute([python, kotlin_plugin_versions], environment = env)
+    if res.return_code != 0:
+        fail(res.stderr)
+    return res.stdout.strip()
+
+def _get_available_version(version):
+    for available_version in reversed(VERSIONS):
+        if not version_less(version, available_version):
+            return available_version
+    fail("no available version found for version %s among:\n  %s" % (version, " ".join(VERSIONS)))
+
+def _defaults_impl(repository_ctx):
+    default_version = _get_default_version(repository_ctx)
+    default_variant = "standalone"
+    if repository_ctx.getenv("CODEQL_KOTLIN_SINGLE_VERSION_EMBEDDABLE") in ("true", "1"):
+        default_variant = "embeddable"
+    available_version = _get_available_version(default_version)
+    info = struct(
+        version = default_version,
+        variant = default_variant,
+        extractor_version = available_version,
+    )
+    repository_ctx.file(
+        "defaults.bzl",
+        "kotlin_extractor_defaults = %s\n" % repr(info),
+    )
+    repository_ctx.file("BUILD.bazel")
+
+_defaults = repository_rule(implementation = _defaults_impl)
+
+def _kotlin_deps_impl(module_ctx):
+    for v in VERSIONS:
+        for lib in ("compiler", "compiler-embeddable", "stdlib"):
+            _kotlin_dep(name = "kotlin-%s-%s" % (lib, v))
+    _embeddable_source(name = "codeql_kotlin_embeddable")
+    _defaults(name = "codeql_kotlin_defaults")
+    return module_ctx.extension_metadata(
+        root_module_direct_deps = "all",
+        root_module_direct_dev_deps = [],
+    )
+
+kotlin_extractor_deps = module_extension(implementation = _kotlin_deps_impl)

java/kotlin-extractor/deps/LICENSE.md

@@ -0,0 +1,5 @@
+The Git LFS files contained in this directory are mirrored
+from [org.jetbrains.kotlin packages in the Maven repository][1]. A copy of the license is included as
+the [`license`](./license) file.
+
+[1]: https://mvnrepository.com/artifact/org.jetbrains.kotlin

java/kotlin-extractor/dev/.gitignore

@@ -0,0 +1,2 @@
+/.kotlinc_version
+/.kotlinc_installed

java/kotlin-extractor/dev/kotlin

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec -a "$0" "$(dirname "$0")/wrapper.py" kotlin "$@"

java/kotlin-extractor/dev/kotlin.bat

@@ -0,0 +1,4 @@
+@echo off
+
+python "%~dp0wrapper.py" kotlin %*
+exit /b %ERRORLEVEL%

java/kotlin-extractor/dev/kotlinc

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec -a "$0" "$(dirname "$0")/wrapper.py" kotlinc "$@"

java/kotlin-extractor/dev/kotlinc.bat

@@ -0,0 +1,4 @@
+@echo off
+
+python "%~dp0wrapper.py" kotlinc %*
+exit /b %ERRORLEVEL%

java/kotlin-extractor/dev/wrapper.py

@@ -0,0 +1,170 @@
+#!/usr/bin/env python3
+
+"""
+Wrapper script that manages kotlin versions.
+Usage: add this directory to your PATH, then
+* `kotlin* --select x.y.z` will select the version for the next invocations, checking it actually exists
+* `kotlin* --clear` will remove any state of the wrapper (deselecting a previous version selection)
+* `kotlinc -version` will print the selected version information. It will not print `JRE` information as a normal
+  `kotlinc` invocation would do though. In exchange, the invocation incurs no overhead.
+* Any other invocation will forward to the selected kotlin tool version, downloading it if necessary. If no version was
+  previously selected with `--select`, a default will be used (see `DEFAULT_VERSION` below)
+
+In order to install kotlin, ripunzip will be used if installed, or if running on Windows within `semmle-code` (ripunzip
+is available in `resources/lib/windows/ripunzip` then).
+"""
+
+import pathlib
+import urllib
+import urllib.request
+import urllib.error
+import argparse
+import sys
+import platform
+import subprocess
+import zipfile
+import shutil
+import io
+import os
+
+DEFAULT_VERSION = "2.0.0"
+
+def options():
+    parser = argparse.ArgumentParser(add_help=False)
+    parser.add_argument("tool")
+    parser.add_argument("--select")
+    parser.add_argument("--clear", action="store_true")
+    parser.add_argument("-version", action="store_true")
+    return parser.parse_known_args()
+
+
+url_template = 'https://github.com/JetBrains/kotlin/releases/download/v{version}/kotlin-compiler-{version}.zip'
+this_dir = pathlib.Path(__file__).resolve().parent
+version_file = this_dir / ".kotlinc_version"
+install_dir = this_dir / ".kotlinc_installed"
+windows_ripunzip = this_dir.parents[4] / "resources" / "lib" / "windows" / "ripunzip" / "ripunzip.exe"
+
+
+class Error(Exception):
+    pass
+
+
+class ZipFilePreservingPermissions(zipfile.ZipFile):
+    def _extract_member(self, member, targetpath, pwd):
+        if not isinstance(member, zipfile.ZipInfo):
+            member = self.getinfo(member)
+
+        targetpath = super()._extract_member(member, targetpath, pwd)
+
+        attr = member.external_attr >> 16
+        if attr != 0:
+            os.chmod(targetpath, attr)
+        return targetpath
+
+
+def check_version(version: str):
+    try:
+        with urllib.request.urlopen(url_template.format(version=version)) as response:
+            pass
+    except urllib.error.HTTPError as e:
+        if e.code == 404:
+            raise Error(f"Version {version} not found in github.com/JetBrains/kotlin/releases") from e
+        raise
+
+
+def get_version():
+    try:
+        return version_file.read_text()
+    except FileNotFoundError:
+        return None
+
+
+def install(version: str, quiet: bool):
+    if quiet:
+        info_out = subprocess.DEVNULL
+        info = lambda *args: None
+    else:
+        info_out = sys.stderr
+        info = lambda *args: print(*args, file=sys.stderr)
+    url = url_template.format(version=version)
+    if install_dir.exists():
+        shutil.rmtree(install_dir)
+    install_dir.mkdir()
+    ripunzip = shutil.which("ripunzip")
+    if ripunzip is None and platform.system() == "Windows" and windows_ripunzip.exists():
+        ripunzip = windows_ripunzip
+    if ripunzip:
+        info(f"downloading and extracting {url} using ripunzip")
+        subprocess.run([ripunzip, "unzip-uri", url], stdout=info_out, stderr=info_out, cwd=install_dir,
+                       check=True)
+        return
+    with io.BytesIO() as buffer:
+        info(f"downloading {url}")
+        with urllib.request.urlopen(url) as response:
+            while True:
+                bytes = response.read()
+                if not bytes:
+                    break
+                buffer.write(bytes)
+        buffer.seek(0)
+        info(f"extracting kotlin-compiler-{version}.zip")
+        with ZipFilePreservingPermissions(buffer) as archive:
+            archive.extractall(install_dir)
+
+
+def forward(tool, forwarded_opts):
+    tool = install_dir / "kotlinc" / "bin" / tool
+    if platform.system() == "Windows":
+        tool = tool.with_suffix(".bat")
+    assert tool.exists(), f"{tool} not found"
+    args = [tool]
+    args.extend(forwarded_opts)
+    ret = subprocess.run(args).returncode
+    sys.exit(ret)
+
+
+def clear():
+    if install_dir.exists():
+        print(f"removing {install_dir}", file=sys.stderr)
+        shutil.rmtree(install_dir)
+    if version_file.exists():
+        print(f"removing {version_file}", file=sys.stderr)
+        version_file.unlink()
+
+
+def main(opts, forwarded_opts):
+    if opts.clear:
+        clear()
+        return
+    current_version = get_version()
+    if opts.select == "default":
+        selected_version = DEFAULT_VERSION
+    elif opts.select is not None:
+        check_version(opts.select)
+        selected_version = opts.select
+    else:
+        selected_version = current_version or DEFAULT_VERSION
+    if selected_version != current_version:
+        # don't print information about install procedure unless explicitly using --select
+        install(selected_version, quiet=opts.select is None)
+        version_file.write_text(selected_version)
+    if opts.select and not forwarded_opts and not opts.version:
+        print(f"selected {selected_version}")
+        return
+    if opts.version:
+        if opts.tool == "kotlinc":
+            print(f"info: kotlinc-jvm {selected_version} (codeql dev wrapper)", file=sys.stderr)
+            return
+        forwarded_opts.append("-version")
+
+    forward(opts.tool, forwarded_opts)
+
+
+if __name__ == "__main__":
+    try:
+        main(*options())
+    except Error as e:
+        print(f"Error: {e}", file=sys.stderr)
+        sys.exit(1)
+    except KeyboardInterrupt:
+        sys.exit(1)

java/kotlin-extractor/generate_dbscheme.py

@@ -8,6 +8,7 @@ unions = {}
 tables = {}
 
 dbscheme = sys.argv[1] if len(sys.argv) >= 2 else '../ql/lib/config/semmlecode.dbscheme'
+output = sys.argv[2] if len(sys.argv) >= 3 else 'src/main/kotlin/KotlinExtractorDbScheme.kt'
 
 def parse_dbscheme(filename):
     with open(filename, 'r') as f:
@@ -152,7 +153,7 @@ def genTable(kt, relname, columns, enum = None, kind = None, num = None, typ = N
     kt.write(')\\n")\n')
     kt.write('}\n')
 
-with open('src/main/kotlin/KotlinExtractorDbScheme.kt', 'w') as kt:
+with open(output, 'w') as kt:
     kt.write('/* Generated by ' + sys.argv[0] + ': Do not edit manually. */\n')
     kt.write('package com.github.codeql\n')
     kt.write('import java.util.Date\n')

java/kotlin-extractor/kotlin_plugin_versions.py

@@ -44,7 +44,7 @@ def version_string_to_version(version):
     return Version(int(m.group(1)), int(m.group(2)), int(m.group(3)), m.group(4))
 
 # Version number used by CI.
-ci_version = '1.9.0'
+ci_version = '2.0.0'
 
 many_versions = [ '1.5.0', '1.5.10', '1.5.20', '1.5.30', '1.6.0', '1.6.20', '1.7.0', '1.7.20', '1.8.0', '1.9.0-Beta', '1.9.20-Beta', '2.0.0-RC1' ]
 
@@ -87,4 +87,3 @@ if __name__ == "__main__":
         print(get_single_version(*args[2:]))
     else:
         raise Exception("Unknown command: " + command)
-

java/kotlin-extractor/src/main/java/com/semmle/extractor/java/OdasaOutput.java

@@ -67,7 +67,9 @@ public class OdasaOutput {
 	private final Logger log;
 	private final Compression compression;
 
-	/** DEBUG only: just use the given file as the root for TRAP, source archive etc */
+	/**
+	 * DEBUG only: just use the given file as the root for TRAP, source archive etc
+	 */
 	OdasaOutput(File outputRoot, Compression compression, Logger log) {
 		this.trapFolder = new File(outputRoot, "trap");
 		this.sourceArchiveFolder = new File(outputRoot, "src_archive");
@@ -77,14 +79,16 @@ public class OdasaOutput {
 	}
 
 	public OdasaOutput(boolean trackClassOrigins, Compression compression, Logger log) {
-		String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR", Var.TRAP_FOLDER.name());
+		String trapFolderVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_TRAP_DIR",
+				Var.TRAP_FOLDER.name());
 		if (trapFolderVar == null) {
 			throw new ResourceError("CODEQL_EXTRACTOR_JAVA_TRAP_DIR was not set");
 		}
-		String sourceArchiveVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR", Var.SOURCE_ARCHIVE.name());
+		String sourceArchiveVar = Env.systemEnv().getFirstNonEmpty("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR",
+				Var.SOURCE_ARCHIVE.name());
 		if (sourceArchiveVar == null) {
 			throw new ResourceError("CODEQL_EXTRACTOR_JAVA_SOURCE_ARCHIVE_DIR was not set");
-    }
+		}
 		this.trapFolder = new File(trapFolderVar);
 		this.sourceArchiveFolder = new File(sourceArchiveVar);
 		this.trackClassOrigins = trackClassOrigins;
@@ -104,6 +108,7 @@ public class OdasaOutput {
 	 * Set the source file that is currently being processed. This may affect
 	 * things like trap and source archive directories, and persists as a
 	 * setting until this method is called again.
+	 *
 	 * @param f the current source file
 	 */
 	public void setCurrentSourceFile(File f) {
@@ -130,7 +135,7 @@ public class OdasaOutput {
 
 	private File trapSetFor(File file) {
 		return FileUtil.appendAbsolutePath(
-			currentSpecFileEntry.getTrapFolder(), PathTransformer.std().fileAsDatabaseString(file) + ".set");
+				currentSpecFileEntry.getTrapFolder(), PathTransformer.std().fileAsDatabaseString(file) + ".set");
 	}
 
 	public void addDependency(IrDeclaration sym, String signature) {
@@ -185,7 +190,8 @@ public class OdasaOutput {
 			return null;
 		return FileUtil.appendAbsolutePath(
 				currentSpecFileEntry.getTrapFolder(),
-				JARS_DIR + "/" + PathTransformer.std().fileAsDatabaseString(jarFile) + ".trap" + compression.getExtension());
+				JARS_DIR + "/" + PathTransformer.std().fileAsDatabaseString(jarFile) + ".trap"
+						+ compression.getExtension());
 	}
 
 	private File getTrapFileForModule(String moduleName) {
@@ -213,13 +219,13 @@ public class OdasaOutput {
 	private String trapFilePathForDecl(IrElement sym, String signature) {
 		String binaryName = getIrElementBinaryName(sym);
 		// TODO: Reinstate this?
-		//if (getTrackClassOrigins())
-		//  classId += "-" + StringDigestor.digest(sym.getSourceFileId());
+		// if (getTrackClassOrigins())
+		// classId += "-" + StringDigestor.digest(sym.getSourceFileId());
 		String result = CLASSES_DIR + "/" +
-					binaryName.replace('.', '/') +
-					signature +
-					".members" +
-					".trap" + compression.getExtension();
+				binaryName.replace('.', '/') +
+				signature +
+				".members" +
+				".trap" + compression.getExtension();
 		return result;
 	}
 
@@ -229,16 +235,21 @@ public class OdasaOutput {
 
 	/**
 	 * Get a {@link TrapFileManager} to write members
-	 * about a declaration, or <code>null</code> if the declaration shouldn't be populated.
+	 * about a declaration, or <code>null</code> if the declaration shouldn't be
+	 * populated.
 	 *
 	 * @param sym
-	 * 		The declaration's symbol, including, in particular, its fully qualified
-	 * 		binary class name.
+	 *                  The declaration's symbol, including, in particular, its
+	 *                  fully qualified
+	 *                  binary class name.
 	 * @param signature
-	 * 		Any unique suffix needed to distinguish `sym` from other declarations with the same name.
-	 * 		For functions for example, this means its parameter signature.
+	 *                  Any unique suffix needed to distinguish `sym` from other
+	 *                  declarations with the same name.
+	 *                  For functions for example, this means its parameter
+	 *                  signature.
 	 */
-	private TrapFileManager getMembersWriterForDecl(File trap, File trapFileBase, TrapClassVersion trapFileVersion, IrElement sym, String signature) {
+	private TrapFileManager getMembersWriterForDecl(File trap, File trapFileBase, TrapClassVersion trapFileVersion,
+			IrElement sym, String signature) {
 		// If the TRAP file already exists then we
 		// don't need to write it.
 		if (trap.exists()) {
@@ -250,7 +261,8 @@ public class OdasaOutput {
 		// don't need to rewrite it only to rename it
 		// again.
 		File trapFileDir = trap.getParentFile();
-		File trapOld = new File(trapFileDir, trap.getName().replace(".trap" + compression.getExtension(), ".trap-old" + compression.getExtension()));
+		File trapOld = new File(trapFileDir,
+				trap.getName().replace(".trap" + compression.getExtension(), ".trap-old" + compression.getExtension()));
 		if (trapOld.exists()) {
 			log.trace("Not rewriting trap file for " + trap.toString() + " as the trap-old exists");
 			return null;
@@ -261,11 +273,12 @@ public class OdasaOutput {
 		if (trapFileBase != null && trapFileVersion != null && trapFileDir.exists()) {
 			String trapFileBaseName = trapFileBase.getName();
 
-			for (File f: FileUtil.list(trapFileDir)) {
+			for (File f : FileUtil.list(trapFileDir)) {
 				String name = f.getName();
 				Matcher m = selectClassVersionComponents.matcher(name);
 				if (m.matches() && m.group(1).equals(trapFileBaseName)) {
-					TrapClassVersion v = new TrapClassVersion(Integer.valueOf(m.group(2)), Integer.valueOf(m.group(3)), Long.valueOf(m.group(4)), m.group(5));
+					TrapClassVersion v = new TrapClassVersion(Integer.valueOf(m.group(2)), Integer.valueOf(m.group(3)),
+							Long.valueOf(m.group(4)), m.group(5));
 					if (v.newerThan(trapFileVersion)) {
 						log.trace("Not rewriting trap file for " + trap.toString() + " as " + f.toString() + " exists");
 						return null;
@@ -285,7 +298,8 @@ public class OdasaOutput {
 		return concurrentWriter(trapFile, relative, log, sym, signature);
 	}
 
-	private TrapFileManager concurrentWriter(File trapFile, String relative, Logger log, IrElement sym, String signature) {
+	private TrapFileManager concurrentWriter(File trapFile, String relative, Logger log, IrElement sym,
+			String signature) {
 		if (trapFile.exists())
 			return null;
 		return new TrapFileManager(trapFile, relative, true, log, sym, signature);
@@ -299,7 +313,8 @@ public class OdasaOutput {
 		private String signature;
 		private boolean hasError = false;
 
-		private TrapFileManager(File trapFile, String relative, boolean concurrentCreation, Logger log, IrElement sym, String signature) {
+		private TrapFileManager(File trapFile, String relative, boolean concurrentCreation, Logger log, IrElement sym,
+				String signature) {
 			trapDependenciesForClass = new TrapDependencies(relative);
 			this.trapFile = trapFile;
 			this.sym = sym;
@@ -325,6 +340,7 @@ public class OdasaOutput {
 
 			writeTrapDependencies(trapDependenciesForClass);
 		}
+
 		private void writeTrapDependencies(TrapDependencies trapDependencies) {
 			String dep = trapDependencies.trapFile().replace(".trap" + compression.getExtension(), ".dep");
 			trapDependencies.save(
@@ -340,56 +356,77 @@ public class OdasaOutput {
 	 * Trap file locking.
 	 */
 
-	private final Pattern selectClassVersionComponents = Pattern.compile("(.*)#(-?[0-9]+)\\.(-?[0-9]+)-(-?[0-9]+)-(.*)\\.trap.*");
+	private final Pattern selectClassVersionComponents = Pattern
+			.compile("(.*)#(-?[0-9]+)\\.(-?[0-9]+)-(-?[0-9]+)-(.*)\\.trap.*");
 
 	/**
-	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple concurrent extractor processes,
-	 * only one source file {@link TrapLocker} may be open at any time, and the lock must be obtained
+	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple
+	 * concurrent extractor processes,
+	 * only one source file {@link TrapLocker} may be open at any time, and the lock
+	 * must be obtained
 	 * <b>before</b> any <b>class</b> file lock.
 	 *
-	 * Trap file extensions (and paths) ensure that source and class file locks are distinct.
+	 * Trap file extensions (and paths) ensure that source and class file locks are
+	 * distinct.
 	 *
-	 * @return  a {@link TrapLocker} for the currently processed source file, which must have been
-	 * previously set by a call to {@link OdasaOutput#setCurrentSourceFile(File)}.
+	 * @return a {@link TrapLocker} for the currently processed source file, which
+	 *         must have been
+	 *         previously set by a call to
+	 *         {@link OdasaOutput#setCurrentSourceFile(File)}.
 	 */
 	public TrapLocker getTrapLockerForCurrentSourceFile() {
-		return new TrapLocker((IrClass)null, null, true);
+		return new TrapLocker((IrClass) null, null, true);
 	}
 
 	/**
-	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple concurrent extractor processes,
-	 * only one jar file {@link TrapLocker} may be open at any time, and the lock must be obtained
-	 * <b>after</b> any <b>source</b> file lock. Only one jar or class file lock may be open at any time.
+	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple
+	 * concurrent extractor processes,
+	 * only one jar file {@link TrapLocker} may be open at any time, and the lock
+	 * must be obtained
+	 * <b>after</b> any <b>source</b> file lock. Only one jar or class file lock may
+	 * be open at any time.
 	 *
-	 * Trap file extensions (and paths) ensure that source and jar file locks are distinct.
+	 * Trap file extensions (and paths) ensure that source and jar file locks are
+	 * distinct.
 	 *
-	 * @return  a {@link TrapLocker} for the trap file corresponding to the given jar file.
+	 * @return a {@link TrapLocker} for the trap file corresponding to the given jar
+	 *         file.
 	 */
 	public TrapLocker getTrapLockerForJarFile(File jarFile) {
 		return new TrapLocker(jarFile);
 	}
 
 	/**
-	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple concurrent extractor processes,
-	 * only one module {@link TrapLocker} may be open at any time, and the lock must be obtained
-	 * <b>after</b> any <b>source</b> file lock. Only one jar or class file or module lock may be open at any time.
+	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple
+	 * concurrent extractor processes,
+	 * only one module {@link TrapLocker} may be open at any time, and the lock must
+	 * be obtained
+	 * <b>after</b> any <b>source</b> file lock. Only one jar or class file or
+	 * module lock may be open at any time.
 	 *
-	 * Trap file extensions (and paths) ensure that source and module file locks are distinct.
+	 * Trap file extensions (and paths) ensure that source and module file locks are
+	 * distinct.
 	 *
-	 * @return  a {@link TrapLocker} for the trap file corresponding to the given module.
+	 * @return a {@link TrapLocker} for the trap file corresponding to the given
+	 *         module.
 	 */
 	public TrapLocker getTrapLockerForModule(String moduleName) {
 		return new TrapLocker(moduleName);
 	}
 
 	/**
-	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple concurrent extractor processes,
-	 * only one class file {@link TrapLocker} may be open at any time, and the lock must be obtained
-	 * <b>after</b> any <b>source</b> file lock. Only one jar or class file lock may be open at any time.
+	 * <b>CAUTION</b>: to avoid the potential for deadlock between multiple
+	 * concurrent extractor processes,
+	 * only one class file {@link TrapLocker} may be open at any time, and the lock
+	 * must be obtained
+	 * <b>after</b> any <b>source</b> file lock. Only one jar or class file lock may
+	 * be open at any time.
 	 *
-	 * Trap file extensions (and paths) ensure that source and class file locks are distinct.
+	 * Trap file extensions (and paths) ensure that source and class file locks are
+	 * distinct.
 	 *
-	 * @return  a {@link TrapLocker} for the trap file corresponding to the given class symbol.
+	 * @return a {@link TrapLocker} for the trap file corresponding to the given
+	 *         class symbol.
 	 */
 	public TrapLocker getTrapLockerForDecl(IrElement sym, String signature, boolean fromSource) {
 		return new TrapLocker(sym, signature, fromSource);
@@ -403,10 +440,11 @@ public class OdasaOutput {
 		private File trapFileBase = null;
 		private TrapClassVersion trapFileVersion = null;
 		private final String signature;
+
 		private TrapLocker(IrElement decl, String signature, boolean fromSource) {
 			this.sym = decl;
 			this.signature = signature;
-			if (sym==null) {
+			if (sym == null) {
 				log.error("Null symbol passed for Kotlin TRAP locker");
 				trapFile = null;
 			} else {
@@ -422,21 +460,25 @@ public class OdasaOutput {
 				// in a single directory. This makes our directory listings later slow.
 				// To avoid this, rather than using files named .../Foo*, we use .../Foo/Foo*.
 				trapFileBase = new File(new File(normalTrapFile.getParentFile(), baseName), baseName);
-				trapFile = new File(trapFileBase.getPath() + '#' + trapFileVersion.toString() + ".trap" + compression.getExtension());
+				trapFile = new File(trapFileBase.getPath() + '#' + trapFileVersion.toString() + ".trap"
+						+ compression.getExtension());
 			}
 		}
+
 		private TrapLocker(File jarFile) {
 			sym = null;
 			signature = null;
 			trapFile = getTrapFileForJarFile(jarFile);
 		}
+
 		private TrapLocker(String moduleName) {
 			sym = null;
 			signature = null;
 			trapFile = getTrapFileForModule(moduleName);
 		}
+
 		public TrapFileManager getTrapFileManager() {
-			if (trapFile!=null) {
+			if (trapFile != null) {
 				return getMembersWriterForDecl(trapFile, trapFileBase, trapFileVersion, sym, signature);
 			} else {
 				return null;
@@ -445,7 +487,7 @@ public class OdasaOutput {
 
 		@Override
 		public void close() {
-			if (trapFile!=null) {
+			if (trapFile != null) {
 				// Now that we have finished writing our TRAP file, we want
 				// to rename and TRAP file that matches our trapFileBase
 				// but doesn't have the latest metadata.
@@ -458,12 +500,13 @@ public class OdasaOutput {
 					String trapFileBaseName = trapFileBase.getName();
 
 					List<Pair<File, TrapClassVersion>> pairs = new LinkedList<Pair<File, TrapClassVersion>>();
-					for (File f: FileUtil.list(trapFileDir)) {
+					for (File f : FileUtil.list(trapFileDir)) {
 						String name = f.getName();
 						Matcher m = selectClassVersionComponents.matcher(name);
 						if (m.matches()) {
 							if (m.group(1).equals(trapFileBaseName)) {
-								TrapClassVersion v = new TrapClassVersion(Integer.valueOf(m.group(2)), Integer.valueOf(m.group(3)), Long.valueOf(m.group(4)), m.group(5));
+								TrapClassVersion v = new TrapClassVersion(Integer.valueOf(m.group(2)),
+										Integer.valueOf(m.group(3)), Long.valueOf(m.group(4)), m.group(5));
 								pairs.add(new Pair<File, TrapClassVersion>(f, v));
 							} else {
 								// Everything in this directory should be for the same TRAP file base
@@ -490,10 +533,12 @@ public class OdasaOutput {
 						};
 						TrapClassVersion latestVersion = Collections.max(pairs, comparator).snd();
 
-						for (Pair<File, TrapClassVersion> p: pairs) {
+						for (Pair<File, TrapClassVersion> p : pairs) {
 							if (!latestVersion.equals(p.snd())) {
 								File f = p.fst();
-								File fOld = new File(f.getParentFile(), f.getName().replace(".trap" + compression.getExtension(), ".trap-old" + compression.getExtension()));
+								File fOld = new File(f.getParentFile(),
+										f.getName().replace(".trap" + compression.getExtension(),
+												".trap-old" + compression.getExtension()));
 								// We aren't interested in whether or not this succeeds;
 								// it may fail because a concurrent extractor has already
 								// renamed it.
@@ -528,7 +573,9 @@ public class OdasaOutput {
 			return lastModified;
 		}
 
-		public String getExtractorName() { return extractorName; }
+		public String getExtractorName() {
+			return extractorName;
+		}
 
 		private TrapClassVersion(int majorVersion, int minorVersion, long lastModified, String extractorName) {
 			this.majorVersion = majorVersion;
@@ -540,24 +587,37 @@ public class OdasaOutput {
 		@Override
 		public boolean equals(Object obj) {
 			if (obj instanceof TrapClassVersion) {
-				TrapClassVersion other = (TrapClassVersion)obj;
-				return majorVersion == other.majorVersion && minorVersion == other.minorVersion && lastModified == other.lastModified && extractorName.equals(other.extractorName);
+				TrapClassVersion other = (TrapClassVersion) obj;
+				return majorVersion == other.majorVersion && minorVersion == other.minorVersion
+						&& lastModified == other.lastModified && extractorName.equals(other.extractorName);
 			} else {
 				return false;
 			}
 		}
 
+		@Override
+		public int hashCode() {
+			int hash = 7;
+			hash = 31 * hash + majorVersion;
+			hash = 31 * hash + minorVersion;
+			hash = 31 * hash + (int) lastModified;
+			hash = 31 * hash + (extractorName == null ? 0 : extractorName.hashCode());
+			return hash;
+		}
+
 		private boolean newerThan(TrapClassVersion tcv) {
-			// Classes being compiled from source have major version 0 but should take precedence
+			// Classes being compiled from source have major version 0 but should take
+			// precedence
 			// over any classes with the same qualified name loaded from the classpath
 			// in previous or subsequent extractor invocations.
 			if (tcv.majorVersion == 0 && majorVersion != 0)
 				return false;
 			else if (majorVersion == 0 && tcv.majorVersion != 0)
 				return true;
-			// Always consider the Kotlin extractor superior to the Java extractor, because we may decode and extract
+			// Always consider the Kotlin extractor superior to the Java extractor, because
+			// we may decode and extract
 			// Kotlin metadata that the Java extractor can't understand:
-			if(!Objects.equals(tcv.extractorName, extractorName)) {
+			if (!Objects.equals(tcv.extractorName, extractorName)) {
 				if (Objects.equals(tcv.extractorName, "kotlin"))
 					return false;
 				if (Objects.equals(extractorName, "kotlin"))
@@ -568,56 +628,57 @@ public class OdasaOutput {
 			return tcv.majorVersion < majorVersion ||
 					(tcv.majorVersion == majorVersion && tcv.minorVersion < minorVersion) ||
 					(tcv.majorVersion == majorVersion && tcv.minorVersion == minorVersion &&
-					tcv.lastModified < lastModified);
+							tcv.lastModified < lastModified);
 		}
 
-        private static Map<String, Map<String, Long>> jarFileEntryTimeStamps = new HashMap<>();
+		private static Map<String, Map<String, Long>> jarFileEntryTimeStamps = new HashMap<>();
 
-        private static Map<String, Long> getZipFileEntryTimeStamps(String path, Logger log) {
-            try {
-                Map<String, Long> result = new HashMap<>();
-                ZipFile zf = new ZipFile(path);
-                Enumeration<? extends ZipEntry> entries = zf.entries();
-                while (entries.hasMoreElements()) {
-                    ZipEntry ze = entries.nextElement();
-                    result.put(ze.getName(), ze.getLastModifiedTime().toMillis());
-                }
-                return result;
-            } catch(IOException e) {
-                log.warn("Failed to get entry timestamps from " + path, e);
-                return null;
-            }
-        }
+		private static Map<String, Long> getZipFileEntryTimeStamps(String path, Logger log) {
+			try {
+				Map<String, Long> result = new HashMap<>();
+				ZipFile zf = new ZipFile(path);
+				Enumeration<? extends ZipEntry> entries = zf.entries();
+				while (entries.hasMoreElements()) {
+					ZipEntry ze = entries.nextElement();
+					result.put(ze.getName(), ze.getLastModifiedTime().toMillis());
+				}
+				return result;
+			} catch (IOException e) {
+				log.warn("Failed to get entry timestamps from " + path, e);
+				return null;
+			}
+		}
 
-        private static long getVirtualFileTimeStamp(VirtualFile vf, Logger log) {
-            if (vf.getFileSystem().getProtocol().equals("jar")) {
-                String[] parts = vf.getPath().split("!/");
-                if (parts.length == 2) {
-                    String jarFilePath = parts[0];
-                    String entryPath = parts[1];
-                    if (!jarFileEntryTimeStamps.containsKey(jarFilePath)) {
-                        jarFileEntryTimeStamps.put(jarFilePath, getZipFileEntryTimeStamps(jarFilePath, log));
-                    }
-                    Map<String, Long> entryTimeStamps = jarFileEntryTimeStamps.get(jarFilePath);
-                    if (entryTimeStamps != null) {
-                        Long entryTimeStamp = entryTimeStamps.get(entryPath);
-                        if (entryTimeStamp != null)
-                            return entryTimeStamp;
-                        else
-                            log.warn("Couldn't find timestamp for jar file " + jarFilePath + " entry " + entryPath);
-                    }
-                } else {
-                    log.warn("Expected JAR-file path " + vf.getPath() + " to have exactly one '!/' separator");
-                }
-            }
+		private static long getVirtualFileTimeStamp(VirtualFile vf, Logger log) {
+			if (vf.getFileSystem().getProtocol().equals("jar")) {
+				String[] parts = vf.getPath().split("!/");
+				if (parts.length == 2) {
+					String jarFilePath = parts[0];
+					String entryPath = parts[1];
+					if (!jarFileEntryTimeStamps.containsKey(jarFilePath)) {
+						jarFileEntryTimeStamps.put(jarFilePath, getZipFileEntryTimeStamps(jarFilePath, log));
+					}
+					Map<String, Long> entryTimeStamps = jarFileEntryTimeStamps.get(jarFilePath);
+					if (entryTimeStamps != null) {
+						Long entryTimeStamp = entryTimeStamps.get(entryPath);
+						if (entryTimeStamp != null)
+							return entryTimeStamp;
+						else
+							log.warn("Couldn't find timestamp for jar file " + jarFilePath + " entry " + entryPath);
+					}
+				} else {
+					log.warn("Expected JAR-file path " + vf.getPath() + " to have exactly one '!/' separator");
+				}
+			}
 
-            // For all files except for jar files, and a fallback in case of I/O problems reading a jar file:
-            return vf.getTimeStamp();
-        }
+			// For all files except for jar files, and a fallback in case of I/O problems
+			// reading a jar file:
+			return vf.getTimeStamp();
+		}
 
 		private static VirtualFile getVirtualFileIfClass(IrElement e) {
 			if (e instanceof IrClass)
-				return getIrClassVirtualFile((IrClass)e);
+				return getIrClassVirtualFile((IrClass) e);
 			else
 				return null;
 		}
@@ -625,7 +686,7 @@ public class OdasaOutput {
 		private static TrapClassVersion fromSymbol(IrElement sym, Logger log) {
 			VirtualFile vf = getVirtualFileIfClass(sym);
 			if (vf == null && sym instanceof IrDeclaration)
-				vf = getVirtualFileIfClass(((IrDeclaration)sym).getParent());
+				vf = getVirtualFileIfClass(((IrDeclaration) sym).getParent());
 			if (vf == null)
 				return new TrapClassVersion(-1, 0, 0, null);
 
@@ -636,12 +697,12 @@ public class OdasaOutput {
 				// We want to use the latest one that there is.
 				Field asmField = null;
 				int asmNum = -1;
-				for(Field f : Opcodes.class.getDeclaredFields()) {
+				for (Field f : Opcodes.class.getDeclaredFields()) {
 					String name = f.getName();
-					if(name.startsWith("ASM")) {
+					if (name.startsWith("ASM")) {
 						try {
 							int i = Integer.parseInt(name.substring(3));
-							if(i > asmNum) {
+							if (i > asmNum) {
 								asmNum = i;
 								asmField = f;
 							}
@@ -652,26 +713,29 @@ public class OdasaOutput {
 				}
 				int asm = asmField.getInt(null);
 				ClassVisitor versionGetter = new ClassVisitor(asm) {
-					public void visit(int version, int access, java.lang.String name, java.lang.String signature, java.lang.String superName, java.lang.String[] interfaces) {
+					public void visit(int version, int access, java.lang.String name, java.lang.String signature,
+							java.lang.String superName, java.lang.String[] interfaces) {
 						versionStore[0] = version;
 					}
 				};
-				(new ClassReader(vf.contentsToByteArray())).accept(versionGetter, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
+				(new ClassReader(vf.contentsToByteArray())).accept(versionGetter,
+						ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
 
-				return new TrapClassVersion(versionStore[0] & 0xffff, versionStore[0] >> 16, getVirtualFileTimeStamp(vf, log), "kotlin");
-			}
-			catch(IllegalAccessException e) {
+				return new TrapClassVersion(versionStore[0] & 0xffff, versionStore[0] >> 16,
+						getVirtualFileTimeStamp(vf, log), "kotlin");
+			} catch (IllegalAccessException e) {
 				log.warn("Failed to read class file version information", e);
 				return new TrapClassVersion(-1, 0, 0, null);
-			}
-			catch(IOException e) {
+			} catch (IOException e) {
 				log.warn("Failed to read class file version information", e);
 				return new TrapClassVersion(-1, 0, 0, null);
 			}
 		}
+
 		private boolean isValid() {
-			return majorVersion>=0 && minorVersion>=0;
+			return majorVersion >= 0 && minorVersion >= 0;
 		}
+
 		@Override
 		public String toString() {
 			return majorVersion + "." + minorVersion + "-" + lastModified + "-" + extractorName;

java/kotlin-extractor/versions.bzl

@@ -0,0 +1,46 @@
+# when updating this list, `bazel mod tidy` should be run from `codeql` to update `MODULE.bazel`
+VERSIONS = [
+    "1.5.0",
+    "1.5.10",
+    "1.5.20",
+    "1.5.30",
+    "1.6.0",
+    "1.6.20",
+    "1.7.0",
+    "1.7.20",
+    "1.8.0",
+    "1.9.0-Beta",
+    "1.9.20-Beta",
+    "2.0.0-RC1",
+]
+
+def _version_to_tuple(v):
+    # we ignore the tag when comparing versions, for example 1.9.0-Beta <= 1.9.0
+    v, _, ignored_tag = v.partition("-")
+    return tuple([int(x) for x in v.split(".")])
+
+def version_less(lhs, rhs):
+    return _version_to_tuple(lhs) < _version_to_tuple(rhs)
+
+def get_language_version(version):
+    major, minor, _ = _version_to_tuple(version)
+    return "%s.%s" % (major, minor)
+
+def _basename(path):
+    if "/" not in path:
+        return path
+    return path[path.rindex("/") + 1:]
+
+def get_compatilibity_sources(version, dir):
+    prefix = "%s/v_" % dir
+    available = native.glob(["%s*" % prefix], exclude_directories = 0)
+
+    # we want files with the same base name to replace ones for previous versions, hence the map
+    srcs = {}
+    for d in available:
+        compat_version = d[len(prefix):].replace("_", ".")
+        if version_less(version, compat_version):
+            break
+        files = native.glob(["%s/*.kt" % d])
+        srcs |= {_basename(f): f for f in files}
+    return srcs.values()

java/ql/automodel/src/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1
+
+No user-facing changes.
+
 ## 1.0.0
 
 ### Breaking Changes

java/ql/automodel/src/change-notes/released/1.0.1.md

@@ -0,0 +1,3 @@
+## 1.0.1
+
+No user-facing changes.

java/ql/automodel/src/codeql-pack.release.yml

@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.0
+lastReleaseVersion: 1.0.1

java/ql/automodel/src/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/java-automodel-queries
-version: 1.0.0
+version: 1.0.1
 groups:
     - java
     - automodel

java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script-no-wrapper/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -15,6 +18,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/android-sample-kotlin-build-script/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -15,6 +18,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/android-sample-no-wrapper/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -15,6 +18,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script-no-wrapper/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -18,6 +21,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/android-sample-old-style-kotlin-build-script/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -18,6 +21,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/android-sample-old-style-no-wrapper/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -18,6 +21,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/android-sample-old-style/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -18,6 +21,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/android-sample/test.expected

@@ -1,3 +1,6 @@
+#select
+| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
+| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |
 xmlFiles
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml |
 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml:0:0:0:0 | project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml |
@@ -15,6 +18,3 @@ xmlFiles
 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/merged_manifests/release/AndroidManifest.xml |
 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml:0:0:0:0 | project/build/intermediates/packaged_manifests/release/AndroidManifest.xml |
 | project/src/main/AndroidManifest.xml:0:0:0:0 | project/src/main/AndroidManifest.xml |
-#select
-| project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java:0:0:0:0 | BuildConfig |
-| project/src/main/java/com/github/androidsample/Main.java:0:0:0:0 | Main |

java/ql/integration-tests/all-platforms/java/ant-sample/test.expected

@@ -1,4 +1,4 @@
-xmlFiles
-| build.xml:0:0:0:0 | build.xml |
 #select
 | src/main/java/com/example/App.java:0:0:0:0 | App |
+xmlFiles
+| build.xml:0:0:0:0 | build.xml |

java/ql/integration-tests/all-platforms/java/buildless-gradle-timeout/test.expected

@@ -1,5 +1,5 @@
-xmlFiles
-| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |
 #select
 | src/main/java/com/example/App.java:0:0:0:0 | App |
 | src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
+xmlFiles
+| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |

java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/Test.java

@@ -0,0 +1 @@
+public class Test { }

java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.expected

@@ -0,0 +1 @@
+| Test.java:1:14:1:17 | Test |

java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.py

@@ -0,0 +1,6 @@
+import urllib.request
+from create_database_utils import *
+
+urllib.request.urlretrieve("https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.37.0/ecj-3.37.0.jar", "ecj.jar")
+
+run_codeql_database_create(["java -cp ecj.jar org.eclipse.jdt.internal.compiler.batch.Main -noExit Test.java"], lang="java")

java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.ql

@@ -0,0 +1,3 @@
+import java
+
+select any(Class c | c.fromSource())

java/ql/integration-tests/all-platforms/java/ecj-sample/Test.java

@@ -0,0 +1 @@
+public class Test { }

java/ql/integration-tests/all-platforms/java/ecj-sample/test.expected

@@ -0,0 +1 @@
+| Test.java:1:14:1:17 | Test |

java/ql/integration-tests/all-platforms/java/ecj-sample/test.py

@@ -0,0 +1,6 @@
+import urllib.request
+from create_database_utils import *
+
+urllib.request.urlretrieve("https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.37.0/ecj-3.37.0.jar", "ecj.jar")
+
+run_codeql_database_create(["java -cp ecj.jar org.eclipse.jdt.internal.compiler.batch.Main Test.java"], lang="java")

java/ql/integration-tests/all-platforms/java/ecj-sample/test.ql

@@ -0,0 +1,3 @@
+import java
+
+select any(Class c | c.fromSource())

java/ql/integration-tests/all-platforms/java/gradle-sample-kotlin-script/test.expected

@@ -1,4 +1,4 @@
-xmlFiles
 #select
 | app/src/main/java/test/App.java:0:0:0:0 | App |
 | app/src/test/java/test/AppTest.java:0:0:0:0 | AppTest |
+xmlFiles

java/ql/integration-tests/all-platforms/java/gradle-sample/test.expected

@@ -1,5 +1,5 @@
-xmlFiles
-| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |
 #select
 | src/main/java/com/example/App.java:0:0:0:0 | App |
 | src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
+xmlFiles
+| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |

java/ql/integration-tests/all-platforms/java/java-web-jsp/test.expected

@@ -1,15 +1,3 @@
-xmlFiles
-| pom.xml:0:0:0:0 | pom.xml |
-| spotbugs-security-exclude.xml:0:0:0:0 | spotbugs-security-exclude.xml |
-| spotbugs-security-include.xml:0:0:0:0 | spotbugs-security-include.xml |
-| src/main/webapp/WEB-INF/applicationContext.xml:0:0:0:0 | src/main/webapp/WEB-INF/applicationContext.xml |
-| src/main/webapp/WEB-INF/web.xml:0:0:0:0 | src/main/webapp/WEB-INF/web.xml |
-| src/main/webapp/WEB-INF/weblogic.xml:0:0:0:0 | src/main/webapp/WEB-INF/weblogic.xml |
-| target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/applicationContext.xml:0:0:0:0 | target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/applicationContext.xml |
-| target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/web.xml:0:0:0:0 | target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/web.xml |
-| target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/weblogic.xml:0:0:0:0 | target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/weblogic.xml |
-| target/web.xml:0:0:0:0 | target/web.xml |
-| target/webfrag.xml:0:0:0:0 | target/webfrag.xml |
 #select
 | src/main/java/com/acme/Counter.java:0:0:0:0 | Counter |
 | src/main/java/com/acme/Date2Tag.java:0:0:0:0 | Date2Tag |
@@ -56,3 +44,15 @@ xmlFiles
 | target/classes/jsp/xss/xss4_jsp.java:0:0:0:0 | xss4_jsp |
 | target/classes/jsp/xss/xss5_jsp.java:0:0:0:0 | xss5_jsp |
 | target/classes/org/apache/jsp/tag/web/panel_tag.java:0:0:0:0 | panel_tag |
+xmlFiles
+| pom.xml:0:0:0:0 | pom.xml |
+| spotbugs-security-exclude.xml:0:0:0:0 | spotbugs-security-exclude.xml |
+| spotbugs-security-include.xml:0:0:0:0 | spotbugs-security-include.xml |
+| src/main/webapp/WEB-INF/applicationContext.xml:0:0:0:0 | src/main/webapp/WEB-INF/applicationContext.xml |
+| src/main/webapp/WEB-INF/web.xml:0:0:0:0 | src/main/webapp/WEB-INF/web.xml |
+| src/main/webapp/WEB-INF/weblogic.xml:0:0:0:0 | src/main/webapp/WEB-INF/weblogic.xml |
+| target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/applicationContext.xml:0:0:0:0 | target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/applicationContext.xml |
+| target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/web.xml:0:0:0:0 | target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/web.xml |
+| target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/weblogic.xml:0:0:0:0 | target/vulnerable-jsp-app-1.0.0-SNAPSHOT/WEB-INF/weblogic.xml |
+| target/web.xml:0:0:0:0 | target/web.xml |
+| target/webfrag.xml:0:0:0:0 | target/webfrag.xml |

java/ql/integration-tests/all-platforms/java/maven-sample-extract-properties/test.expected

@@ -1,3 +1,6 @@
+#select
+| src/main/java/com/example/App.java:0:0:0:0 | App |
+| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
 xmlFiles
 | pom.xml:0:0:0:0 | pom.xml |
 | src/main/resources/page.xml:0:0:0:0 | src/main/resources/page.xml |
@@ -10,6 +13,3 @@ propertiesFiles
 | target/maven-archiver/pom.properties:0:0:0:0 | target/maven-archiver/pom.properties |
 | test-db/log/ext/javac-1.properties:0:0:0:0 | test-db/log/ext/javac-1.properties |
 | test-db/log/ext/javac.properties:0:0:0:0 | test-db/log/ext/javac.properties |
-#select
-| src/main/java/com/example/App.java:0:0:0:0 | App |
-| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |

java/ql/integration-tests/all-platforms/java/maven-sample-large-xml-files/test.expected

@@ -1,7 +1,7 @@
+#select
+| src/main/java/com/example/App.java:0:0:0:0 | App |
+| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
 xmlFiles
 | pom.xml:0:0:0:0 | pom.xml |
 | src/main/resources/struts.xml:0:0:0:0 | src/main/resources/struts.xml |
 | target/classes/struts.xml:0:0:0:0 | target/classes/struts.xml |
-#select
-| src/main/java/com/example/App.java:0:0:0:0 | App |
-| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |

java/ql/integration-tests/all-platforms/java/maven-sample-small-xml-files/test.expected

@@ -1,3 +1,6 @@
+#select
+| src/main/java/com/example/App.java:0:0:0:0 | App |
+| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
 xmlFiles
 | generated-0.xml:0:0:0:0 | generated-0.xml |
 | generated-1.xml:0:0:0:0 | generated-1.xml |
@@ -9,6 +12,3 @@ xmlFiles
 | src/main/resources/struts.xml:0:0:0:0 | src/main/resources/struts.xml |
 | target/classes/page.xml:0:0:0:0 | target/classes/page.xml |
 | target/classes/struts.xml:0:0:0:0 | target/classes/struts.xml |
-#select
-| src/main/java/com/example/App.java:0:0:0:0 | App |
-| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |

java/ql/integration-tests/all-platforms/java/maven-sample-xml-mode-all/test.expected

@@ -1,9 +1,9 @@
+#select
+| src/main/java/com/example/App.java:0:0:0:0 | App |
+| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
 xmlFiles
 | pom.xml:0:0:0:0 | pom.xml |
 | src/main/resources/page.xml:0:0:0:0 | src/main/resources/page.xml |
 | src/main/resources/struts.xml:0:0:0:0 | src/main/resources/struts.xml |
 | target/classes/page.xml:0:0:0:0 | target/classes/page.xml |
 | target/classes/struts.xml:0:0:0:0 | target/classes/struts.xml |
-#select
-| src/main/java/com/example/App.java:0:0:0:0 | App |
-| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |

java/ql/integration-tests/all-platforms/java/maven-sample-xml-mode-byname/test.expected

@@ -1,7 +1,7 @@
+#select
+| src/main/java/com/example/App.java:0:0:0:0 | App |
+| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
 xmlFiles
 | pom.xml:0:0:0:0 | pom.xml |
 | src/main/resources/struts.xml:0:0:0:0 | src/main/resources/struts.xml |
 | target/classes/struts.xml:0:0:0:0 | target/classes/struts.xml |
-#select
-| src/main/java/com/example/App.java:0:0:0:0 | App |
-| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |

java/ql/integration-tests/all-platforms/java/maven-sample-xml-mode-disabled/test.expected

@@ -1,4 +1,4 @@
-xmlFiles
 #select
 | src/main/java/com/example/App.java:0:0:0:0 | App |
 | src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
+xmlFiles

java/ql/integration-tests/all-platforms/java/maven-sample-xml-mode-smart/test.expected

@@ -1,7 +1,7 @@
+#select
+| src/main/java/com/example/App.java:0:0:0:0 | App |
+| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
 xmlFiles
 | pom.xml:0:0:0:0 | pom.xml |
 | src/main/resources/struts.xml:0:0:0:0 | src/main/resources/struts.xml |
 | target/classes/struts.xml:0:0:0:0 | target/classes/struts.xml |
-#select
-| src/main/java/com/example/App.java:0:0:0:0 | App |
-| src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |

java/ql/integration-tests/all-platforms/java/partial-gradle-sample-without-gradle/test.expected

@@ -1,5 +1,5 @@
-xmlFiles
-| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |
 #select
 | src/main/java/com/example/App.java:0:0:0:0 | App |
 | src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
+xmlFiles
+| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |

java/ql/integration-tests/all-platforms/java/partial-gradle-sample/test.expected

@@ -1,5 +1,5 @@
-xmlFiles
-| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |
 #select
 | src/main/java/com/example/App.java:0:0:0:0 | App |
 | src/test/java/com/example/AppTest.java:0:0:0:0 | AppTest |
+xmlFiles
+| gradle/verification-metadata.xml:0:0:0:0 | gradle/verification-metadata.xml |

java/ql/integration-tests/all-platforms/kotlin/annotation-id-consistency/PrintAst.expected

@@ -163,25 +163,25 @@ test.kt:
 #   23|               2: [IntegerLiteral] 2
 #   23|               3: [IntegerLiteral] 3
 #   17|       2: [Annotation] Ann1
-#    0|         1: [Annotation] Ann2
-#    0|           1: [StringLiteral] "Hello"
-#    0|           2: [TypeLiteral] String.class
-#    0|             0: [TypeAccess] String
-#    0|           3: [ArrayInit] {...}
-#    0|             1: [IntegerLiteral] 1
-#    0|             2: [IntegerLiteral] 2
-#    0|             3: [IntegerLiteral] 3
-#    0|           4: [ArrayInit] {...}
-#    0|             1: [Annotation] Ann3
-#    0|               1: [IntegerLiteral] 1
-#    0|             2: [Annotation] Ann3
-#    0|               1: [IntegerLiteral] 2
-#    0|           5: [ArrayInit] {...}
-#    0|             1: [TypeLiteral] String.class
-#    0|               0: [TypeAccess] String
-#    0|             2: [TypeLiteral] int.class
-#    0|               0: [TypeAccess] int
-#   17|         2: [IntegerLiteral] 1
+#   17|         1: [IntegerLiteral] 1
+#   17|         2: [Annotation] Ann2
+#   17|           1: [StringLiteral] "Hello"
+#   17|           2: [TypeLiteral] String.class
+#   17|             0: [TypeAccess] String
+#   17|           3: [ArrayInit] {...}
+#   17|             1: [IntegerLiteral] 1
+#   17|             2: [IntegerLiteral] 2
+#   17|             3: [IntegerLiteral] 3
+#   17|           4: [ArrayInit] {...}
+#   17|             1: [Annotation] Ann3
+#   17|               1: [IntegerLiteral] 1
+#   17|             2: [Annotation] Ann3
+#   17|               1: [IntegerLiteral] 2
+#   17|           5: [ArrayInit] {...}
+#   17|             1: [TypeLiteral] String.class
+#   17|               0: [TypeAccess] String
+#   17|             2: [TypeLiteral] int.class
+#   17|               0: [TypeAccess] int
 #   17|         3: [VarAccess] DayOfWeek.MONDAY
 #   17|           -1: [TypeAccess] DayOfWeek
 #   18|       3: [Annotation] GenericAnnotation
@@ -193,17 +193,17 @@ test.kt:
 #   18|           2: [TypeLiteral] String.class
 #   18|             0: [TypeAccess] String
 #   24|       4: [Annotation] AnnWithDefaults
-#    0|         1: [IntegerLiteral] 1
-#    0|         2: [StringLiteral] "hello"
-#    0|         3: [VarAccess] DayOfWeek.TUESDAY
-#    0|           -1: [TypeAccess] DayOfWeek
-#    0|         4: [ArrayInit] {...}
-#    0|           1: [Annotation] Ann3
-#    0|             1: [IntegerLiteral] 1
-#   25|     1: [Constructor] Annotated
+#   15|         1: [IntegerLiteral] 1
+#   15|         2: [StringLiteral] "hello"
+#   15|         3: [VarAccess] DayOfWeek.TUESDAY
+#   15|           -1: [TypeAccess] DayOfWeek
+#   15|         4: [ArrayInit] {...}
+#   15|           1: [Annotation] Ann3
+#   15|             1: [IntegerLiteral] 1
+#   17|     1: [Constructor] Annotated
 #   17|       5: [BlockStmt] { ... }
 #   17|         0: [SuperConstructorInvocationStmt] super(...)
-#   25|         1: [BlockStmt] { ... }
+#   17|         1: [BlockStmt] { ... }
 #   27|   9: [Class] AnnotatedUsedByKotlin
 #-----|     -3: (Annotations)
 #    0|       1: [Annotation] Container
@@ -228,25 +228,25 @@ test.kt:
 #   33|               2: [IntegerLiteral] 2
 #   33|               3: [IntegerLiteral] 3
 #   27|       2: [Annotation] Ann1
-#    0|         1: [Annotation] Ann2
-#    0|           1: [StringLiteral] "Hello"
-#    0|           2: [TypeLiteral] String.class
-#    0|             0: [TypeAccess] String
-#    0|           3: [ArrayInit] {...}
-#    0|             1: [IntegerLiteral] 1
-#    0|             2: [IntegerLiteral] 2
-#    0|             3: [IntegerLiteral] 3
-#    0|           4: [ArrayInit] {...}
-#    0|             1: [Annotation] Ann3
-#    0|               1: [IntegerLiteral] 1
-#    0|             2: [Annotation] Ann3
-#    0|               1: [IntegerLiteral] 2
-#    0|           5: [ArrayInit] {...}
-#    0|             1: [TypeLiteral] String.class
-#    0|               0: [TypeAccess] String
-#    0|             2: [TypeLiteral] int.class
-#    0|               0: [TypeAccess] int
-#   27|         2: [IntegerLiteral] 1
+#   27|         1: [IntegerLiteral] 1
+#   27|         2: [Annotation] Ann2
+#   27|           1: [StringLiteral] "Hello"
+#   27|           2: [TypeLiteral] String.class
+#   27|             0: [TypeAccess] String
+#   27|           3: [ArrayInit] {...}
+#   27|             1: [IntegerLiteral] 1
+#   27|             2: [IntegerLiteral] 2
+#   27|             3: [IntegerLiteral] 3
+#   27|           4: [ArrayInit] {...}
+#   27|             1: [Annotation] Ann3
+#   27|               1: [IntegerLiteral] 1
+#   27|             2: [Annotation] Ann3
+#   27|               1: [IntegerLiteral] 2
+#   27|           5: [ArrayInit] {...}
+#   27|             1: [TypeLiteral] String.class
+#   27|               0: [TypeAccess] String
+#   27|             2: [TypeLiteral] int.class
+#   27|               0: [TypeAccess] int
 #   27|         3: [VarAccess] DayOfWeek.MONDAY
 #   27|           -1: [TypeAccess] DayOfWeek
 #   28|       3: [Annotation] GenericAnnotation
@@ -258,44 +258,48 @@ test.kt:
 #   28|           2: [TypeLiteral] String.class
 #   28|             0: [TypeAccess] String
 #   34|       4: [Annotation] AnnWithDefaults
-#    0|         1: [IntegerLiteral] 1
-#    0|         2: [StringLiteral] "hello"
-#    0|         3: [VarAccess] DayOfWeek.TUESDAY
-#    0|           -1: [TypeAccess] DayOfWeek
-#    0|         4: [ArrayInit] {...}
-#    0|           1: [Annotation] Ann3
-#    0|             1: [IntegerLiteral] 1
-#   35|     1: [Constructor] AnnotatedUsedByKotlin
+#   15|         1: [IntegerLiteral] 1
+#   15|         2: [StringLiteral] "hello"
+#   15|         3: [VarAccess] DayOfWeek.TUESDAY
+#   15|           -1: [TypeAccess] DayOfWeek
+#   15|         4: [ArrayInit] {...}
+#   15|           1: [Annotation] Ann3
+#   15|             1: [IntegerLiteral] 1
+#   27|     1: [Constructor] AnnotatedUsedByKotlin
 #   27|       5: [BlockStmt] { ... }
 #   27|         0: [SuperConstructorInvocationStmt] super(...)
-#   35|         1: [BlockStmt] { ... }
+#   27|         1: [BlockStmt] { ... }
 #   37|   10: [Class] HasJavaDeprecatedAnnotationUsedByJava
 #-----|     -3: (Annotations)
 #   37|       1: [Annotation] Deprecated
-#   38|     1: [Constructor] HasJavaDeprecatedAnnotationUsedByJava
+#    0|         1: [StringLiteral] ""
+#    0|         2: [BooleanLiteral] false
+#   37|     1: [Constructor] HasJavaDeprecatedAnnotationUsedByJava
 #   37|       5: [BlockStmt] { ... }
 #   37|         0: [SuperConstructorInvocationStmt] super(...)
-#   38|         1: [BlockStmt] { ... }
+#   37|         1: [BlockStmt] { ... }
 #   40|   11: [Class] HasKotlinDeprecatedAnnotationUsedByJava
 #-----|     -3: (Annotations)
 #   40|       1: [Annotation] Deprecated
 #   40|         1: [StringLiteral] "Kotlin deprecation message 1"
-#   41|     1: [Constructor] HasKotlinDeprecatedAnnotationUsedByJava
+#   40|     1: [Constructor] HasKotlinDeprecatedAnnotationUsedByJava
 #   40|       5: [BlockStmt] { ... }
 #   40|         0: [SuperConstructorInvocationStmt] super(...)
-#   41|         1: [BlockStmt] { ... }
+#   40|         1: [BlockStmt] { ... }
 #   43|   12: [Class] HasJavaDeprecatedAnnotationUsedByKotlin
 #-----|     -3: (Annotations)
 #   43|       1: [Annotation] Deprecated
-#   44|     1: [Constructor] HasJavaDeprecatedAnnotationUsedByKotlin
+#    0|         1: [StringLiteral] ""
+#    0|         2: [BooleanLiteral] false
+#   43|     1: [Constructor] HasJavaDeprecatedAnnotationUsedByKotlin
 #   43|       5: [BlockStmt] { ... }
 #   43|         0: [SuperConstructorInvocationStmt] super(...)
-#   44|         1: [BlockStmt] { ... }
+#   43|         1: [BlockStmt] { ... }
 #   46|   13: [Class] HasKotlinDeprecatedAnnotationUsedByKotlin
 #-----|     -3: (Annotations)
 #   46|       1: [Annotation] Deprecated
 #   46|         1: [StringLiteral] "Kotlin deprecation message 2"
-#   47|     1: [Constructor] HasKotlinDeprecatedAnnotationUsedByKotlin
+#   46|     1: [Constructor] HasKotlinDeprecatedAnnotationUsedByKotlin
 #   46|       5: [BlockStmt] { ... }
 #   46|         0: [SuperConstructorInvocationStmt] super(...)
-#   47|         1: [BlockStmt] { ... }
+#   46|         1: [BlockStmt] { ... }

java/ql/integration-tests/all-platforms/kotlin/default-parameter-mad-flow/test.expected

@@ -1,2 +1,2 @@
-failures
 testFailures
+failures

java/ql/integration-tests/all-platforms/kotlin/enhanced-nullability/test.py

@@ -3,4 +3,4 @@ import glob
 
 os.mkdir('build')
 runSuccessfully(["javac"] + glob.glob("*.java") + ["-d", "build"])
-run_codeql_database_create(["javac " + " ".join(glob.glob("*.java")) + " -d build", "kotlinc user.kt -cp build"], lang="java")
+run_codeql_database_create(["javac " + " ".join(glob.glob("*.java")) + " -d build", "kotlinc -language-version 1.9 user.kt -cp build"], lang="java")

java/ql/integration-tests/all-platforms/kotlin/external-property-overloads/test.expected

@@ -1,2 +1,2 @@
-| user.kt:3:15:3:22 | getF(...) | lib/lib/TestKt.class:0:0:0:0 | getF |
+| user.kt:3:14:3:22 | getF(...) | lib/lib/TestKt.class:0:0:0:0 | getF |
 | user.kt:3:26:3:28 | getF(...) | lib/lib/TestKt.class:0:0:0:0 | getF |

java/ql/integration-tests/all-platforms/kotlin/external-property-overloads/test.py

@@ -1,5 +1,5 @@
 from create_database_utils import *
 
 os.mkdir('lib')
-runSuccessfully([get_cmd("kotlinc"), "test.kt", "-d", "lib"])
-run_codeql_database_create(["kotlinc user.kt -cp lib"], lang="java")
+runSuccessfully([get_cmd("kotlinc"), "-language-version", "1.9", "test.kt", "-d", "lib"])
+run_codeql_database_create(["kotlinc -language-version 1.9 user.kt -cp lib"], lang="java")

java/ql/integration-tests/all-platforms/kotlin/extractor_information_kotlin1/test.py

@@ -1,3 +1,3 @@
 from create_database_utils import *
 
-run_codeql_database_create(["kotlinc -J-Xmx2G SomeClass.kt"], lang="java")
+run_codeql_database_create(["kotlinc -J-Xmx2G -language-version 1.9 SomeClass.kt"], lang="java")

java/ql/integration-tests/all-platforms/kotlin/file_classes/test.py

@@ -1,4 +1,4 @@
 from create_database_utils import *
 
-runSuccessfully([get_cmd("kotlinc"), 'A.kt'])
-run_codeql_database_create(['kotlinc -cp . B.kt C.kt'], lang="java")
+runSuccessfully([get_cmd("kotlinc"), '-language-version', '1.9', 'A.kt'])
+run_codeql_database_create(['kotlinc -cp . -language-version 1.9 B.kt C.kt'], lang="java")

java/ql/integration-tests/all-platforms/kotlin/java-interface-redeclares-tostring/test.py

@@ -2,4 +2,4 @@ from create_database_utils import *
 
 os.mkdir('bin')
 runSuccessfully(["javac", "Test.java", "-d", "bin"])
-run_codeql_database_create(["kotlinc user.kt -cp bin"], lang="java")
+run_codeql_database_create(["kotlinc -language-version 1.9 user.kt -cp bin"], lang="java")

java/ql/integration-tests/all-platforms/kotlin/java_modifiers/test.expected

@@ -1,2 +1,2 @@
 | extlib.jar/extlib/A.class:0:0:0:0 | m | protected |
-| test.kt:4:12:4:22 | m | override, protected |
+| test.kt:4:3:4:22 | m | override, protected |

java/ql/integration-tests/all-platforms/kotlin/jvmoverloads-external-class/test.expected

@@ -1,8 +1,8 @@
-| test.kt:3:17:3:45 | f | test.kt:3:23:3:32 | x |
-| test.kt:3:17:3:45 | f | test.kt:3:35:3:40 | y |
-| test.kt:3:17:3:45 | f | test.kt:3:35:3:40 | y |
-| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p0 |
-| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p1 |
-| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p2 |
-| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p3 |
-| test.kt:3:17:3:45 | f$default | test.kt:3:17:3:45 | p4 |
+| test.kt:3:3:3:45 | f | test.kt:3:23:3:32 | x |
+| test.kt:3:3:3:45 | f | test.kt:3:35:3:40 | y |
+| test.kt:3:3:3:45 | f | test.kt:3:35:3:40 | y |
+| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p0 |
+| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p1 |
+| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p2 |
+| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p3 |
+| test.kt:3:3:3:45 | f$default | test.kt:3:3:3:45 | p4 |