Skip to content

Commit 94c905f

Browse files
authored
Bump Pkl to 0.28.+, Kotlin to 2.1.10 (#100)
Also: improve basePklProject
1 parent 53716cf commit 94c905f

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

build.gradle.kts

-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import groovy.json.JsonSlurper
2-
import org.jetbrains.kotlin.utils.sure
32
import org.pkl.core.Version
43
import org.pkl.gradle.task.BasePklTask
54
import org.pkl.gradle.task.ProjectPackageTask
@@ -8,10 +7,8 @@ import java.net.URI
87
import java.nio.file.Files
98
import java.nio.file.Path
109
import javax.net.ssl.HttpsURLConnection
11-
import kotlin.io.path.absolutePathString
1210
import kotlin.io.path.isDirectory
1311
import kotlin.io.path.name
14-
import kotlin.io.path.pathString
1512
import kotlin.math.ceil
1613
import kotlin.math.log10
1714

gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
2-
pkl = "0.27.+"
3-
kotlin = "1.9.0"
2+
pkl = "0.28.+"
3+
kotlin = "2.1.10"
44
junit = "5.10.0"
55
spotless = "6.25.0"
66

packages/basePklProject.pkl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//===----------------------------------------------------------------------===//
2-
// Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
2+
// Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
33
//
44
// Licensed under the Apache License, Version 2.0 (the "License");
55
// you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import "pkl:reflect"
2222
local myModule = reflect.Module(module)
2323

2424
local packageName: String =
25-
findRootModule(reflect.Module(module))
25+
findRootModule(myModule)
2626
.relativePathTo(module)
2727
.last
2828

@@ -31,7 +31,7 @@ local function findRootModule(mod: reflect.Module): Module =
3131
if (supermodule == null || !supermodule.isAmend) mod.reflectee
3232
else findRootModule(supermodule)
3333

34-
local allTests = import*("**/tests/**.pkl").keys.filter((it) -> !it.contains("tests/fixtures/"))
34+
const local allTests = import*("**/tests/**.pkl").keys.filter((it) -> !it.contains("tests/fixtures/"))
3535

3636
package {
3737
name = packageName

0 commit comments

Comments
 (0)