ci: fix linting

Author: ObserverOfTime

.github/workflows/lint.yml

@@ -42,6 +42,8 @@ jobs:
         if: "!cancelled() && steps.ktlint.outcome == 'failure'"
         with:
           sarif_file: build/reports/ktlint.sarif
+          # FIXME: github/codeql-action#2215
+          checkout_path: ${{env.HOME}}
           category: ktlint
   detekt:
     runs-on: ubuntu-latest
@@ -55,12 +57,12 @@ jobs:
           java-version: 17
       - name: Install detekt
         run: |-
-          curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.6/detekt-cli-1.23.6-all.jar
-          mv detekt-cli-1.23.6-all.jar $RUNNER_TOOL_CACHE/detekt-cli.jar
+          curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7-all.jar
+          mv detekt-cli-1.23.7-all.jar $RUNNER_TOOL_CACHE/detekt-cli.jar
       - name: Run detekt
         id: detekt
         run: >-
-          java -jar $RUNNER_TOOL_CACHE/detekt-cli.jar --build-upon-default-config
+          java -jar $RUNNER_TOOL_CACHE/detekt-cli.jar --build-upon-default-config \
           --jvm-target 17 -c .github/detekt.yml -r sarif:build/reports/detekt.sarif
       - name: Upload report
         uses: github/codeql-action/upload-sarif@v3

gradle.properties

@@ -8,7 +8,7 @@ sdk.version.min=23
 # The Android NDK version that is used to compile the project.
 ndk.version=26.3.11579264
 # The CMake version that is used to compile the project.
-cmake.version=3.30.3
+cmake.version=3.30.5
 
 # Specifies the JVM arguments used for the daemon process.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8

ktreesitter-plugin/src/main/java/io/github/treesitter/ktreesitter/plugin/GrammarFilesTask.java

@@ -194,12 +194,16 @@ private void generateNative(Path srcDir) throws GradleException {
         );
         mkdirs(classFile.getParent().toFile());
 
+        var imports = languageMethods.values().stream().map(method ->
+            "import %s.internal.%s".formatted(packageName, method)
+        );
         var methods = languageMethods.entrySet().stream().map(method ->
             "    actual fun %s(): Any = %s()!!".formatted(method.getKey(), method.getValue())
         );
         var template = readResource("native.kt.in")
             .replace("@PACKAGE@", packageName)
             .replace("@CLASS@", className)
+            .replace("@IMPORTS@", String.join("\n\n", imports.toList()))
             .replace("@METHODS@", String.join("\n\n", methods.toList()));
         writeFile(classFile.toFile(), template);
     }

ktreesitter-plugin/src/main/resources/native.kt.in

@@ -2,7 +2,7 @@
 
 package @PACKAGE@
 
-import @[email protected].*
+@IMPORTS@
 import kotlinx.cinterop.ExperimentalForeignApi
 
 @OptIn(ExperimentalForeignApi::class)