Add Android native artifacts and CI coverage

.github/workflows/main.yml

@@ -8,12 +8,20 @@ on:
     paths-ignore:
     - "**/README.md"
 jobs:
-  test:
-    name: Test on ${{ matrix.os }}
+  native:
+    name: Build native on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-22.04, windows-2022, macos-15-intel, macos-14]
+        include:
+        - os: ubuntu-22.04
+          targets: x86_64-linux-gnu,aarch64-linux-gnu
+        - os: windows-2022
+          targets: x86_64-windows
+        - os: macos-15-intel
+          targets: x86_64-macos
+        - os: macos-14
+          targets: aarch64-macos
     env:
       ORG_GRADLE_PROJECT_ossrhUsername: na
       ORG_GRADLE_PROJECT_ossrhPassword: na
@@ -26,8 +34,12 @@ jobs:
         distribution: 'corretto'
     - name: Setup Gradle
       uses: gradle/actions/setup-gradle@v4.2.1
-    - name: Test with Gradle
-      run: ./gradlew test --stacktrace
+    - name: Build native libraries with Gradle
+      run: >
+        ./gradlew
+        buildNative
+        -PtreeSitterTargets=${{ matrix.targets }}
+        --stacktrace
 
   android-native:
     name: Build Android native library
@@ -51,4 +63,4 @@ jobs:
       run: |
         "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" "ndk;${ANDROID_NDK_VERSION}"
     - name: Build Android native library
-      run: ./gradlew :tree-sitter:buildNative -PtreeSitterTargets=aarch64-linux-android --stacktrace
+      run: ./gradlew buildNative -PtreeSitterTargets=aarch64-linux-android --stacktrace

build.gradle

@@ -103,19 +103,21 @@ subprojects {
         useJUnitPlatform()
     }
 
-    tasks.register('downloadSource', DownloadSourceTask)
+    if (project.hasProperty('libVersion')) {
+        tasks.register('downloadSource', DownloadSourceTask)
 
-    if (project.name != 'tree-sitter' && project.name != 'tree-sitter-demo' && project.name != 'tree-sitter-tests') {
-        tasks.named('test') {
-            dependsOn tasks.named('downloadSource')
+        tasks.register('buildNative', BuildNativeTask) {
+            zigExe = rootProject.downloadZig.zigExe
+            dependsOn downloadSource, rootProject.downloadZig
+            if (((String) rootProject.properties.get("treeSitterTargets")).contains("android")) {
+                dependsOn rootProject.downloadAndroidNdk
+            }
         }
-    }
 
-    tasks.register('buildNative', BuildNativeTask) {
-        zigExe = rootProject.downloadZig.zigExe
-        dependsOn downloadSource, rootProject.downloadZig
-        if (((String) rootProject.properties.get("treeSitterTargets")).contains("android")) {
-            dependsOn rootProject.downloadAndroidNdk
+        if (project.name != 'tree-sitter') {
+            tasks.named('test') {
+                dependsOn tasks.named('downloadSource')
+            }
         }
     }
 

buildSrc/src/main/groovy/BuildNativeTask.groovy

@@ -181,10 +181,10 @@ class BuildNativeTask extends DefaultTask{
             cmd.addAll(jniCFiles)
             cmd.addAll(parserCFiles)
             cmd.addAll(additionalCFiles)
-            project.exec{
+            project.providers.exec {
                 workingDir jniCDir
                 commandLine(cmd)
-            }
+            }.result.get()
         }
         this.removeWindowsDebugFiles()
     }
@@ -220,6 +220,12 @@ class BuildNativeTask extends DefaultTask{
         }
 
         def sdkDir = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
+        if (!sdkDir) {
+            def defaultSdk = new File(System.getProperty("user.home"), "Library/Android/sdk")
+            if (defaultSdk.exists()) {
+                sdkDir = defaultSdk.absolutePath
+            }
+        }
         if (sdkDir) {
             def ndkRoot = new File(sdkDir, "ndk")
             def ndks = ndkRoot.listFiles()?.findAll { it.isDirectory() }?.sort { a, b -> b.name <=> a.name }
@@ -237,7 +243,7 @@ class BuildNativeTask extends DefaultTask{
         throw new GradleException("Android NDK not found. Set ANDROID_NDK_HOME, ANDROID_NDK_ROOT, ANDROID_HOME, or ANDROID_SDK_ROOT, or run the downloadAndroidNdk task.")
     }
 
-    private void removeWindowsDebugFiles(){
+    void removeWindowsDebugFiles(){
         def files = jniOutDir.asFileTree.matching {
             include("**/*.pdb")
             include("**/*.lib")

buildSrc/src/main/groovy/DownloadAndroidNdkTask.groovy

@@ -104,6 +104,12 @@ class DownloadAndroidNdkTask extends DefaultTask {
         }
 
         def sdkDir = System.getenv("ANDROID_HOME") ?: System.getenv("ANDROID_SDK_ROOT")
+        if (!sdkDir) {
+            def defaultSdk = new File(System.getProperty("user.home"), "Library/Android/sdk")
+            if (defaultSdk.exists()) {
+                sdkDir = defaultSdk.absolutePath
+            }
+        }
         if (sdkDir) {
             def ndkRoot = new File(sdkDir, "ndk")
             def ndks = ndkRoot.listFiles()?.findAll { it.isDirectory() }?.sort { a, b -> b.name <=> a.name }

buildSrc/src/main/groovy/DownloadZigTask.groovy

@@ -165,15 +165,15 @@ class DownloadZigTask extends DefaultTask{
         def mirrorUrls = mirrorUrls()
         downloadZigFromMirrors(mirrorUrls, zigZipFile.asFile, zigSignatureFile.asFile)
         miniSignExe.asFile.setExecutable(true, true)
-        def zipVerified = project.exec {
+        def zipVerified = project.providers.exec {
             ignoreExitValue = true
             workingDir zigDir.asFile
             commandLine miniSignExe,
                            "-qVm",
                            zigZipFile,
                            "-P",
                            zigPubKey
-        }
+        }.result.get().exitValue == 0
         if(!zipVerified) {
             throw new GradleException("$zigZipFile signature does not match!")
         }

tree-sitter-ocaml/build.gradle

@@ -1,3 +1,11 @@
 tasks.named('downloadSource') {
     url = "https://github.com/tree-sitter/tree-sitter-ocaml/archive/refs/tags/v${libVersion}.zip"
-}
+}
+
+tasks.named("buildNative") {
+    def newSrcDir = srcDir.dir("grammars/ocaml/src")
+    additionalCFiles = newSrcDir.asFileTree.matching {
+        include("**/*.c")
+    }
+    additionalIncludeDirs = [newSrcDir]
+}

tree-sitter/src/main/c/org_treesitter_TSParser.c

@@ -38,7 +38,7 @@ JavaVM* java_vm = NULL;
 
 jint JNI_OnLoad(JavaVM* vm, void* reserved) {
     java_vm = vm;
-    return JNI_VERSION_10;
+    return JNI_VERSION_1_6;
 }
 
 jfieldID ts_jni_get_field_id(JNIEnv *env, jclass clz, const char *field_name, const char*field_type){
@@ -2050,4 +2050,4 @@ JNIEXPORT jlong JNICALL Java_org_treesitter_TSParser_ts_1load_1lang
 
     const TSLanguage *ts_lang = lang_fn();
     return (jlong) ts_lang;
-}
+}

tree-sitter/src/main/java/org/treesitter/utils/NativeUtils.java

@@ -122,6 +122,15 @@ public synchronized static void loadLib(String libName) {
         if (loadedLibs.contains(libName)) {
             return;
         }
+        String vmName = System.getProperty("java.vm.name", "").toLowerCase();
+        String runtimeName = System.getProperty("java.runtime.name", "").toLowerCase();
+        boolean isAndroid = vmName.contains("dalvik") || runtimeName.contains("android");
+        if (isAndroid) {
+            String[] parts = libName.split("/");
+            System.loadLibrary(parts[parts.length - 1]);
+            loadedLibs.add(libName);
+            return;
+        }
         Path path = libFile(libName);
         System.load(path.toAbsolutePath().toString());
         loadedLibs.add(libName);