diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 2208bce2..1338174f 100644 --- a/.github/dependabot.yml +++ b/.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 diff --git a/clients/build.gradle.kts b/clients/build.gradle.kts index 57c4d7f4..91e67385 100644 --- a/clients/build.gradle.kts +++ b/clients/build.gradle.kts @@ -92,10 +92,3 @@ kotlin { android { namespace = "app.softwork.composetodo.clients" } - -tasks { - val assembleXCFramework by existing - assemble { - dependsOn(assembleXCFramework) - } -} diff --git a/gradle.properties b/gradle.properties index 9ca093a7..15a4a6e2 100644 --- a/gradle.properties +++ b/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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 174eae4b..8ef5a1eb 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,6 @@ gradleEnterprise { rootProject.name = "ComposeTodo" enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") -// enableFeaturePreview("STABLE_CONFIGURATION_CACHE") include(":shared") diff --git a/shared/build.gradle.kts b/shared/build.gradle.kts index 982d4df2..aec7f833 100644 --- a/shared/build.gradle.kts +++ b/shared/build.gradle.kts @@ -57,7 +57,5 @@ kotlin { } tasks.withType().configureEach { - kotlinOptions.freeCompilerArgs += listOf( - "-Xklib-enable-signature-clash-checks=false", - ) + kotlinOptions.options.freeCompilerArgs.add("-Xklib-enable-signature-clash-checks=false") } diff --git a/web/build.gradle.kts b/web/build.gradle.kts index a0523f60..072f1f09 100644 --- a/web/build.gradle.kts +++ b/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")) + } + } + } } diff --git a/web/src/main/kotlin/app/softwork/composetodo/Main.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/Main.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/Main.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/Main.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/MainApp.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/MainApp.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/MainApp.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/MainApp.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/Navbar.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/Navbar.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/Navbar.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/Navbar.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/WebContainer.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/WebContainer.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/WebContainer.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/WebContainer.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/login/Login.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/login/Login.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/login/Login.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/login/Login.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/login/Register.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/login/Register.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/login/Register.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/login/Register.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/todos/NewTodo.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/todos/NewTodo.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/todos/NewTodo.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/todos/NewTodo.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/todos/Todo.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todo.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/todos/Todo.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todo.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/todos/Todos.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todos.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/todos/Todos.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/todos/Todos.kt diff --git a/web/src/main/kotlin/app/softwork/composetodo/users/Users.kt b/web/src/jsMain/kotlin/app/softwork/composetodo/users/Users.kt similarity index 100% rename from web/src/main/kotlin/app/softwork/composetodo/users/Users.kt rename to web/src/jsMain/kotlin/app/softwork/composetodo/users/Users.kt diff --git a/web/src/main/resources/index.html b/web/src/jsMain/resources/index.html similarity index 100% rename from web/src/main/resources/index.html rename to web/src/jsMain/resources/index.html