Merge pull request #5 from sunny-chung/feature/multiplatform

#4 Compose Multiplatform

.gitignore

@@ -13,3 +13,15 @@
 .externalNativeBuild
 .cxx
 local.properties
+
+**/build/
+xcuserdata
+!src/**/build/
+#.idea
+captures
+*.xcodeproj/*
+!*.xcodeproj/project.pbxproj
+!*.xcodeproj/xcshareddata/
+!*.xcodeproj/project.xcworkspace/
+!*.xcworkspace/contents.xcworkspacedata
+**/xcshareddata/WorkspaceSettings.xcsettings

README.md

@@ -1,8 +1,8 @@
 # Composable Table
 
-[![JitPack Release](https://jitpack.io/v/sunny-chung/composable-table.svg)](https://jitpack.io/#sunny-chung/composable-table)
+![Maven Central](https://img.shields.io/maven-central/v/io.github.sunny-chung/composable-table)
 
-An Android Jetpack Compose library that provides a `@Composable` table
+A multiplaform Jetpack Compose library that provides a `@Composable` table
 with automatic layouts.
 
 ![Demo Video](media/composable-table-demo.gif)
@@ -20,21 +20,29 @@ with automatic layouts.
 - Lazy cells
 - Grid lines (have to be implemented by users themselves inside cells)
 
+## Supported Platforms
+- Android
+- Desktop (JVM - Windows/MacOS/Linux)
+- iOS
+- WASM (JS)
+
 ## Setup
 
-1. Add the JitPack maven repository.
+For multiplatform:
 ```kotlin
-    repositories {
-        // ...
-        maven(url = "https://jitpack.io")
-    }
+kotlin {
+    sourceSets {
+        commonMain.dependencies {
+            implementation("io.github.sunny-chung:composable-table:<version>")
+
+            // ...
 ```
 
-2. Add this library as a dependency.
+For single platform:
 ```kotlin
     dependencies {
         // ...
-        implementation("com.github.sunny-chung:composable-table:<version>")
+        implementation("io.github.sunny-chung:composable-table:<version>")
     }
 ```
 
@@ -49,7 +57,16 @@ Below shows an example of minimal usage.
     }
 ```
 
-Please read the [demo app](demo-app/src/main/java/com/sunnychung/lib/android/composabletable/demo/ux/AppView.kt) for a practical usage example.
+Please read the [demo app](demo/multiplatform-app/shared/src/commonMain/kotlin/com/sunnychung/lib/android/composabletable/demo/ux/AppView.kt) for a practical usage example.
+There is a demo app for each platform.
+
+## Migration notes
+Since v1.2.0, Composable Table moves to Maven Central to provide multiplatform support.
+Dependency identifier is changed from `com.github.sunny-chung:composable-table` to
+`io.github.sunny-chung:composable-table`.
+
+Users using old version can stay at v1.1.0 because no other change is introduced. You can upgrade to
+v1.2.0 by changing the dependency identifier and version name to enjoy multiplatform support.
 
 ## Troubleshooting
 

build.gradle.kts

@@ -1,10 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
     val androidGradlePluginVersion = "8.1.0"
-    val kotlinVersion = "1.8.21"
+    val kotlinVersion = "1.9.22"
+    val composeVersion = "1.6.0-beta02"
 
     id("com.android.application") version androidGradlePluginVersion apply false
     id("com.android.library") version androidGradlePluginVersion apply false
     kotlin("android") version kotlinVersion apply false
     kotlin("plugin.serialization") version kotlinVersion apply false
+
+    kotlin("multiplatform") version kotlinVersion apply false
+    id("org.jetbrains.compose") version composeVersion apply false
 }

composable-table/build.gradle.kts

@@ -1,7 +1,51 @@
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
+
 plugins {
+    kotlin("multiplatform")
+    id("org.jetbrains.compose")
     id("com.android.library")
-    kotlin("android")
-    id("maven-publish")
+    id("sunnychung.publication")
+}
+
+group = "io.github.sunny-chung"
+version = "1.2.0"
+
+kotlin {
+    jvm(name = "desktop") {
+        jvmToolchain(17)
+    }
+
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        moduleName = "composable-table"
+        browser()
+    }
+
+    androidTarget {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+        publishLibraryVariants = listOf("release")
+    }
+
+    val iosTargets = listOf(
+        iosArm64(),
+        iosSimulatorArm64(),
+        iosX64(),
+    )
+
+    sourceSets {
+        val desktopMain by getting
+
+        commonMain.dependencies {
+            implementation(compose.runtime)
+            implementation(compose.foundation)
+            implementation(compose.material)
+            implementation(compose.ui)
+        }
+    }
 }
 
 android {
@@ -20,32 +64,10 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
     buildFeatures {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.4.7"
-    }
-}
-
-dependencies {
-    implementation("androidx.compose.ui:ui:${libs.versions.jetpack.compose.get()}")
-    implementation("androidx.compose.foundation:foundation:${libs.versions.jetpack.compose.get()}")
-}
-
-publishing {
-    publications {
-        create<MavenPublication>("maven") {
-            groupId = "com.github.sunny-chung"
-            artifactId = "composable-table"
-            version = "1.1.0"
-
-            afterEvaluate {
-                from(components["release"])
-            }
-        }
+        kotlinCompilerExtensionVersion = "1.5.9"
     }
 }

convention-plugins/build.gradle.kts

@@ -0,0 +1,11 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+kotlin {
+    jvmToolchain(17)
+}