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

Update for sqldelight 2.0.2 and Kotlin 2.0.x #9

Merged
merged 1 commit into from
Jun 30, 2024
Merged

Update for sqldelight 2.0.2 and Kotlin 2.0.x #9

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
23 changes: 17 additions & 6 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import io.gitlab.arturbosch.detekt.Detekt
import kotlinx.kover.gradle.plugin.dsl.KoverReportExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension
import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
import java.util.*
import javax.xml.catalog.CatalogFeatures.defaults

plugins {
val kotlinVersion = "1.9.20-Beta"
val kotlinVersion = "2.0.20-Beta1"
kotlin("multiplatform") version kotlinVersion
//id("dev.petuska.npm.publish") version "2.1.1"
id("io.gitlab.arturbosch.detekt").version("1.23.0-RC2")
Expand Down Expand Up @@ -186,9 +188,9 @@ kotlin {



plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
nodeVersion = "18.14.2"
plugins.withType<NodeJsRootPlugin> {
configure<NodeJsRootExtension> {
version = "18.14.2"
}
}

Expand All @@ -209,12 +211,21 @@ kotlin {

// workaround for missing sqlite3 bindings
val bindingsInstall = tasks.register("sqlite3BindingsInstall") {
doFirst {

}
doLast {
val sqlite3moduleDir = buildDir.resolve("js/node_modules/sqlite3")
if (!sqlite3moduleDir.resolve("lib/binding").exists()) {
exec {
workingDir = sqlite3moduleDir
val commandLine = yarn.yarnSetupTaskProvider.get().destination.absolutePath + "/bin/yarn"
val yarnPath="${yarn.yarnSetupTaskProvider.get().destination.absolutePath}/bin"
val nodePath="${kotlinNodeJsExtension.nodeJsSetupTaskProvider.get().destination.absolutePath}/bin"
environment(
"PATH",
System.getenv("PATH") + ":$yarnPath:$nodePath"
)
var commandLine = "$yarnPath/yarn"
commandLine(commandLine)
}
}
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[versions]
kotlin = "1.9.20-Beta"
kotlinCoroutines = "1.6.4"
kotlin = "2.0.20-Beta1"
kotlinCoroutines = "1.9.0-RC"
schemaCrawler = "16.19.2"
stately = "1.2.3"
node-sqlite3 = "5.1.6"
sqldelight = "2.0.0"
sqldelight = "2.0.2"

[libraries]
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
Expand Down
Loading