Merge pull request #85 from TheChance101/feature/web-dependency

integrate web with aay-chart

Author: yassenRamadan1

chart/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
     kotlin("native.cocoapods")
 }
 group = "io.github.thechance101"
-version = "Beta-0.0.3"
+version = "Beta-0.0.5"
 
 kotlin {
     android {
@@ -21,6 +21,20 @@ kotlin {
     iosArm64()
     iosSimulatorArm64()
 
+    js(IR) {
+        browser {
+            testTask {
+                useKarma {
+                    useChromeHeadless()
+                    webpackConfig.cssSupport {
+                        enabled.set(true)
+                    }
+                }
+            }
+        }
+        binaries.executable()
+    }
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -52,6 +66,7 @@ kotlin {
             iosSimulatorArm64Main.dependsOn(this)
 
         }
+        val jsMain by getting
     }
 }
 
@@ -67,14 +82,4 @@ android {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
-    buildTypes {
-        getByName("release") {
-            isMinifyEnabled = true
-            proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
-        }
-        create("staging") {
-            initWith(getByName("release"))
-            manifestPlaceholders["TheChance101"] = "io.github.thechance101"
-        }
-    }
 }

chart/src/jsMain/kotlin/com/aay/compose/Platform.kt

@@ -0,0 +1,5 @@
+package com.aay.compose
+
+actual fun getPlatformName(): String {
+    return "Web"
+}

desktop/build.gradle.kts

@@ -14,11 +14,30 @@ kotlin {
         jvmToolchain(11)
         withJava()
     }
+
+    val osName = System.getProperty("os.name")
+    val targetOs = when {
+        osName == "Mac OS X" -> "macos"
+        osName.startsWith("Win") -> "windows"
+        osName.startsWith("Linux") -> "linux"
+        else -> error("Unsupported OS: $osName")
+    }
+
+    val targetArch = when (val osArch = System.getProperty("os.arch")) {
+        "x86_64", "amd64" -> "x64"
+        "aarch64" -> "arm64"
+        else -> error("Unsupported arch: $osArch")
+    }
+
+    val version = "0.7.77" // or any more recent version
+    val target = "${targetOs}-${targetArch}"
+
     sourceSets {
         val jvmMain by getting {
             dependencies {
                 implementation(project(":common"))
                 implementation(compose.desktop.currentOs)
+                implementation("org.jetbrains.skiko:skiko-awt-runtime-$target:$version")
             }
         }
         val jvmTest by getting

gradle.properties

@@ -5,4 +5,5 @@ kotlin.version=1.9.0
 agp.version=7.4.1
 compose.version=1.4.3
 org.jetbrains.compose.experimental.uikit.enabled=true
-xcodeproj=./iosApp
+xcodeproj=./iosApp
+org.jetbrains.compose.experimental.jscanvas.enabled=true

settings.gradle.kts

@@ -15,7 +15,7 @@ pluginManagement {
     }
 }
 
-rootProject.name = "AAY-Chart"
+rootProject.name = "AAY-chart"
 
 include(":android", ":desktop", ":common", ":chart")
 includeBuild("convention-plugins")