Initial commit

mahozad · Feb 11, 2024 · 6836aed · 6836aed
1 parent bb8bf70
commit 6836aed
Show file tree

Hide file tree

Showing 33 changed files with 3,874 additions and 222 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -3,21 +3,27 @@ gradle = "8.6"
 java = "17"
 kotlin = "1.9.22"
 kotlin-compatibility = "0.14.0"
-compose-multiplatform = "1.5.12"
+compose-multiplatform = "1.6.0-beta02"
 agp = "8.2.2" # Android Gradle plugin
 android-minSdk = "21"
 android-compileSdk = "34"
 android-targetSdk = "34"
 androidx-activityCompose = "1.8.2"
 androidx-core-ktx = "1.12.0"
 androidx-appcompat = "1.6.1"
+androidx-compose-ui = "1.6.0"
+skiko = "0.7.92"
 dokka = "1.9.10"
 
 [libraries]
 kotlin-test = { group = "org.jetbrains.kotlin", name = "kotlin-test", version.ref = "kotlin" }
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }
+androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "androidx-compose-ui" }
+androidx-ui-desktop = { group = "androidx.compose.ui", name = "ui-desktop", version.ref = "androidx-compose-ui" }
+androidx-ui-graphics-desktop = { group = "androidx.compose.ui", name = "ui-graphics-desktop", version.ref = "androidx-compose-ui" }
+skiko = { group = "org.jetbrains.skiko", name = "skiko", version.ref = "skiko" }
 
 [plugins]
 compose-multiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" }

diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock
diff --git a/library/build.gradle.kts b/library/build.gradle.kts
@@ -2,6 +2,7 @@ import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurr
 import org.jetbrains.dokka.base.DokkaBase
 import org.jetbrains.dokka.base.DokkaBaseConfiguration
 import org.jetbrains.dokka.gradle.DokkaTask
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 import java.util.*
 
 plugins {
@@ -36,6 +37,11 @@ kotlin {
         browser()
         binaries.executable()
     }
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        browser()
+        binaries.executable()
+    }
     // Building and publishing for iOS target requires a machine running macOS;
     // otherwise, the .klib will not be produced and the compiler warns about that.
     // See https://kotlinlang.org/docs/multiplatform-mobile-understand-project-structure.html#ios-framework
@@ -51,25 +57,35 @@ kotlin {
         }
     }
 
-    // wasmJs { browser() }
     // Native targets:
     // macosX64()
     // macosArm64()
 
     sourceSets {
         commonMain.dependencies {
-            api(compose.foundation)
-            api(compose.material3)
-            api(compose.material)
-            api(compose.runtime)
-            api("org.jetbrains.skiko:skiko:0.7.92")
+            implementation(compose.foundation)
+            implementation(compose.runtime)
+            implementation(compose.ui)
+            @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class)
+            implementation(compose.uiTest)
+            implementation(libs.skiko)
         }
         commonTest.dependencies {
             implementation(libs.kotlin.test)
         }
-        val androidMain by getting {}
+        val androidMain by getting {
+            dependencies {
+                // implementation(libs.androidx.ui.desktop)
+                implementation("androidx.test:core-ktx:1.5.0")
+            }
+        }
         val androidUnitTest by getting {}
-        val desktopMain by getting {}
+        val desktopMain by getting {
+            dependencies {
+                // api(libs.androidx.ui.desktop)
+                // implementation("org.jetbrains.skiko:skiko-awt-runtime-windows-x64:0.7.92")
+            }
+        }
         val desktopTest by getting {
             dependencies {
                 implementation(compose.desktop.uiTestJUnit4)
@@ -79,6 +95,8 @@ kotlin {
         }
         val jsMain by getting {}
         val jsTest by getting {}
+        val wasmJsMain by getting {}
+        val wasmJsTest by getting {}
         val iosX64Main by getting {}
         val iosArm64Main by getting {}
         val iosSimulatorArm64Main by getting {}