Changes to use dart 3.0.0:

- Reintroduce klutterGetKradleTask. - Use klutter-dart to build native executable. - Make al files executable when unzipping to prevent script problems. - Use klutter-dart 3.0.0 for iOS init and delete init tasks from kore module. - Bump Jetbrains dependency, use newer platform api. - Project cleanup.
buijs-dev · May 13, 2024 · 657b7c7 · 657b7c7
1 parent ea8c568
commit 657b7c7
Show file tree

Hide file tree

Showing 23 changed files with 251 additions and 147 deletions.
diff --git a/.github/workflows/kradle.yml b/.github/workflows/kradle.yml
diff --git a/README.md b/README.md
@@ -8,7 +8,6 @@
 Klutter is a framework which interconnects Flutter and Kotlin Multiplatform.
 It can be used to create Flutter plugins.
 
-
 ### Getting started
 - Start a new project with the
   - [Intellij](https://buijs.dev/klutter-3/) plugin

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,5 @@
 org.gradle.jvmargs=-Xms3096M -Xmx8192M -Dkotlin.daemon.jvm.options\="-Xmx8192M"
 kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
-kotlin.native.cacheKind.iosArm64=none
+kotlin.native.cacheKind.iosArm64=none
+kotlin.stdlib.default.dependency = false
diff --git a/lib-build/build.gradle.kts b/lib-build/build.gradle.kts
@@ -25,7 +25,6 @@ buildscript {
 
     dependencies {
         classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10")
-        //classpath("com.android.tools.build:gradle:8.1.4")
     }
 }
 

diff --git a/lib-test/build.gradle.kts b/lib-test/build.gradle.kts
@@ -34,7 +34,7 @@ sourceSets {
 
 dependencies {
     //Kotlin
-    implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.0")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
     implementation("org.jetbrains.kotlin:kotlin-compiler:1.7.10")
 
     //Jackson for XML

diff --git a/lib/build.gradle.kts b/lib/build.gradle.kts
@@ -39,12 +39,6 @@ kover {
 
         // a test-only module
         ":lib-test",
-
-        // a test-only module
-        ":test-integration",
-
-        // for KSP testing only
-        ":test-ksp",
     )
 }
 

diff --git a/lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/KlutterGradlePlugin.kt b/lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/KlutterGradlePlugin.kt
@@ -139,6 +139,9 @@ private fun TaskContainer.registerTasks() {
 
             GetProtoc ->
                 registerTask<GetProtocGradleTask>(gradleTaskName)
+
+            GetKradle ->
+                registerTask<GetKradleGradleTask>(gradleTaskName)
         }
     }
 }

diff --git a/lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/AbstractTask.kt b/lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/AbstractTask.kt
@@ -46,6 +46,8 @@ enum class KlutterGradleTaskName(private val identifier: String) {
 
     GetProtoc("GetProtoc"),
 
+    GetKradle("GetKradle"),
+
     CompileProtoSchemas("CompileProtoSchemas");
 
     val taskName: String

diff --git a/lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/GetKradleGradleTask.kt b/lib/gradle/src/main/kotlin/dev/buijs/klutter/gradle/tasks/GetKradleGradleTask.kt
@@ -0,0 +1,36 @@
+/* Copyright (c) 2021 - 2024 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+package dev.buijs.klutter.gradle.tasks
+
+import dev.buijs.klutter.kore.KlutterTask
+import dev.buijs.klutter.kore.tasks.GetKradleTask
+
+internal open class GetKradleGradleTask: AbstractTask() {
+
+    override val gradleTaskName = KlutterGradleTaskName.GetKradle
+
+    override fun klutterTask(): KlutterTask {
+        val project = super.project()
+        return GetKradleTask(project.root.resolve("kradle").absolutePath)
+    }
+
+}
diff --git a/lib/gradle/src/test/groovy/dev/buijs/klutter/gradle/tasks/GetKradleGradleTaskSpec.groovy b/lib/gradle/src/test/groovy/dev/buijs/klutter/gradle/tasks/GetKradleGradleTaskSpec.groovy
@@ -0,0 +1,43 @@
+/* Copyright (c) 2021 - 2022 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
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+package dev.buijs.klutter.gradle.tasks
+
+import spock.lang.Ignore
+import spock.lang.Specification
+
+import static dev.buijs.klutter.gradle.tasks.TaskTestUtil.getTask
+
+class GetKradleGradleTaskSpec extends Specification {
+
+    // does not work in ci yet ...
+    @Ignore
+    def "Verify getKradleTask works"() {
+        def task = getTask(GetKradleGradleTask)
+
+        when:
+        task.execute()
+
+        then: "No exception is thrown"
+        1 == 1
+    }
+
+}
diff --git a/lib/jetbrains/CHANGELOG.md b/lib/jetbrains/CHANGELOG.md
@@ -1,4 +1,12 @@
 <!-- Keep a Changelog guide -> https://keepachangelog.com -->
+## [2024.1.1]
+
+### Changed
+- Uses klutter 2024.1.1.beta.
+- Uses klutter (dart) [3.0.0](https://pub.dev/packages/klutter).
+- Uses klutter_ui (dart) [1.1.0](https://pub.dev/packages/klutter_ui).
+- Add protobuf support.
+
 ## [2023.3.1]
 
 ### Changed

diff --git a/lib/jetbrains/build.gradle.kts b/lib/jetbrains/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.jetbrains.changelog.date
 
 plugins {
-    id("org.jetbrains.intellij") version "1.13.3"
+    id("org.jetbrains.intellij") version "1.17.3"
     id("org.jetbrains.changelog") version "2.0.0"
     id("java")
     id("maven-publish")
@@ -22,19 +22,8 @@ val robotVersion = "0.11.16"
 group = "dev.buijs.klutter"
 version = dev.buijs.klutter.ProjectVersions.jetbrains
 
-//java {
-//    sourceCompatibility = JavaVersion.VERSION_17
-//    targetCompatibility = JavaVersion.VERSION_17
-//}
-
-//kotlin {
-//    jvmToolchain {
-//        languageVersion.set(JavaLanguageVersion.of(13))
-//    }
-//}
-
 intellij {
-    version.set("2022.3.2")
+    version.set("2023.2")
     type.set("IC") // Intellij Community Edition
     plugins.set(listOf("java", "com.intellij.gradle","android"))
 }
@@ -62,22 +51,13 @@ changelog {
 
 tasks {
 
-//    withType<JavaCompile> {
-//        sourceCompatibility = "13"
-//        targetCompatibility = "13"
-//    }
-//
-//    withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
-//        kotlinOptions.jvmTarget = "13"
-//    }
-
     withType<Test> {
         useJUnitPlatform()
     }
 
     patchPluginXml {
-        sinceBuild.set("223")
-        untilBuild.set("232.*")
+        sinceBuild.set("232")
+        //untilBuild.set("232.*")
     }
 
     signPlugin {

diff --git a/lib/jetbrains/src/main/kotlin/dev/buijs/klutter/jetbrains/KlutterMetadata.kt b/lib/jetbrains/src/main/kotlin/dev/buijs/klutter/jetbrains/KlutterMetadata.kt
@@ -52,6 +52,6 @@ object KlutterBundle {
  */
 @ExcludeFromJacocoGeneratedReport
 object KlutterIcons {
-    val logo16x16: Icon = IconLoader.getIcon("/pluginIcon16x16.png", KlutterIcons::class.java)
-    val logo20x20: Icon = IconLoader.getIcon("/pluginIcon20x20.png", KlutterIcons::class.java)
+    val logo16x16: Icon = IconLoader.getIcon("/pluginIcon16x16.svg", KlutterIcons::class.java)
+    val logo20x20: Icon = IconLoader.getIcon("/pluginIcon20x20.svg", KlutterIcons::class.java)
 }
diff --git a/lib/jetbrains/src/main/kotlin/dev/buijs/klutter/jetbrains/NewProjectTaskFactory.kt b/lib/jetbrains/src/main/kotlin/dev/buijs/klutter/jetbrains/NewProjectTaskFactory.kt
@@ -26,6 +26,7 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
 import dev.buijs.klutter.kore.project.*
+import dev.buijs.klutter.kore.tasks.execute
 import dev.buijs.klutter.kore.tasks.executor
 import dev.buijs.klutter.kore.tasks.project.*
 import mu.KotlinLogging
@@ -67,6 +68,7 @@ private fun createKlutterPluginTask(
             executor = JetbrainsExecutor()
             task.run()
             rootFolder.moveUpFolder(options.pluginName.validPluginNameOrThrow())
+            "./gradlew klutterGetKradle -p platform" execute rootFolder
         })
 }
 

diff --git a/lib/jetbrains/src/main/kotlin/dev/buijs/klutter/jetbrains/NewProjectWizardStep.kt b/lib/jetbrains/src/main/kotlin/dev/buijs/klutter/jetbrains/NewProjectWizardStep.kt
@@ -129,7 +129,7 @@ private fun newProjectPanel(data: NewProjectConfig, disposable: Disposable) = pa
     indent {
         row {
             // KLUTTER BANNER
-            cell(KlutterBanner).verticalAlign(VerticalAlign.CENTER)
+            cell(KlutterBanner).align(AlignY.CENTER)
         }
 
         val project = "Project"
@@ -139,7 +139,7 @@ private fun newProjectPanel(data: NewProjectConfig, disposable: Disposable) = pa
                 textField()
                     .bindText(data.appNameObservable)
                     .widthGroup(project)
-                    .horizontalAlign(HorizontalAlign.LEFT)
+                    .align(AlignX.LEFT)
                     .bindValidator(disposable) { input ->
                         if(toPluginName(input) is EitherNok) "The Plugin Name is not valid." else null
                     }
@@ -150,7 +150,7 @@ private fun newProjectPanel(data: NewProjectConfig, disposable: Disposable) = pa
                 textField()
                     .bindText(data.groupNameObservable)
                     .widthGroup(project)
-                    .horizontalAlign(HorizontalAlign.LEFT)
+                    .align(AlignX.LEFT)
                     .bindValidator(disposable) { input ->
                         if(toGroupName(input) is EitherNok) "The Group Name is not valid." else null
                     }
@@ -164,7 +164,7 @@ private fun newProjectPanel(data: NewProjectConfig, disposable: Disposable) = pa
                     .also { it.component.isEditable = true }
                     .widthGroup(dependencies)
                     .bindItem(data.gradleVersionObservable)
-                    .horizontalAlign(HorizontalAlign.LEFT)
+                    .align(AlignX.LEFT)
                     .bindValidator(disposable, isBlocking = false) { input ->
                         if(knownKlutterBOMVersions.none { it == input }) "The BOM Version is unknown." else null
                     }
@@ -173,13 +173,13 @@ private fun newProjectPanel(data: NewProjectConfig, disposable: Disposable) = pa
                 comboBox(items = flutterVersionsDescending(currentOperatingSystem).map { "${it.prettyPrintedString}" })
                     .widthGroup(dependencies)
                     .bindItem(data.flutterVersionObservable)
-                    .horizontalAlign(HorizontalAlign.LEFT)
+                    .align(AlignX.LEFT)
             }
             row {
                 checkBox("Get flutter dependencies from git.")
                     .widthGroup(dependencies)
                     .bindSelected(data.useGitForPubDependenciesObservable)
-                    .horizontalAlign(HorizontalAlign.LEFT)
+                    .align(AlignX.LEFT)
             }
 
             row {}.comment("If enabled then all flutter dependencies are pulled from git and not pub.")
@@ -271,8 +271,4 @@ private fun <T> observable(
         // nothing
     }
 
-    override fun afterChange(listener: (T) -> Unit, parentDisposable: Disposable) {
-        // nothing
-    }
-
 }
diff --git a/lib/kore/src/main/kotlin/dev/buijs/klutter/kore/project/Environment.kt b/lib/kore/src/main/kotlin/dev/buijs/klutter/kore/project/Environment.kt
@@ -28,6 +28,9 @@ val Version.prettyPrint: String
 val isWindows: Boolean
     get() = currentOperatingSystem == OperatingSystem.WINDOWS
 
+val isMacos: Boolean
+    get() = currentOperatingSystem == OperatingSystem.MACOS
+
 /**
  * Get current [OperatingSystem] from System Properties.
  *
@@ -45,7 +48,17 @@ val currentOperatingSystem: OperatingSystem
     }
 
 val currentArchitecture: Architecture
-    get() = """uname -m""".execute(Path.of("").toFile().absoluteFile).let { str ->
-        if(str.uppercase().contains("ARM")) Architecture.ARM64 else Architecture.X64
+    get() {
+        val sysctl = "sysctl -n sysctl.proc_translated" execute currentWorkingDirectory
+        val usesRosetta = sysctl == "1"
+        val architecture = """uname -m""" execute currentWorkingDirectory
+        val archContainsARM = architecture.uppercase().contains("ARM")
+        return when {
+            usesRosetta -> Architecture.ARM64
+            archContainsARM -> Architecture.ARM64
+            else -> Architecture.X64
+        }
     }
 
+val currentWorkingDirectory: File
+    get() = Path.of("").toFile().absoluteFile