starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-04-11 03:06:55 +02:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Bump Gradle to 9.1.0 (#1228)

Browse Source 
* Bump Gradle to 9.1.0
* Bump foojay resolver to 1.0.0
* Fix build logic on windows

Also, remove support for kotlin gradle plugin less than 1.8.x, because:

* Class `org.gradle.api.plugins.Convention` is no longer available in the classpath in Gradle
* Continued support for legacy plugin would require heavy reflection, which is brittle and hard to verify
* Kotlin 1.7 is 3 years old and no longer updated
This commit is contained in:
Daniel Chao
2025-10-08 08:54:43 -07:00
committed by GitHub
parent 55eac2088b
commit cf9d87373d
7 changed files with 8 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/MergeSourcesJars.kt
View File

@@ -70,7 +70,7 @@ open class MergeSourcesJars : DefaultTask() {
val details = this
if (details.isDirectory) return@visit
var path = details.relativePath.parent.pathString
var path = details.relativePath.parent!!.pathString
val relocatedPath = relocatedPaths.keys.find { path.startsWith(it) }
if (relocatedPath != null) {
path = path.replace(relocatedPath, relocatedPaths.getValue(relocatedPath))
@@ -101,7 +101,7 @@ open class MergeSourcesJars : DefaultTask() {
project.zipTree(jar).visit {
val details = this
if (details.isDirectory) return@visit // avoid adding empty dirs
result.add(details.relativePath.parent.pathString)
result.add(details.relativePath.parent!!.pathString)
}
}
return result

2
buildSrc/src/main/kotlin/pklAllProjects.gradle.kts
View File

@@ -81,7 +81,7 @@ plugins.withType(MavenPublishPlugin::class).configureEach {
repositories {
maven {
name = "projectLocal" // affects task names
url = uri("file:///$rootDir/build/m2")
url = rootDir.resolve("build/m2").toURI()
}
}
// use resolved/locked (e.g., `1.15`)