Skip to content

Commit 020c70d

Browse files
committed
AMEND
1 parent 512fddc commit 020c70d

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.gitignore

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,4 @@
55
target
66
build
77
/local.properties
8-
benchmarks.jar
9-
node_modules
10-
package.json
11-
timezones.json
12-
package-lock.json
8+
benchmarks.jar

timezones/full/build.gradle.kts

+6-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ node {
2323
val tzdbVersion: String by rootProject.properties
2424
version = "$tzdbVersion-spi.$version"
2525

26-
val convertedKtFilesDir = File(project.buildDir, "wasmWasi-full/src/internal/tzData")
26+
val convertedKtFilesDir = File(project.buildDir, "convertedTimesZones-full/src/internal/tzData")
2727
val tzdbDirectory = File(project.projectDir, "tzdb")
2828

2929
val timeTzdbInstall by tasks.creating(NpmTask::class) {
@@ -34,7 +34,9 @@ val timeTzdbInstall by tasks.creating(NpmTask::class) {
3434
}
3535

3636
val tzdbDownloadAndCompile by tasks.creating(NpxTask::class) {
37-
tzdbDirectory.mkdirs()
37+
doFirst {
38+
tzdbDirectory.mkdirs()
39+
}
3840
dependsOn(timeTzdbInstall)
3941
command.set("@tubular/time-tzdb")
4042
args.addAll("-b", "-o", "--large")
@@ -44,7 +46,7 @@ val tzdbDownloadAndCompile by tasks.creating(NpxTask::class) {
4446
args.add(tzdbDirectory.toString())
4547
}
4648

47-
val generateWasmWasiZoneInfo by tasks.registering {
49+
val generateZoneInfo by tasks.registering {
4850
inputs.dir(tzdbDirectory)
4951
outputs.dir(convertedKtFilesDir)
5052
doLast {
@@ -71,7 +73,7 @@ kotlin {
7173
commonMain {
7274
dependencies {
7375
compileOnly(project(":kotlinx-datetime"))
74-
kotlin.srcDir(generateWasmWasiZoneInfo)
76+
kotlin.srcDir(generateZoneInfo)
7577
}
7678
}
7779

0 commit comments

Comments
 (0)