Merge branch 'ios'

Support iOS targets and reorganize the hierarchy.

Author: ShreckYe

.gitignore

@@ -3,3 +3,5 @@ build
 local.properties
 
 .idea
+
+xcuserdata/

buildSrc/build.gradle.kts

@@ -5,8 +5,9 @@ plugins {
 repositories {
     //mavenLocal()
     gradlePluginPortal()
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     google()
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+    mavenCentral()
 }
 
 dependencies {

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -5,6 +5,6 @@ object DependencyVersions {
 
     object Androidx {
         val activityCompose = "1.8.2"
-        val compose = "1.6.3"
+        val compose = "1.6.4"
     }
 }

buildSrc/src/main/kotlin/common-conventions.gradle.kts

@@ -5,22 +5,33 @@ plugins {
     id("org.jetbrains.compose")
 }
 
-group = "com.huanshankeji"
-version = "0.1.3-SNAPSHOT"
-
 repositories {
     mavenLocal()
     mavenCentral()
-    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
     google()
+    maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
 }
 
+group = "com.huanshankeji"
+version = "0.1.3-SNAPSHOT"
+
 kotlin {
+    // for `androidx.compose`
+
     jvm() // TODO: `jvm("desktop")`?
     jvmToolchain(8)
+
     //androidTarget()
+
+    iosX64()
+    iosArm64()
+    iosSimulatorArm64()
+
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs()
 
+
+    // for JS and HTML wrappers
+
     js()
 }

buildSrc/src/main/kotlin/lib-conventions.gradle.kts

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+
 plugins {
     id("common-conventions")
     // TODO: `id("com.android.library") version "7.2.2"`?
@@ -8,9 +10,24 @@ plugins {
 
 kotlin {
     // move to `common-conventions` if necessary
+
+    @OptIn(ExperimentalKotlinGradlePluginApi::class)
+    applyDefaultHierarchyTemplate {
+        common {
+            group("androidxCommon") {
+                withJvm()
+                group("ios")
+                withWasm()
+            }
+        }
+    }
+
+    /*
     sourceSets {
         val androidxCommonMain by creating { dependsOn(commonMain.get()) }
         jvmMain { dependsOn(androidxCommonMain) }
+        iosMain { dependsOn(androidxCommonMain) }
         named("wasmJsMain") { dependsOn(androidxCommonMain) }
     }
+    */
 }

demo/build.gradle.kts

@@ -8,6 +8,17 @@ plugins {
 kotlin {
     androidTarget()
 
+    listOf(
+        iosX64(),
+        iosArm64(),
+        iosSimulatorArm64()
+    ).forEach { iosTarget ->
+        iosTarget.binaries.framework {
+            baseName = "ComposeApp"
+            isStatic = true
+        }
+    }
+
     val outputFileName = "app.js"
 
     @OptIn(ExperimentalWasmDsl::class)
@@ -45,12 +56,18 @@ kotlin {
         }
         androidMain {
             dependencies {
+                // TODO consider putting this in `androidxCommonMain`
                 implementation(compose.ui)
 
                 implementation("androidx.activity:activity-compose:${DependencyVersions.Androidx.activityCompose}")
                 implementation("androidx.compose.ui:ui-tooling-preview:${DependencyVersions.Androidx.compose}")
             }
         }
+        iosMain {
+            dependencies {
+                implementation(compose.ui)
+            }
+        }
         wasmJsMain {
             dependencies {
                 implementation(compose.ui)

demo/iosApp/Configuration/Config.xcconfig

@@ -0,0 +1,3 @@
+TEAM_ID=
+BUNDLE_ID=com.huanshankeji.compose.material.demo
+APP_NAME=compose-multiplatform-material-demo