build: fix native publication

Author: ObserverOfTime

.editorconfig

@@ -25,6 +25,9 @@ indent_size = 2
 [*.{bat,ps1}]
 end_of_line = crlf
 
+[*.toml]
+max_line_length = 120
+
 # noinspection EditorConfigKeyCorrectness
 [*.{kt,kts}]
 ktlint_code_style = android_studio

build.gradle.kts

@@ -2,6 +2,7 @@ plugins {
     alias(libs.plugins.kotlin.mpp) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotest) apply false
+    alias(libs.plugins.ksp) apply false
     alias(libs.plugins.dokka) apply false
 }
 

gradle.properties

@@ -21,13 +21,13 @@ org.gradle.welcome=never
 kotlin.code.style=official
 # Enables the new Android multiplatform sourceset layout.
 kotlin.mpp.androidSourceSetLayoutVersion=2
-# Enable C interop sharing
+# Enables C interop sharing
 kotlin.mpp.enableCInteropCommonization=true
-# Enable cross-compilation of klib artifacts
-kotlin.native.enableKlibsCrossCompilation=true
-# Disable default stdlib dependency
+# Disables cross-compilation of klib artifacts
+kotlin.native.enableKlibsCrossCompilation=false
+# Disables default stdlib dependency
 kotlin.stdlib.default.dependency=false
-# Ignore disabled Kotlin/Native targets
+# Ignores disabled Kotlin/Native targets
 kotlin.native.ignoreDisabledTargets=true
 
 # Enables the AndroidX package structure.

gradle/libs.versions.toml

@@ -1,12 +1,13 @@
 [versions]
 kotlin-stdlib = "2.2.10"
 android-gradle = {strictly = "8.11.1"}
-kotest = "6.0.+"
+kotest = "6.0.0"
 dokka = "2.0.0"
 
 [libraries]
 kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-stdlib" }
 kotest-engine = { module = "io.kotest:kotest-framework-engine", version.ref = "kotest" }
+kotest-symbolprocessor = { module = "io.kotest:kotest-framework-symbol-processor", version.ref = "kotest" }
 kotest-assertions = { module = "io.kotest:kotest-assertions-core", version.ref = "kotest" }
 kotest-junit-runner = { module = "io.kotest:kotest-runner-junit5", version.ref = "kotest" }
 kotest-junit-reporter = { module = "io.kotest:kotest-extensions-junitxml", version.ref = "kotest" }
@@ -17,7 +18,8 @@ dokka-base = { module = "org.jetbrains.dokka:dokka-base", version.ref = "dokka"
 [plugins]
 kotlin-mpp = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin-stdlib" }
 android-library = { id = "com.android.library", version.ref = "android-gradle" }
-kotest = { id = "io.kotest.multiplatform", version.ref = "kotest" }
+kotest = { id = "io.kotest", version.ref = "kotest" }
+ksp = { id = "com.google.devtools.ksp", version = "2.2.10-2.0.2" }
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
 
 [bundles]

ktreesitter/build.gradle.kts

@@ -4,13 +4,25 @@ import org.gradle.kotlin.dsl.support.useToRun
 import org.jetbrains.dokka.gradle.tasks.DokkaGeneratePublicationTask
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
 import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
 import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
-import org.jetbrains.kotlin.konan.target.PlatformManager
 
 inline val File.unixPath: String
     get() = if (!os.isWindows) path else path.replace("\\", "/")
 
+fun KotlinNativeTarget.treesitter() {
+    compilations.configureEach {
+        cinterops.register("treesitter") {
+            val srcDir = treesitterDir.resolve("lib/src")
+            val includeDir = treesitterDir.resolve("lib/include")
+            includeDirs.allHeaders(srcDir, includeDir)
+            includeDirs.headerFilterOnly(includeDir)
+            extraOpts("-libraryPath", libsDir.dir(konanTarget.name))
+        }
+    }
+}
+
 val os: OperatingSystem = OperatingSystem.current()
 val libsDir = layout.buildDirectory.get().dir("libs")
 val treesitterDir = rootDir.resolve("tree-sitter")
@@ -23,6 +35,7 @@ plugins {
     alias(libs.plugins.kotlin.mpp)
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotest)
+    alias(libs.plugins.ksp)
     alias(libs.plugins.dokka)
 }
 
@@ -40,30 +53,15 @@ kotlin {
         publishLibraryVariants("release")
     }
 
-    when {
-        os.isLinux -> listOf(linuxX64(), linuxArm64())
-        os.isWindows -> listOf(mingwX64())
-        os.isMacOsX -> listOf(
-            macosArm64(),
-            macosX64(),
-            iosArm64(),
-            iosSimulatorArm64()
-        )
-        else -> {
-            val arch = System.getProperty("os.arch")
-            throw GradleException("Unsupported platform: $os ($arch)")
-        }
-    }.forEach { target ->
-        target.compilations.configureEach {
-            cinterops.create("treesitter") {
-                val srcDir = treesitterDir.resolve("lib/src")
-                val includeDir = treesitterDir.resolve("lib/include")
-                includeDirs.allHeaders(srcDir, includeDir)
-                includeDirs.headerFilterOnly(includeDir)
-                extraOpts("-libraryPath", libsDir.dir(konanTarget.name))
-            }
-        }
-    }
+    linuxX64 { treesitter() }
+    linuxArm64 { treesitter() }
+    mingwX64 { treesitter() }
+    macosArm64 { treesitter() }
+    macosX64 { treesitter() }
+    iosArm64 { treesitter() }
+    iosSimulatorArm64 { treesitter() }
+
+    applyDefaultHierarchyTemplate()
 
     jvmToolchain(17)
 
@@ -93,6 +91,7 @@ kotlin {
         jvmTest {
             dependencies {
                 implementation(libs.bundles.kotest.junit)
+                implementation(libs.kotest.symbolprocessor)
             }
         }
 
@@ -145,7 +144,7 @@ android {
     }
 }
 
-tasks.create<Jar>("javadocJar") {
+tasks.register<Jar>("javadocJar") {
     group = "documentation"
     archiveClassifier.set("javadoc")
     from(files(rootDir.resolve("README.md")))
@@ -274,11 +273,8 @@ tasks.withType<CInteropProcess>().configureEach {
         "${konanTarget.family.staticPrefix}tree-sitter.${konanTarget.family.staticSuffix}"
     ).asFile
     val objectFile = treesitterDir.resolve("lib.o")
-    val loader = PlatformManager(konanHome.get(), false, konanDataDir.orNull).loader(konanTarget)
 
     doFirst {
-        if (!File(loader.absoluteTargetToolchain).isDirectory) loader.downloadDependencies()
-
         val argsFile = File.createTempFile("args", null)
         argsFile.deleteOnExit()
         argsFile.writer().useToRun {

languages/java/build.gradle.kts

@@ -2,12 +2,23 @@ import java.io.OutputStream.nullOutputStream
 import org.gradle.internal.os.OperatingSystem
 import org.gradle.kotlin.dsl.support.useToRun
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
 import org.jetbrains.kotlin.gradle.tasks.CInteropProcess
-import org.jetbrains.kotlin.konan.target.PlatformManager
 
 inline val File.unixPath: String
     get() = if (!os.isWindows) path else path.replace("\\", "/")
 
+fun KotlinNativeTarget.treesitterJava() {
+    compilations.configureEach {
+        cinterops.create("treesitterJava") {
+            definitionFile.set(generateTask.interopFile)
+            includeDirs.allHeaders(grammarDir.resolve("bindings/c"))
+            extraOpts("-libraryPath", libsDir.dir(konanTarget.name))
+            tasks.getByName(interopProcessingTaskName).mustRunAfter(generateTask)
+        }
+    }
+}
+
 val os: OperatingSystem = OperatingSystem.current()
 val libsDir = layout.buildDirectory.get().dir("libs")
 val grammarDir = projectDir.resolve("tree-sitter-java")
@@ -40,29 +51,15 @@ kotlin {
         publishLibraryVariants("release")
     }
 
-    when {
-        os.isLinux -> listOf(linuxX64(), linuxArm64())
-        os.isWindows -> listOf(mingwX64())
-        os.isMacOsX -> listOf(
-            macosArm64(),
-            macosX64(),
-            iosArm64(),
-            iosSimulatorArm64()
-        )
-        else -> {
-            val arch = System.getProperty("os.arch")
-            throw GradleException("Unsupported platform: $os ($arch)")
-        }
-    }.forEach { target ->
-        target.compilations.configureEach {
-            cinterops.create(grammar.interopName.get()) {
-                definitionFile.set(generateTask.interopFile)
-                includeDirs.allHeaders(grammarDir.resolve("bindings/c"))
-                extraOpts("-libraryPath", libsDir.dir(konanTarget.name))
-                tasks.getByName(interopProcessingTaskName).mustRunAfter(generateTask)
-            }
-        }
-    }
+    linuxX64 { treesitterJava() }
+    linuxArm64 { treesitterJava() }
+    mingwX64 { treesitterJava() }
+    macosArm64 { treesitterJava() }
+    macosX64 { treesitterJava() }
+    iosArm64 { treesitterJava() }
+    iosSimulatorArm64 { treesitterJava() }
+
+    applyDefaultHierarchyTemplate()
 
     jvmToolchain(17)
 
@@ -132,11 +129,8 @@ tasks.withType<CInteropProcess>().configureEach {
     val objectFiles = grammarFiles.map {
         srcDir.resolve(it.nameWithoutExtension + ".o").path
     }.toTypedArray()
-    val loader = PlatformManager(konanHome.get(), false, konanDataDir.orNull).loader(konanTarget)
 
     doFirst {
-        if (!File(loader.absoluteTargetToolchain).isDirectory) loader.downloadDependencies()
-
         val argsFile = File.createTempFile("args", null)
         argsFile.deleteOnExit()
         argsFile.writer().useToRun {
@@ -169,7 +163,7 @@ tasks.withType<CInteropProcess>().configureEach {
     outputs.file(libFile)
 }
 
-tasks.create<Jar>("javadocJar") {
+tasks.register<Jar>("javadocJar") {
     group = "documentation"
     archiveClassifier.set("javadoc")
 }