Skip to content

Commit 578efd5

Browse files
committed
Update for sqldelight 2.0.2 and Kotlin 2.0.x
1 parent 9592162 commit 578efd5

File tree

2 files changed

+20
-9
lines changed

2 files changed

+20
-9
lines changed

build.gradle.kts

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import io.gitlab.arturbosch.detekt.Detekt
22
import kotlinx.kover.gradle.plugin.dsl.KoverReportExtension
3+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
4+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin
5+
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin.Companion.kotlinNodeJsExtension
36
import org.jetbrains.kotlin.gradle.targets.js.yarn.yarn
47
import java.util.*
5-
import javax.xml.catalog.CatalogFeatures.defaults
68

79
plugins {
8-
val kotlinVersion = "1.9.20-Beta"
10+
val kotlinVersion = "2.0.20-Beta1"
911
kotlin("multiplatform") version kotlinVersion
1012
//id("dev.petuska.npm.publish") version "2.1.1"
1113
id("io.gitlab.arturbosch.detekt").version("1.23.0-RC2")
@@ -186,9 +188,9 @@ kotlin {
186188

187189

188190

189-
plugins.withType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin> {
190-
configure<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension> {
191-
nodeVersion = "18.14.2"
191+
plugins.withType<NodeJsRootPlugin> {
192+
configure<NodeJsRootExtension> {
193+
version = "18.14.2"
192194
}
193195
}
194196

@@ -209,12 +211,21 @@ kotlin {
209211

210212
// workaround for missing sqlite3 bindings
211213
val bindingsInstall = tasks.register("sqlite3BindingsInstall") {
214+
doFirst {
215+
216+
}
212217
doLast {
213218
val sqlite3moduleDir = buildDir.resolve("js/node_modules/sqlite3")
214219
if (!sqlite3moduleDir.resolve("lib/binding").exists()) {
215220
exec {
216221
workingDir = sqlite3moduleDir
217-
val commandLine = yarn.yarnSetupTaskProvider.get().destination.absolutePath + "/bin/yarn"
222+
val yarnPath="${yarn.yarnSetupTaskProvider.get().destination.absolutePath}/bin"
223+
val nodePath="${kotlinNodeJsExtension.nodeJsSetupTaskProvider.get().destination.absolutePath}/bin"
224+
environment(
225+
"PATH",
226+
System.getenv("PATH") + ":$yarnPath:$nodePath"
227+
)
228+
var commandLine = "$yarnPath/yarn"
218229
commandLine(commandLine)
219230
}
220231
}

gradle/libs.versions.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
2-
kotlin = "1.9.20-Beta"
3-
kotlinCoroutines = "1.6.4"
2+
kotlin = "2.0.20-Beta1"
3+
kotlinCoroutines = "1.9.0-RC"
44
schemaCrawler = "16.19.2"
55
stately = "1.2.3"
66
node-sqlite3 = "5.1.6"
7-
sqldelight = "2.0.0"
7+
sqldelight = "2.0.2"
88

99
[libraries]
1010
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }

0 commit comments

Comments
 (0)