Fix GH workflows.

WIP kradle.

.github/workflows/codecov.yml

@@ -24,15 +24,15 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
           cache: gradle
       - uses: subosito/flutter-action@v2
         with:
           flutter-version: '3.0.5'
           channel: 'stable'
       - uses: gradle/gradle-build-action@v2.4.2
         with:
-          gradle-version: 7.4.2
+          gradle-version: 8.3
           arguments: clean build koverMergedXmlReport -p "lib"
 
       - uses: codecov/codecov-action@v2

.github/workflows/dokka.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
       - name: 'setup gradle'
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          gradle-version: 7.4.2
+          gradle-version: 8.3
       - name: 'setup flutter'
         uses: subosito/flutter-action@v2
         with:

.github/workflows/kradle.yml

@@ -24,13 +24,12 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt'
-          java-version: 11
+          java-version: 17
           cache: gradle
       - name: 'build distribution'
         uses: gradle/gradle-build-action@v2.4.2
         with:
-          gradle-version: 7.4.2
-          arguments: clean build -p "lib/kradle"
+          gradle-version: 8.3b/kradle"
       - name: 'copy jar to kradle folder'
         run: cp ./lib/kradle/build/libs/kradle-wrapper.jar kradle/lib
       - name: 'create zip file'

CHANGELOG.md

@@ -1,5 +1,7 @@
 # CHANGELOG
 
+## v2024.1.1.beta
+
 ## v2023.3.1.beta
 - Refactored task module to package in kore.
 - Removed task module from BOM e.a.
@@ -15,8 +17,6 @@
 - Uses [klutter-dart](https://pub.dev/packages/klutter) version 1.0.0.
 - Uses [klutter-dart-ui](https://pub.dev/packages/klutter_ui) version 1.0.0.
 
-## v2023.3.1.beta
-
 ## v2023.1.1.beta
 - Added support for request parameters.
 - Added support for streaming data from platform to ui (using EventChannel).

lib/build.gradle.kts

@@ -2,7 +2,7 @@ import org.jetbrains.dokka.gradle.DokkaTask
 
 plugins {
     kotlin("jvm")
-    id("org.jetbrains.dokka") version "1.6.10"
+    id("org.jetbrains.dokka") version "1.9.20"
     id("org.jetbrains.kotlinx.kover") version "0.5.1"
     id("klutter")
 }
@@ -57,7 +57,7 @@ tasks.withType<DokkaTask>().configureEach {
 }
 
 tasks.dokkaHtmlMultiModule.configure {
-    outputDirectory.set(layout.buildDirectory.dir("dokkaSite").map { it.asFile })
+    outputDirectory.set(layout.buildDirectory.dir("dokkaSite"))
 }
 
 tasks.koverMergedXmlReport {

lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/KlutterGradlePlugin.kt

@@ -35,6 +35,7 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.plugins.PluginContainer
 import org.gradle.api.tasks.TaskContainer
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
 
 /**
  * Gradle plugin for Klutter Framework.
@@ -45,9 +46,25 @@ class KlutterGradlePlugin: Plugin<Project> {
             tasks.registerTasks()
             plugins.applyKspPlugin()
             extensions.add("klutter", KlutterExtension(project))
-            val ext = project.extensions.getByType(KspExtension::class.java)
+            val ksp = project.extensions.getByType(KspExtension::class.java)
             project.afterEvaluate {
-                ext.arg(kspArgumentKlutterProjectFolder, project.rootDir.absolutePath)
+                // KMP
+                val kmp = try {
+                    project.extensions.getByType(KotlinMultiplatformExtension::class.java)
+                } catch (_: Exception) {
+                    null
+                }
+
+                if (kmp != null) {
+                    kmp.sourceSets
+                        .getByName("commonMain")
+                        .kotlin
+                        .srcDir(layout.buildDirectory.file("generated/ksp/metadata/commonMain/kotlin"))
+                    tasks.bindPostBuildTasks()
+                }
+
+                // KSP
+                ksp.arg(kspArgumentKlutterProjectFolder, project.rootDir.absolutePath)
             }
         }
     }
@@ -64,11 +81,26 @@ private fun PluginContainer.applyKspPlugin() {
  * Register the custom Klutter tasks.
  */
 private fun TaskContainer.registerTasks() {
-    register("klutterCopyAarFile", CopyAndroidAarFileGradleTask::class.java)
-    register("klutterCopyFramework", CopyIosFrameworkGradleTask::class.java)
-    register("klutterGetKradle", GetKradleTask::class.java)
-    register("klutterGetDartProtoc", GetDartProtocExeGradleTask::class.java)
-    register("klutterGetProtoc", GetProtocGradleTask::class.java)
-    register("klutterCompileProtoSchema", CompileProtoSchemaGradleTask::class.java)
-    register("klutterCleanGeneratedProtoExt", CleanProtoExtensionsGradleTask::class.java)
+    register(CopyAndroidAarFileGradleTask.gradleTaskName, CopyAndroidAarFileGradleTask::class.java)
+    register(CopyIosFrameworkGradleTask.gradleTaskName, CopyIosFrameworkGradleTask::class.java)
+    register(GetKradleTask.gradleTaskName, GetKradleTask::class.java)
+    register(GetDartProtocExeGradleTask.gradleTaskName, GetDartProtocExeGradleTask::class.java)
+    register(GetProtocGradleTask.gradleTaskName, GetProtocGradleTask::class.java)
+    register(CompileProtoSchemaGradleTask.gradleTaskName, CompileProtoSchemaGradleTask::class.java)
+    register(GenerateFlutterLibGradleTask.gradleTaskName, GenerateFlutterLibGradleTask::class.java)
+}
+
+private fun TaskContainer.bindPostBuildTasks() {
+    getByName("build").setFinalizedBy(
+       listOf(CopyAndroidAarFileGradleTask.gradleTaskName,
+           CompileProtoSchemaGradleTask.gradleTaskName,
+           "assemblePlatformReleaseXCFramework",
+           "klutterGenerateProtoSchemas"
+       ))
+
+    getByName("assemblePlatformReleaseXCFramework")
+        .setFinalizedBy(listOf(getByName(CopyIosFrameworkGradleTask.gradleTaskName)))
+
+    getByName("klutterGenerateProtoSchemas")
+        .setFinalizedBy(listOf("klutterCompileProtoSchemas"))
 }

lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/CompileProtoSchemaGradleTask.kt

@@ -26,6 +26,15 @@ import dev.buijs.klutter.kore.tasks.codegen.CompileProtoSchemaTask
 
 internal open class CompileProtoSchemaGradleTask: AbstractTask() {
 
+    companion object {
+        val gradleTaskName = "klutterCompileProtoSchemas"
+    }
+
+    init {
+        super.dependsOn(GetDartProtocExeGradleTask.gradleTaskName, GetProtocGradleTask.gradleTaskName)
+        super.finalizedBy(GenerateFlutterLibGradleTask.gradleTaskName)
+    }
+
     override fun klutterTask(): KlutterTask =
         CompileProtoSchemaTask(super.project().root.folder)
 

lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/CopyTasks.kt

@@ -28,6 +28,10 @@ import dev.buijs.klutter.kore.tasks.CopyXCFrameworkTask
  * Execute task [CopyAndroidAarFileGradleTask] from Gradle.
  */
 internal open class CopyAndroidAarFileGradleTask: AbstractTask() {
+    companion object {
+        val gradleTaskName = "klutterCopyAarFile"
+    }
+
     override fun klutterTask() = CopyAarFileTask(
         pathToRoot = project.rootDir,
         pluginName = project.klutterExtension().plugin?.name,
@@ -38,6 +42,9 @@ internal open class CopyAndroidAarFileGradleTask: AbstractTask() {
  * Execute task [CopyXCFrameworkTask] from Gradle.
  */
 internal open class CopyIosFrameworkGradleTask: AbstractTask() {
+    companion object {
+        val gradleTaskName = "klutterCopyFramework"
+    }
     override fun klutterTask() = CopyXCFrameworkTask(
         pathToRoot = project.rootDir,
     )

lib/kore/src/main/kotlin/dev/buijs/klutter/kore/tasks/codegen/CleanupProtoExtensionsTask.kt → lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/GenerateFlutterLibGradleTask.kt

@@ -1,4 +1,4 @@
-/* Copyright (c) 2021 - 2024 Buijs Software
+/* Copyright (c) 2021 - 2023 Buijs Software
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -19,15 +19,23 @@
  * SOFTWARE.
  *
  */
-package dev.buijs.klutter.kore.tasks.codegen
+package dev.buijs.klutter.gradle.tasks
 
 import dev.buijs.klutter.kore.KlutterTask
-import java.io.File
+import dev.buijs.klutter.kore.common.verifyExists
+import dev.buijs.klutter.kore.tasks.codegen.GenerateFlutterLibTask
 
-class CleanProtoExtensionsTask(
-    private val sourceFolder: File,
-) : KlutterTask, GenerateCodeAction {
-    override fun run() {
-        sourceFolder.listFiles { _, name -> name.startsWith("\$protogen") }?.forEach { file -> file.delete() }
+internal open class GenerateFlutterLibGradleTask: AbstractTask() {
+    companion object {
+        val gradleTaskName = "klutterGenerateFlutterLib"
+    }
+    override fun klutterTask(): KlutterTask {
+        val project = project()
+
+        return GenerateFlutterLibTask(
+            pluginName = project.root.pluginName,
+            root = project.root,
+            srcFolder = project.root.pathToLibFolder.resolve("src").verifyExists()
+        )
     }
 }

lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/GetDartProtocTask.kt

@@ -28,5 +28,10 @@ import dev.buijs.klutter.kore.tasks.GetDartProtocExeTask
  * Execute task [GetDartProtocExeTask] from Gradle.
  */
 internal open class GetDartProtocExeGradleTask: AbstractTask() {
+
+    companion object {
+        val gradleTaskName = "klutterGetDartProtoc"
+    }
+
     override fun klutterTask(): KlutterTask = GetDartProtocExeTask()
 }

lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/GetKradleTask.kt

@@ -41,6 +41,11 @@ internal val kradlewBat: InputStream
  * Download Kradle CLI Tool.
  */
 internal open class GetKradleTask: AbstractTask() {
+
+    companion object {
+        val gradleTaskName = "klutterGetKradle"
+    }
+
     override fun klutterTask() =
         project.rootProject.projectDir.toGetKradleTask()
 }

lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/GetProtocGradleTask.kt

@@ -23,15 +23,16 @@ package dev.buijs.klutter.gradle.tasks
 
 import dev.buijs.klutter.kore.KlutterTask
 import dev.buijs.klutter.kore.project.kradleHome
-import dev.buijs.klutter.kore.project.kradleYaml
 import dev.buijs.klutter.kore.tasks.DownloadProtocTask
-import dev.buijs.klutter.kore.tasks.GetDartProtocExeTask
-import java.io.File
 
 /**
  * Execute task [DownloadProtocTask] from Gradle.
  */
 internal open class GetProtocGradleTask: AbstractTask() {
+    companion object {
+        val gradleTaskName = "klutterGetProtoc"
+    }
+
     override fun klutterTask(): KlutterTask {
         val project = super.project()
         return DownloadProtocTask(

lib/gradle/src/test/kotlin/dev/buijs/klutter/gradle/KlutterGradlePluginTest.kt

@@ -7,6 +7,7 @@ import io.kotlintest.shouldBe
 import io.kotlintest.shouldNotBe
 import io.kotlintest.specs.WordSpec
 import org.gradle.api.artifacts.dsl.DependencyHandler
+import org.gradle.api.file.ProjectLayout
 import org.gradle.api.plugins.ExtensionContainer
 import org.gradle.api.plugins.PluginContainer
 import org.gradle.api.tasks.TaskContainer
@@ -58,8 +59,12 @@ internal class KlutterGradlePluginTest: WordSpec({
         val subTemp = temp.resolve("foo")
         subTemp.mkdir()
 
+        val layout: ProjectLayout = mock {
+            whenever(it.buildDirectory).thenAnswer { temp }
+        }
+
         val project: org.gradle.api.Project = mock {
-            whenever(it.buildDir).thenAnswer {  temp }
+            whenever(it.layout).thenAnswer {  layout }
             whenever(it.projectDir).thenAnswer {  subTemp }
         }
 

lib/jetbrains/src/main/kotlin/dev/buijs/klutter/jetbrains/NewProjectWizardStep.kt

@@ -45,6 +45,7 @@ import java.awt.Graphics
 import javax.swing.JPanel
 
 private val knownKlutterBOMVersions = setOf(
+    "2024.1.1.beta",
     "2023.3.1.beta",
     "2023.2.2.beta",
     "2023.2.1.beta",

lib/kore/src/main/kotlin/dev/buijs/klutter/kore/project/PubspecBuilder.kt

@@ -25,8 +25,6 @@ package dev.buijs.klutter.kore.project
 import com.fasterxml.jackson.annotation.JsonAutoDetect
 import com.fasterxml.jackson.core.JsonParser
 import com.fasterxml.jackson.databind.*
-import com.fasterxml.jackson.databind.cfg.CoercionAction
-import com.fasterxml.jackson.databind.cfg.CoercionInputShape
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator
 import com.fasterxml.jackson.module.kotlin.registerKotlinModule
@@ -40,17 +38,17 @@ import java.io.File
 /**
  * The version of Klutter Gradle Executable Tool.
  */
-const val klutterBomVersion = "2023.3.1.beta"
+const val klutterBomVersion = "2024.1.1.beta"
 
 /**
  * The version of the klutter Pub Plugin.
  */
-const val klutterPubVersion = "2.0.0"
+const val klutterPubVersion = "2.1.0"
 
 /**
  * The version of the klutter-ui Pub Plugin.
  */
-const val klutterUIPubVersion = "1.0.1"
+const val klutterUIPubVersion = "1.1.0"
 
 /**
  * The version of the squint_json Pub Plugin.

lib/kore/src/main/kotlin/dev/buijs/klutter/kore/tasks/codegen/GenerateProtoExtensionsTask.kt

@@ -23,13 +23,22 @@ package dev.buijs.klutter.kore.tasks.codegen
 
 import dev.buijs.klutter.kore.KlutterTask
 import dev.buijs.klutter.kore.common.maybeCreate
-import dev.buijs.klutter.kore.common.verifyExists
+import dev.buijs.klutter.kore.common.maybeCreateFolder
 import dev.buijs.klutter.kore.common.write
 import dev.buijs.klutter.kore.templates.ProtobufExtensions
 import java.io.File
 
+const val protoGenMarker = "ProtocolBufferGenerated"
+
 fun GenerateCodeOptions.toGenerateProtoExtensionsTask() =
-    GenerateProtoExtensionsTask(project.platform.source(), responseClassNames)
+    GenerateProtoExtensionsTask(project.platform.folder
+        .resolve("build")
+        .resolve("generated")
+        .resolve("ksp")
+        .resolve("metadata")
+        .resolve("commonMain")
+        .resolve("kotlin")
+        , responseClassNames)
 
 class GenerateProtoExtensionsTask(
     private val sourceFolder: File,
@@ -46,10 +55,9 @@ class GenerateProtoExtensionsTask(
             val className = fqdn.substringAfterLast(".")
 
             sourceFolder
-                .resolve("kotlin")
                 .resolve(pathToPackage)
-                .verifyExists()
-                .resolve("\$protogen$className.kt")
+                .maybeCreateFolder()
+                .resolve("$protoGenMarker$className.kt")
                 .maybeCreate()
                 .write(ProtobufExtensions(packageName, className))
         }