Refactoring Build (#780)

* Refactor build

* Drop JS Gradle plugin

---------

Co-authored-by: hfhbd <[email protected]>

.github/dependabot.yml

@@ -1,14 +1,4 @@
 version: 2
-registries:
-  maven-central:
-    type: maven-repository
-    url: https://repo.maven.apache.org/maven2
-  google:
-    type: maven-repository
-    url: https://dl.google.com/dl/android/maven2
-  gradle:
-    type: maven-repository
-    url: https://plugins.gradle.org/m2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
@@ -24,7 +14,3 @@ updates:
       - "hfhbd"
     open-pull-requests-limit: 25
     rebase-strategy: "disabled"
-    registries:
-      - maven-central
-      - google
-      - gradle

clients/build.gradle.kts

@@ -92,10 +92,3 @@ kotlin {
 android {
     namespace = "app.softwork.composetodo.clients"
 }
-
-tasks {
-    val assembleXCFramework by existing
-    assemble {
-        dependsOn(assembleXCFramework)
-    }
-}

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2048m
 org.gradle.parallel=true
-org.gradle.unsafe.configuration-cache=false
+org.gradle.configuration-cache=true
 org.gradle.unsafe.isolated-projects=false
 org.gradle.configureondemand=true
 

settings.gradle.kts

@@ -27,7 +27,6 @@ gradleEnterprise {
 rootProject.name = "ComposeTodo"
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-// enableFeaturePreview("STABLE_CONFIGURATION_CACHE")
 
 include(":shared")
 

shared/build.gradle.kts

@@ -57,7 +57,5 @@ kotlin {
 }
 
 tasks.withType<KotlinJsCompile>().configureEach {
-    kotlinOptions.freeCompilerArgs += listOf(
-        "-Xklib-enable-signature-clash-checks=false",
-    )
+    kotlinOptions.options.freeCompilerArgs.add("-Xklib-enable-signature-clash-checks=false")
 }

web/build.gradle.kts

@@ -1,5 +1,5 @@
 plugins {
-    kotlin("js")
+    kotlin("multiplatform")
     id("org.jetbrains.compose")
     id("license")
 }
@@ -20,20 +20,26 @@ kotlin {
             }
         }
     }
-}
-
-dependencies {
-    implementation(projects.clients)
 
-    implementation(compose.html.core)
-    implementation(libs.bootstrapCompose)
-    implementation(libs.routingCompose)
+    sourceSets {
+        named("jsMain") {
+            dependencies {
+                implementation(projects.clients)
 
-    implementation(libs.sqldelight.sqljsDriver)
-    implementation(npm("@cashapp/sqldelight-sqljs-worker", "2.0.0"))
-    implementation(npm("@cashapp/sqldelight-sqljs-worker", "2.0.0"))
-    implementation(npm("sql.js", "1.8.0"))
-    implementation(devNpm("copy-webpack-plugin", "9.1.0"))
+                implementation(compose.html.core)
+                implementation(libs.bootstrapCompose)
+                implementation(libs.routingCompose)
 
-    testImplementation(kotlin("test"))
+                implementation(libs.sqldelight.sqljsDriver)
+                implementation(npm("@cashapp/sqldelight-sqljs-worker", "2.0.0"))
+                implementation(npm("sql.js", "1.8.0"))
+                implementation(devNpm("copy-webpack-plugin", "9.1.0"))
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+    }
 }