more build script cleanup

robertfmurdock · Jul 21, 2023 · b906a94 · b906a94
1 parent c1fa550
commit b906a94
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 24 deletions.
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -51,7 +51,6 @@ dependencies {
     cdnLookupConfiguration(
         project(mapOf("path" to ":scripts:cdn-lookup", "configuration" to "cdnLookupConfiguration"))
     )
-    jsMainImplementation(kotlin("stdlib-js"))
     jsMainImplementation(project("components"))
     jsMainImplementation(project(":sdk"))
     jsMainImplementation(project(":libraries:model"))
@@ -112,9 +111,8 @@ dependencies {
     jsTestImplementation("com.zegreatrob.testmints:minassert")
     jsTestImplementation("com.zegreatrob.testmints:minspy")
     jsTestImplementation("com.zegreatrob.testmints:standard")
+    jsTestImplementation("org.jetbrains.kotlin:kotlin-test")
     jsTestImplementation("org.jetbrains.kotlin:kotlin-test-annotations-common")
-    jsTestImplementation("org.jetbrains.kotlin:kotlin-test-common")
-    jsTestImplementation("org.jetbrains.kotlin:kotlin-test-js")
 }
 
 rootProject.apply<TaggerPlugin>()

diff --git a/libraries/action/build.gradle.kts b/libraries/action/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     commonMainImplementation(project(":libraries:logging"))
     commonMainApi("com.zegreatrob.testmints:action")
     commonMainApi("com.zegreatrob.testmints:action-async")
-    commonMainImplementation("org.jetbrains.kotlin:kotlin-stdlib-common")
     commonMainImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     commonMainImplementation("com.benasher44:uuid")
 

diff --git a/libraries/json/build.gradle.kts b/libraries/json/build.gradle.kts
@@ -11,7 +11,6 @@ kotlin {
 
 dependencies {
     commonMainApi(project(":libraries:model"))
-    commonMainImplementation(kotlin("stdlib"))
     commonMainImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     commonMainImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json")
     commonMainImplementation("io.ktor:ktor-client-core")

diff --git a/libraries/model/build.gradle.kts b/libraries/model/build.gradle.kts
@@ -21,6 +21,5 @@ dependencies {
     commonTestImplementation("com.zegreatrob.testmints:minassert")
     "jvmTestImplementation"("org.junit.jupiter:junit-jupiter-api")
     "jvmTestImplementation"("org.junit.jupiter:junit-jupiter-engine")
-    "jsMainApi"(kotlin("stdlib-js"))
     "jsTestImplementation"(kotlin("test-js"))
 }
diff --git a/libraries/repository/compound/build.gradle.kts b/libraries/repository/compound/build.gradle.kts
@@ -22,5 +22,4 @@ dependencies {
     "jvmTestImplementation"("org.junit.jupiter:junit-jupiter-api")
     "jvmTestImplementation"("org.junit.jupiter:junit-jupiter-engine")
     "jsTestImplementation"("com.zegreatrob.testmints:async")
-    "jsMainApi"("org.jetbrains.kotlin:kotlin-stdlib-js")
 }
diff --git a/libraries/repository/core/build.gradle.kts b/libraries/repository/core/build.gradle.kts
@@ -25,6 +25,4 @@ dependencies {
     "jvmTestImplementation"(kotlin("reflect"))
     "jvmTestImplementation"("org.junit.jupiter:junit-jupiter-api")
     "jvmTestImplementation"("org.junit.jupiter:junit-jupiter-engine")
-
-    "jsMainApi"("org.jetbrains.kotlin:kotlin-stdlib-js")
 }
diff --git a/libraries/repository/dynamo/build.gradle.kts b/libraries/repository/dynamo/build.gradle.kts
@@ -32,7 +32,6 @@ dependencies {
     jsMainApi(project(":libraries:repository:core"))
     jsMainApi(project(":libraries:logging"))
     jsMainApi("org.jetbrains.kotlin-wrappers:kotlin-extensions")
-    jsMainImplementation("org.jetbrains.kotlin:kotlin-stdlib-js")
     jsMainImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     jsMainImplementation("com.benasher44:uuid")
     jsMainImplementation("io.github.oshai:kotlin-logging")
@@ -41,12 +40,11 @@ dependencies {
 
     jsTestImplementation(project(":libraries:repository:validation"))
     jsTestImplementation(project(":libraries:stub-model"))
-    jsTestImplementation("com.zegreatrob.testmints:standard")
-    jsTestImplementation("com.zegreatrob.testmints:minassert")
     jsTestImplementation("com.zegreatrob.testmints:async")
-    jsTestImplementation("org.jetbrains.kotlin:kotlin-test-common")
+    jsTestImplementation("com.zegreatrob.testmints:minassert")
+    jsTestImplementation("com.zegreatrob.testmints:standard")
+    jsTestImplementation("org.jetbrains.kotlin:kotlin-test")
     jsTestImplementation("org.jetbrains.kotlin:kotlin-test-annotations-common")
-    jsTestImplementation("org.jetbrains.kotlin:kotlin-test-js")
 }
 
 tasks {

diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts
@@ -33,8 +33,6 @@ dependencies {
     "commonMainImplementation"("io.ktor:ktor-client-logging")
     "commonMainImplementation"("io.ktor:ktor-client-websockets")
     "commonMainImplementation"("io.ktor:ktor-serialization-kotlinx-json")
-    "commonMainImplementation"("org.jetbrains.kotlin:kotlin-stdlib")
-    "commonMainImplementation"("org.jetbrains.kotlin:kotlin-stdlib-common")
     "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-coroutines-core")
     "commonMainImplementation"("org.jetbrains.kotlinx:kotlinx-serialization-json")
 

diff --git a/server/action/build.gradle.kts b/server/action/build.gradle.kts
@@ -23,21 +23,19 @@ dependencies {
     commonMainApi("com.zegreatrob.testmints:action-async")
     commonMainImplementation("com.benasher44:uuid")
     commonMainImplementation("io.github.oshai:kotlin-logging")
-    commonMainImplementation("org.jetbrains.kotlin:kotlin-stdlib-js")
     commonMainImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core")
 
-    commonTestApi(project(":libraries:stub-model"))
-    commonTestApi(project(":libraries:test-action"))
+    commonTestImplementation(project(":libraries:stub-model"))
+    commonTestImplementation(project(":libraries:test-action"))
     commonTestImplementation(project(":libraries:repository:memory"))
     commonTestImplementation("com.zegreatrob.testmints:async")
     commonTestImplementation("com.zegreatrob.testmints:minassert")
     commonTestImplementation("com.zegreatrob.testmints:minspy")
     commonTestImplementation("com.zegreatrob.testmints:standard")
+    commonTestImplementation("org.jetbrains.kotlin:kotlin-test")
     commonTestImplementation("org.jetbrains.kotlin:kotlin-test-annotations-common")
-    commonTestImplementation("org.jetbrains.kotlin:kotlin-test-common")
 
-    "jsTestApi"(project(":libraries:logging"))
-    "jsTestImplementation"("org.jetbrains.kotlin:kotlin-test-js")
+    "jsTestImplementation"(project(":libraries:logging"))
 }
 tasks {
     "formatKotlinJsMain" {
@@ -46,4 +44,4 @@ tasks {
     "lintKotlinJsMain" {
         dependsOn("kspKotlinJs")
     }
-}
+}
diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -27,7 +27,6 @@ dependencies {
     clientConfiguration(
         project(mapOf("path" to ":client", "configuration" to "clientConfiguration"))
     )
-    jsMainImplementation(kotlin("stdlib"))
     jsMainImplementation(project("action"))
     jsMainImplementation(project("secret"))
     jsMainImplementation(project("slack"))