Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-remove Kotlin/JS plugin #4613

Merged
merged 1 commit into from
Sep 11, 2023
Merged

Re-remove Kotlin/JS plugin #4613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ buildscript {
plugins {
alias(libs.plugins.grammarKitComposer) apply false
alias(libs.plugins.kotlin.multiplatform) apply false
alias(libs.plugins.kotlin.js) apply false
alias(libs.plugins.kotlin.jvm) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.ksp) apply false
Expand Down
32 changes: 20 additions & 12 deletions drivers/sqljs-driver/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
alias(libs.plugins.kotlin.js)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.dokka)
}

Expand All @@ -13,16 +13,24 @@ kotlin {
}
}
}
}

dependencies {
api projects.runtime
implementation libs.kotlin.coroutines.core
implementation libs.stately.concurrency
sourceSets {
jsMain {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it makes a difference here, but I've been using commonMain for these deps even though there's only one target.

dependencies {
api projects.runtime
implementation libs.kotlin.coroutines.core
implementation libs.stately.concurrency
}
}

testImplementation libs.kotlin.test.js
testImplementation npm('sql.js', libs.versions.sqljs.get())
testImplementation devNpm("copy-webpack-plugin", "9.1.0")
testImplementation libs.kotlin.coroutines.test
testImplementation project(':extensions:async-extensions')
}
jsTest {
dependencies {
implementation libs.kotlin.test.js
implementation npm('sql.js', libs.versions.sqljs.get())
implementation devNpm("copy-webpack-plugin", "9.1.0")
implementation libs.kotlin.coroutines.test
implementation project(':extensions:async-extensions')
}
}
}
}
0 ...pp/cash/sqldelight/driver/sqljs/InitDb.kt → ...pp/cash/sqldelight/driver/sqljs/InitDb.kt
View file
Open in desktop
File renamed without changes.
0 ...sh/sqldelight/driver/sqljs/JsSqlDriver.kt → ...sh/sqldelight/driver/sqljs/JsSqlDriver.kt
View file
Open in desktop
File renamed without changes.
0 ...app/cash/sqldelight/driver/sqljs/SqlJs.kt → ...app/cash/sqldelight/driver/sqljs/SqlJs.kt
View file
Open in desktop
File renamed without changes.
0 .../sqldelight/drivers/sqljs/JsDriverTest.kt → .../sqldelight/drivers/sqljs/JsDriverTest.kt
View file
Open in desktop
File renamed without changes.
0 ...p/sqldelight/drivers/sqljs/JsQueryTest.kt → ...p/sqldelight/drivers/sqljs/JsQueryTest.kt
View file
Open in desktop
File renamed without changes.
0 ...delight/drivers/sqljs/JsTransacterTest.kt → ...delight/drivers/sqljs/JsTransacterTest.kt
View file
Open in desktop
File renamed without changes.
0 ...eup/sqldelight/drivers/sqljs/SqlJsTest.kt → ...eup/sqldelight/drivers/sqljs/SqlJsTest.kt
View file
Open in desktop
File renamed without changes.
30 changes: 19 additions & 11 deletions drivers/web-worker-driver/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
alias(libs.plugins.kotlin.js)
alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.publish)
alias(libs.plugins.dokka)
}
Expand All @@ -14,18 +14,26 @@ kotlin {
}
}
}
}

dependencies {
api projects.runtime
implementation libs.kotlin.coroutines.core
sourceSets {
jsMain {
dependencies {
api projects.runtime
implementation libs.kotlin.coroutines.core
}
}

testImplementation libs.kotlin.test.js
testImplementation npm("sql.js", libs.versions.sqljs.get())
testImplementation npm("@cashapp/sqldelight-sqljs-worker", project(":drivers:web-worker-driver:sqljs").projectDir)
testImplementation devNpm("copy-webpack-plugin", "9.1.0")
testImplementation libs.kotlin.coroutines.test
testImplementation project(":extensions:async-extensions")
jsTest {
dependencies {
implementation libs.kotlin.test.js
implementation npm("sql.js", libs.versions.sqljs.get())
implementation npm("@cashapp/sqldelight-sqljs-worker", project(":drivers:web-worker-driver:sqljs").projectDir)
implementation devNpm("copy-webpack-plugin", "9.1.0")
implementation libs.kotlin.coroutines.test
implementation project(":extensions:async-extensions")
}
}
}
}

apply from: "$rootDir/gradle/gradle-mvn-push.gradle"
Expand Down
0 ...ldelight/driver/worker/WebWorkerDriver.kt → ...ldelight/driver/worker/WebWorkerDriver.kt
View file
Open in desktop
File renamed without changes.
0 ...light/driver/worker/WebWorkerException.kt → ...light/driver/worker/WebWorkerException.kt
View file
Open in desktop
File renamed without changes.
0 ...delight/driver/worker/api/WorkerAction.kt → ...delight/driver/worker/api/WorkerAction.kt
View file
Open in desktop
File renamed without changes.
0 ...elight/driver/worker/api/WorkerRequest.kt → ...elight/driver/worker/api/WorkerRequest.kt
View file
Open in desktop
File renamed without changes.
0 ...light/driver/worker/api/WorkerResponse.kt → ...light/driver/worker/api/WorkerResponse.kt
View file
Open in desktop
File renamed without changes.
0 ...delight/driver/worker/api/WorkerResult.kt → ...delight/driver/worker/api/WorkerResult.kt
View file
Open in desktop
File renamed without changes.
0 ...ght/drivers/worker/WebWorkerDriverTest.kt → ...ght/drivers/worker/WebWorkerDriverTest.kt
View file
Open in desktop
File renamed without changes.
0 ...drivers/worker/WebWorkerTransacterTest.kt → ...drivers/worker/WebWorkerTransacterTest.kt
View file
Open in desktop
File renamed without changes.
0 ...r-driver/src/test/resources/bad.worker.js → ...driver/src/jsTest/resources/bad.worker.js
View file
Open in desktop
File renamed without changes.