Add support for iOS and enhance Sample module for Compose Multiplatform

bonsai-core/build.gradle.kts

@@ -3,10 +3,15 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.compose")
     id("com.vanniktech.maven.publish")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlinMultiplatform()
 
+android {
+    namespace = "cafe.adriel.bonsai.core"
+}
+
 kotlin {
     sourceSets {
         val commonMain by getting {

bonsai-core/src/iosMain/kotlin/cafe/adriel/bonsai/core/util/Actuals.kt

@@ -0,0 +1,6 @@
+package cafe.adriel.bonsai.core.util
+
+import platform.Foundation.NSUUID.Companion.UUID
+
+internal actual val randomUUID: String
+    get() = UUID().UUIDString

bonsai-file-system/build.gradle.kts

@@ -3,10 +3,15 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.compose")
     id("com.vanniktech.maven.publish")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlinMultiplatform()
 
+android {
+    namespace = "cafe.adriel.bonsai.filesystem"
+}
+
 kotlin {
     sourceSets {
         val commonMain by getting {

bonsai-json/build.gradle.kts

@@ -4,10 +4,15 @@ plugins {
     id("com.android.library")
     id("org.jetbrains.compose")
     id("com.vanniktech.maven.publish")
+    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 kotlinMultiplatform()
 
+android {
+    namespace = "cafe.adriel.bonsai.json"
+}
+
 kotlin {
     sourceSets {
         val commonMain by getting {
@@ -16,6 +21,7 @@ kotlin {
                 api(libs.serialization)
                 compileOnly(compose.foundation)
                 compileOnly(compose.ui)
+                compileOnly(compose.materialIconsExtended)
             }
         }
     }

build.gradle

@@ -18,6 +18,10 @@ subprojects {
             sonatypeHost = "S01"
         }
     }
+    tasks.withType(AbstractPublishToMaven) { AbstractPublishToMaven publishTask ->
+        def signingTasks = tasks.withType(Sign)
+        publishTask.mustRunAfter(signingTasks)
+    }
     detekt {
         config = files("../detekt.yml")
         parallel = true

buildSrc/settings.gradle.kts

@@ -1,9 +1,7 @@
-enableFeaturePreview("VERSION_CATALOGS")
-
 dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
         }
     }
-}
+}

buildSrc/src/main/kotlin/Setup.kt

@@ -24,6 +24,9 @@ fun Project.kotlinMultiplatform(
         android {
             publishAllLibraryVariants()
         }
+        iosX64()
+        iosArm64()
+        iosSimulatorArm64()
         jvm("desktop")
 
         sourceSets {
@@ -46,8 +49,14 @@ fun Project.kotlinMultiplatform(
             val androidMain by getting {
                 dependsOn(jvmMain)
             }
-            val androidTest by getting {
-                dependsOn(jvmTest)
+            val iosX64Main by getting
+            val iosArm64Main by getting
+            val iosSimulatorArm64Main by getting
+            val iosMain by creating {
+                dependsOn(commonMain)
+                iosX64Main.dependsOn(this)
+                iosArm64Main.dependsOn(this)
+                iosSimulatorArm64Main.dependsOn(this)
             }
 
             val desktopMain by getting {

gradle.properties

@@ -2,7 +2,6 @@ org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 android.enableJetifier=true
 kotlin.code.style=official
-kotlin.mpp.enableGranularSourceSetsMetadata=true
 
 # Maven
 GROUP=cafe.adriel.bonsai

gradle/libs.versions.toml

@@ -1,18 +1,18 @@
 [versions]
-plugin-android = "7.1.3"
+plugin-android = "8.2.2"
 plugin-ktlint = "10.2.1"
 plugin-detekt = "1.20.0-RC1"
 plugin-maven = "0.18.0"
 
-kotlin = "1.8.22"
-okio = "3.0.0"
+kotlin = "2.0.0"
+okio = "3.9.0"
 serialization = "1.5.1"
 
-compose = "1.4.8"
-composeMultiplatform = "1.4.3"
+compose = "1.6.7"
+composeMultiplatform = "1.6.11"
 composeActivity = "1.7.2"
-composeVoyager = "1.0.0-beta16"
-material = "1.4.3"
+composeVoyager = "1.1.0-beta02"
+kotlinx-coroutines = "1.8.1"
 
 [libraries]
 plugin-android = { module = "com.android.tools.build:gradle", version.ref = "plugin-android" }
@@ -22,15 +22,14 @@ plugin-maven = { module = "com.vanniktech:gradle-maven-publish-plugin", version.
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-serialization = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
 plugin-compose-multiplatform = { module = "org.jetbrains.compose:compose-gradle-plugin", version.ref = "composeMultiplatform" }
+kotlinx-coroutines-swing = { group = "org.jetbrains.kotlinx", name = "kotlinx-coroutines-swing", version.ref = "kotlinx-coroutines" }
 
 okio = { module = "com.squareup.okio:okio", version.ref = "okio" }
 serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
 
-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "material" }
-compose-material-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "material" }
 compose-activity = { module = "androidx.activity:activity-compose", version.ref = "composeActivity" }
 compose-voyager = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "composeVoyager" }
+compose-compiler = { module = "org.jetbrains.kotlin:compose-compiler-gradle-plugin", version = "2.0.20" }
 
 [bundles]
-plugins = ["plugin-android", "plugin-ktlint", "plugin-detekt", "plugin-maven", "plugin-kotlin", "plugin-serialization", "plugin-compose-multiplatform"]
+plugins = ["plugin-android", "plugin-ktlint", "plugin-detekt", "plugin-maven", "plugin-kotlin", "plugin-serialization", "plugin-compose-multiplatform", "compose-compiler"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/build.gradle.kts

@@ -0,0 +1,100 @@
+import org.jetbrains.compose.desktop.application.dsl.TargetFormat
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+    kotlin("multiplatform")
+    id("com.android.application")
+    id("org.jetbrains.compose")
+    id("org.jetbrains.kotlin.plugin.compose")
+}
+
+kotlin {
+    androidTarget {
+        @OptIn(ExperimentalKotlinGradlePluginApi::class)
+                compilerOptions {
+            jvmTarget.set(JvmTarget.JVM_11)
+        }
+    }
+
+    jvm("desktop")
+
+    listOf(
+            iosX64(),
+            iosArm64(),
+            iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "Sample"
+            isStatic = true
+        }
+    }
+
+    sourceSets {
+        val desktopMain by getting
+
+        androidMain.dependencies {
+            implementation(compose.preview)
+            implementation(libs.compose.activity)
+            implementation(libs.compose.voyager)
+        }
+        commonMain.dependencies {
+            implementation(projects.bonsaiCore)
+            implementation(projects.bonsaiFileSystem)
+            implementation(projects.bonsaiJson)
+            implementation(compose.runtime)
+            implementation(compose.foundation)
+            implementation(compose.material)
+            implementation(compose.materialIconsExtended)
+            implementation(compose.ui)
+            implementation(compose.components.resources)
+            implementation(compose.components.uiToolingPreview)
+            implementation(libs.okio)
+            implementation(libs.compose.voyager)
+        }
+        desktopMain.dependencies {
+            implementation(compose.desktop.currentOs)
+            implementation(libs.kotlinx.coroutines.swing)
+        }
+    }
+}
+
+android {
+    namespace = "cafe.adriel.bonsai.sample"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "cafe.adriel.bonsai.sample"
+        minSdk = 21
+        targetSdk = 31
+        versionCode = 1
+        versionName = "1.0"
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    buildFeatures {
+        compose = true
+    }
+    dependencies {
+        debugImplementation(compose.uiTooling)
+    }
+}
+
+compose.desktop {
+    application {
+        mainClass = "cafe.adriel.bonsai.sample.MainKt"
+
+        nativeDistributions {
+            targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb)
+            packageName = "cafe.adriel.bonsai.sample"
+            packageVersion = "1.0.0"
+        }
+    }
+}