Support Compose/iOS (#359)

JuulLabs · May 24, 2024 · a17eeef · a17eeef
1 parent dc7fa1c
commit a17eeef
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/compose/build.gradle.kts b/compose/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.compose.compose
-
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
@@ -15,9 +13,15 @@ kotlin {
     jvmToolchain(libs.versions.jvm.toolchain.get().toInt())
 
     androidTarget().publishAllLibraryVariants()
+    iosArm64()
+    iosSimulatorArm64()
+    iosX64()
     jvm("desktop")
 
     sourceSets {
+
+        applyDefaultHierarchyTemplate()
+
         commonMain.dependencies {
             api(projects.kanvas)
             api(projects.element)
@@ -29,8 +33,17 @@ kotlin {
         commonTest.dependencies {
             implementation(kotlin("test"))
         }
-        getByName("desktopMain").dependencies {
-            api(compose.preview)
+
+        val skiaMain by creating {
+            dependsOn(commonMain.get())
+        }
+
+        val desktopMain by getting {
+            dependsOn(skiaMain)
+        }
+
+        val iosMain by getting {
+            dependsOn(skiaMain)
         }
     }
 }

diff --git a/compose/src/desktopMain/kotlin/DrawText.kt → compose/src/skiaMain/kotlin/DrawText.kt b/compose/src/desktopMain/kotlin/DrawText.kt → compose/src/skiaMain/kotlin/DrawText.kt
diff --git a/...e/src/desktopMain/kotlin/ResourceCache.kt → compose/src/skiaMain/kotlin/ResourceCache.kt b/...e/src/desktopMain/kotlin/ResourceCache.kt → compose/src/skiaMain/kotlin/ResourceCache.kt
diff --git a/...c/desktopMain/kotlin/SkiaIsPointInPath.kt → .../src/skiaMain/kotlin/SkiaIsPointInPath.kt b/...c/desktopMain/kotlin/SkiaIsPointInPath.kt → .../src/skiaMain/kotlin/SkiaIsPointInPath.kt