[PR #245] [MERGED] Update to Gradle 8.6 #478

New Issue

2025-12-30T01:24:51+01:00

adam commented

2025-12-30 01:24:51 +01:00

📋 Pull Request Information

Original PR: https://github.com/apple/pkl/pull/245
Author: @odenix
Created: 2/25/2024
Status: ✅ Merged
Merged: 3/16/2024
Merged by: @bioball

Base: main ← Head: gradle-8

📝 Commits (1)

8ee2122 Update to Gradle 8.6

📊 Changes

26 files changed (+175 additions, -144 deletions)

View changed files

📝 build.gradle.kts (+1 -1)
📝 buildSrc/build.gradle.kts (+12 -0)
📝 buildSrc/src/main/kotlin/pklFatJar.gradle.kts (+2 -2)
📝 buildSrc/src/main/kotlin/pklHtmlValidator.gradle.kts (+1 -1)
📝 buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts (+1 -1)
📝 buildSrc/src/main/kotlin/pklPublishLibrary.gradle.kts (+1 -1)
📝 gradle/wrapper/gradle-wrapper.jar (+0 -0)
📝 gradle/wrapper/gradle-wrapper.properties (+5 -1)
📝 gradlew (+28 -13)
📝 gradlew.bat (+19 -16)
📝 pkl-cli/pkl-cli.gradle.kts (+12 -12)
📝 pkl-cli/src/test/kotlin/org/pkl/cli/CliPackageDownloaderTest.kt (+3 -3)
📝 pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt (+2 -2)
📝 pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt (+11 -11)
📝 pkl-commons-test/pkl-commons-test.gradle.kts (+47 -51)
📝 pkl-commons-test/src/main/files/packages/birds@0.5.0/birds@0.5.0.json (+1 -1)
📝 pkl-commons-test/src/main/kotlin/org/pkl/commons/test/PackageServer.kt (+10 -15)
📝 pkl-core/pkl-core.gradle.kts (+2 -2)
📝 pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject.deps.json (+1 -1)
📝 pkl-core/src/test/kotlin/org/pkl/core/packages/PackageResolversTest.kt (+1 -1)

...and 6 more files

📄 Description

This PR/commit builds on top of #227 to start from a stable Gradle 7.5 build.

Fix and clean up the pkl-commons-test build script.
Change tests to read test packages/certs directly from
the file system instead of packaging and reading them
from the class path, which is both slower and more complicated.
Update expected checksums of some test packages.
(Not sure why they changed.)
Work around a conflict between Pkl's and Gradle's
Kotlin libraries in the pkl-gradle project.
Fix build deprecation warnings.
Ensure Gradle distribution integrity with distributionSha256Sum.
Manually verify integrity of Gradle wrapper added by this commit.

Result: gw clean build buildNative succeeds with Gradle 8.6.

Hunting down the remaining build deprecation warnings shown
by --warning-mode all is worthwhile but not urgent.
Most (possibly all) of them are caused by Gradle plugins,
which I decided not to update in this commit.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/apple/pkl/pull/245 **Author:** [@odenix](https://github.com/odenix) **Created:** 2/25/2024 **Status:** ✅ Merged **Merged:** 3/16/2024 **Merged by:** [@bioball](https://github.com/bioball) **Base:** `main` ← **Head:** `gradle-8` --- ### 📝 Commits (1) - [`8ee2122`](https://github.com/apple/pkl/commit/8ee2122770bfe9cabda2e558b4ffa5c4d3ed29af) Update to Gradle 8.6 ### 📊 Changes **26 files changed** (+175 additions, -144 deletions) <details> <summary>View changed files</summary> 📝 `build.gradle.kts` (+1 -1) 📝 `buildSrc/build.gradle.kts` (+12 -0) 📝 `buildSrc/src/main/kotlin/pklFatJar.gradle.kts` (+2 -2) 📝 `buildSrc/src/main/kotlin/pklHtmlValidator.gradle.kts` (+1 -1) 📝 `buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts` (+1 -1) 📝 `buildSrc/src/main/kotlin/pklPublishLibrary.gradle.kts` (+1 -1) 📝 `gradle/wrapper/gradle-wrapper.jar` (+0 -0) 📝 `gradle/wrapper/gradle-wrapper.properties` (+5 -1) 📝 `gradlew` (+28 -13) 📝 `gradlew.bat` (+19 -16) 📝 `pkl-cli/pkl-cli.gradle.kts` (+12 -12) 📝 `pkl-cli/src/test/kotlin/org/pkl/cli/CliPackageDownloaderTest.kt` (+3 -3) 📝 `pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt` (+2 -2) 📝 `pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt` (+11 -11) 📝 `pkl-commons-test/pkl-commons-test.gradle.kts` (+47 -51) 📝 `pkl-commons-test/src/main/files/packages/birds@0.5.0/birds@0.5.0.json` (+1 -1) 📝 `pkl-commons-test/src/main/kotlin/org/pkl/commons/test/PackageServer.kt` (+10 -15) 📝 `pkl-core/pkl-core.gradle.kts` (+2 -2) 📝 `pkl-core/src/test/files/LanguageSnippetTests/input/projects/project4/PklProject.deps.json` (+1 -1) 📝 `pkl-core/src/test/kotlin/org/pkl/core/packages/PackageResolversTest.kt` (+1 -1) _...and 6 more files_ </details> ### 📄 Description This PR/commit builds on top of #227 to start from a stable Gradle 7.5 build. - Fix and clean up the pkl-commons-test build script. - Change tests to read test packages/certs directly from the file system instead of packaging and reading them from the class path, which is both slower and more complicated. - Update expected checksums of some test packages. (Not sure why they changed.) - Work around a conflict between Pkl's and Gradle's Kotlin libraries in the pkl-gradle project. - Fix build deprecation warnings. - Ensure Gradle distribution integrity with `distributionSha256Sum`. - Manually verify integrity of Gradle wrapper added by this commit. Result: `gw clean build buildNative` succeeds with Gradle 8.6. Hunting down the remaining build deprecation warnings shown by `--warning-mode all` is worthwhile but not urgent. Most (possibly all) of them are caused by Gradle plugins, which I decided not to update in this commit. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

adam added the pull-request label 2025-12-30 01:24:51 +01:00

adam closed this issue

2025-12-30 01:24:51 +01:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/pkl#478