Make :demo run on Android

Code is updated referencing a Compose Multiplatform project created with the new [Kotlin Multiplatform Wizard](https://kmp.jetbrains.com/).

Opt-in to `ExperimentalWasmDsl` for `wasmJs` to resolve a warning.

AGP v8.3.0 is not compatible with Kotlin Multiplatform 1.9.23 yet thus v8.2.2 is used.

Author: ShreckYe

buildSrc/build.gradle.kts

@@ -13,4 +13,5 @@ dependencies {
     implementation(kotlin("gradle-plugin", "1.9.23"))
     implementation("org.jetbrains.compose:compose-gradle-plugin:1.6.1")
     implementation("com.huanshankeji.team:gradle-plugins:0.5.1")
+    implementation("com.android.tools.build:gradle:8.2.2")
 }

buildSrc/src/main/kotlin/VersionsAndDependencies.kt

@@ -2,4 +2,9 @@ object DependencyVersions {
     val huanshankejiComposeWeb = "0.2.2"
     val kmdc = "0.1.2"
     val materialIcons = "1.13.12"
+
+    object Androidx {
+        val activityCompose = "1.8.2"
+        val compose = "1.6.3"
+    }
 }

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

@@ -5,6 +5,9 @@ plugins {
     id("org.jetbrains.compose")
 }
 
+group = "com.huanshankeji"
+version = "0.1.3-SNAPSHOT"
+
 repositories {
     mavenLocal()
     mavenCentral()
@@ -14,7 +17,8 @@ repositories {
 
 kotlin {
     jvm() // TODO: `jvm("desktop")`?
-    // TODO: `android()`?
+    jvmToolchain(8)
+    //androidTarget()
     @OptIn(ExperimentalWasmDsl::class)
     wasmJs()
 

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

@@ -3,11 +3,9 @@ plugins {
     // TODO: `id("com.android.library") version "7.2.2"`?
     id("com.huanshankeji.kotlin-multiplatform-jvm-and-js-browser-conventions")
     id("com.huanshankeji.kotlin-multiplatform-sonatype-ossrh-publish-conventions")
+    //id("com.android.library") // not used yet, the `jvm` target seems to be enough
 }
 
-group = "com.huanshankeji"
-version = "0.1.3-SNAPSHOT"
-
 kotlin {
     // move to `common-conventions` if necessary
     sourceSets {

demo/build.gradle.kts

@@ -1,9 +1,16 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 plugins {
     `common-conventions`
+    id("com.android.application")
 }
 
 kotlin {
+    androidTarget()
+
     val outputFileName = "app.js"
+
+    @OptIn(ExperimentalWasmDsl::class)
     wasmJs {
         browser {
             commonWebpackConfig {
@@ -12,6 +19,7 @@ kotlin {
         }
         binaries.executable()
     }
+
     js {
         browser {
             commonWebpackConfig {
@@ -35,6 +43,14 @@ kotlin {
                 implementation(compose.desktop.currentOs)
             }
         }
+        androidMain {
+            dependencies {
+                implementation(compose.ui)
+
+                implementation("androidx.activity:activity-compose:${DependencyVersions.Androidx.activityCompose}")
+                implementation("androidx.compose.ui:ui-tooling-preview:${DependencyVersions.Androidx.compose}")
+            }
+        }
         wasmJsMain {
             dependencies {
                 implementation(compose.ui)
@@ -50,14 +66,30 @@ kotlin {
     }
 }
 
+val `package` = "$group.compose.material.demo"
+
 compose {
     desktop {
         application {
-            mainClass = "com.huanshankeji.compose.material.demo.MainKt"
+            mainClass = "$`package`.MainKt"
         }
     }
 
     experimental {
         web.application {}
     }
 }
+
+android {
+    namespace = `package`
+
+    val sdk = 34
+    compileSdk = sdk
+
+    defaultConfig {
+        applicationId = `package`
+        minSdk = 24
+        targetSdk = sdk
+        versionName = version as String
+    }
+}

demo/src/androidMain/AndroidManifest.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+            android:allowBackup="true"
+            tools:ignore="MissingApplicationIcon"
+            android:label="@string/app_name"
+            android:supportsRtl="true"
+            android:theme="@android:style/Theme.Material.Light.NoActionBar">
+        <activity
+                android:exported="true"
+                android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|mnc|colorMode|density|fontScale|fontWeightAdjustment|keyboard|layoutDirection|locale|mcc|navigation|smallestScreenSize|touchscreen|uiMode"
+                android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>

demo/src/androidMain/kotlin/com/huanshankeji/compose/material/demo/MainActivity.kt

@@ -0,0 +1,21 @@
+package com.huanshankeji.compose.material.demo
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.tooling.preview.Preview
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setContent { App() }
+    }
+}
+
+@Preview
+@Composable
+fun AppAndroidPreview() =
+    App()
+

demo/src/androidMain/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">Compose Multiplatform Material demo</string>
+</resources>

demo/src/commonMain/kotlin/com/huanshankeji/compose/material/demo/Main.kt

@@ -2,6 +2,6 @@ package com.huanshankeji.compose.material.demo
 
 import org.jetbrains.compose.web.renderComposableInBody
 
-actual fun main() {
+fun main() {
     renderComposableInBody { App() }
 }