Merge remote-tracking branch 'origin/main'

Author: bonede

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 download = "5.6.0"
-junit = "5.10.3"
+junit = "5.11.0"
 nexus-staging-version = "0.30.0"
 
 [libraries]

settings.gradle

@@ -117,3 +117,4 @@ include 'tree-sitter-ohm'
 include 'tree-sitter-p4'
 include 'tree-sitter-nginx'
 include 'tree-sitter-nim'
+include 'tree-sitter-hocon'

tree-sitter-demo/build.gradle

@@ -16,7 +16,6 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
     implementation project(":tree-sitter")
     implementation project(":tree-sitter-json")
-    implementation project(":tree-sitter")
 }
 
 test {

tree-sitter-hocon/build.gradle

@@ -0,0 +1,152 @@
+import org.treesitter.build.Utils
+
+plugins {
+    id 'java'
+    id 'signing'
+    id 'maven-publish'
+}
+
+group = 'io.github.bonede'
+version = libVersion
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation platform(libs.junit.bom)
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+    implementation project(":tree-sitter")
+}
+
+test {
+    useJUnitPlatform()
+}
+
+def libName = "tree-sitter-hocon"
+
+
+java {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+publishing {
+    repositories {
+        maven {
+            name = "MavenCentral"
+            def releasesRepoUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+            def snapshotsRepoUrl =  "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+            credentials {
+                username = ossrhUsername
+                password = ossrhPassword
+            }
+            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
+        }
+    }
+    publications {
+        maven(MavenPublication) {
+            from components.java
+            pom {
+                name = libName
+                url = 'https://github.com/bonede/tree-sitter-ng'
+                description = "Next generation Tree Sitter Java binding"
+                licenses {
+                    license {
+                        name = 'MIT'
+                    }
+                }
+                scm {
+                    connection = 'scm:git:https://github.com/bonede/tree-sitter-ng.git'
+                    developerConnection = 'scm:git:https://github.com/bonede/tree-sitter-ng.git'
+                    url = 'https://github.com/bonede/tree-sitter-ng'
+                }
+                developers {
+                    developer {
+                        id = 'bonede'
+                        name = 'Wang Liang'
+                        email = 'bonede@qq.com'
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+signing {
+    sign configurations.archives
+    sign publishing.publications
+}
+tasks.register('downloadSource') {
+    group = "build setup"
+    description = "Download parser source"
+    def zipUrl = "https://github.com/antosha417/tree-sitter-hocon/archive/refs/heads/master.zip"
+    def downloadDir = Utils.libDownloadDir(project, libName)
+    def zip = Utils.libZipFile(project, libName, libVersion)
+    def parserCFile = Utils.libParserCFile(project, libName, libVersion)
+    inputs.files(layout.projectDirectory.file("gradle.properties"))
+    outputs.files(parserCFile)
+    doLast {
+        download.run {
+            src zipUrl
+            dest zip
+            overwrite false
+        }
+        copy {
+            from zipTree(zip)
+            into downloadDir
+        }
+    }
+
+}
+
+tasks.register("buildNative") {
+    group = "build"
+    description = "Build parser native modules"
+    dependsOn "downloadSource", rootProject.bootstrap
+    def jniSrcDir = Utils.jniSrcDir(project)
+    def outDir = Utils.jniOutDir(project)
+    def jniCFile = Utils.jniCFile(project, "org_treesitter_TreeSitterHocon.c")
+    def parserCFile = Utils.libParserCFile(project, libName, libVersion)
+    def libSrcDir = Utils.libSrcDir(project, libName, libVersion)
+    def jniInclude = Utils.jniIncludeDir(project)
+
+    def targets = Utils.treeSitterTargets(project)
+    def outputFiles = targets.collect()
+            { t -> Utils.jniOutFile(project, t, libName)}
+    def srcFiles = project.fileTree(libSrcDir) {
+        include(Utils.libFiles())
+    }.toList()
+    outputs.files(outputFiles)
+    def inputFiles = srcFiles + [parserCFile, rootProject.layout.projectDirectory.file("gradle.properties")]
+    inputs.files(inputFiles)
+    doLast{
+        mkdir(outDir)
+        targets.each {target ->
+            def jniMdInclude = Utils.jniMdInclude(project, target)
+            def jniOutFile = Utils.jniOutFile(project, target, libName)
+            def files = project.fileTree(libSrcDir) {
+                include(Utils.libFiles())
+            }.toList()
+            def cmd = [
+                        rootProject.downloadZig.zigExe, "c++",
+                        "-g0",
+                        "-shared",
+                        "-target", target,
+                        "-I", libSrcDir,
+                        "-I", jniInclude,
+                        "-I", jniMdInclude,
+                        "-o", jniOutFile,
+                        jniCFile,
+            ]
+
+            cmd.addAll(files)
+            exec{
+                workingDir jniSrcDir
+                commandLine(cmd)
+            }
+        }
+        Utils.removeWindowsDebugFiles(project)
+    }
+}

tree-sitter-hocon/gradle.properties

@@ -0,0 +1 @@
+libVersion=master-a

tree-sitter-hocon/src/main/c/org_treesitter_TreeSitterHocon.c

@@ -0,0 +1,11 @@
+#include <jni.h>
+void *tree_sitter_hocon();
+/*
+ * Class:     org_treesitter_TreeSitterHocon
+ * Method:    tree_sitter_hocon
+ * Signature: ()J
+ */
+JNIEXPORT jlong JNICALL Java_org_treesitter_TreeSitterHocon_tree_1sitter_1hocon
+  (JNIEnv *env, jclass clz){
+   return (jlong) tree_sitter_hocon();
+}

tree-sitter-hocon/src/main/java/org/treesitter/TreeSitterHocon.java

@@ -0,0 +1,25 @@
+package org.treesitter;
+
+import org.treesitter.utils.NativeUtils;
+
+public class TreeSitterHocon extends TSLanguage {
+
+    static {
+        NativeUtils.loadLib("lib/tree-sitter-hocon");
+    }
+
+    private native static long tree_sitter_hocon();
+
+    public TreeSitterHocon() {
+        super(tree_sitter_hocon());
+    }
+
+    private TreeSitterHocon(long ptr) {
+        super(ptr);
+    }
+
+    @Override
+    public TSLanguage copy() {
+        return new TreeSitterHocon(copyPtr());
+    }
+}