[PR #958] [MERGED] Run spotless Java/Kotlin formatting #828

New Issue

adam · 2025-12-30T01:27:03+01:00

adam commented

2025-12-30 01:27:03 +01:00

📋 Pull Request Information

Original PR: https://github.com/apple/pkl/pull/958
Author: @bioball
Created: 2/15/2025
Status: ✅ Merged
Merged: 2/17/2025
Merged by: @bioball

Base: main ← Head: run-kotlin-formatter

📝 Commits (1)

5f5be46 Run spotless Java/Kotlin formatting

📊 Changes

79 files changed (+679 additions, -682 deletions)

View changed files

📝 buildSrc/src/main/kotlin/MergeSourcesJars.kt (+2 -2)
📝 pkl-cli/src/main/kotlin/org/pkl/cli/CliPackageDownloader.kt (+2 -2)
📝 pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectPackager.kt (+3 -3)
📝 pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectResolver.kt (+4 -4)
📝 pkl-cli/src/main/kotlin/org/pkl/cli/CliRepl.kt (+5 -5)
📝 pkl-cli/src/main/kotlin/org/pkl/cli/CliTestRunner.kt (+2 -2)
📝 pkl-cli/src/main/kotlin/org/pkl/cli/repl/Repl.kt (+2 -2)
📝 pkl-cli/src/test/kotlin/org/pkl/cli/CliImportAnalyzerTest.kt (+2 -2)
📝 pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt (+44 -44)
📝 pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt (+22 -22)
📝 pkl-codegen-java/src/main/kotlin/org/pkl/codegen/java/CliJavaCodeGeneratorOptions.kt (+3 -3)
📝 pkl-codegen-java/src/test/kotlin/org/pkl/codegen/java/CliJavaCodeGeneratorTest.kt (+20 -20)
📝 pkl-codegen-java/src/test/kotlin/org/pkl/codegen/java/InMemoryJavaCompiler.kt (+2 -2)
📝 pkl-codegen-java/src/test/kotlin/org/pkl/codegen/java/JavaCodeGeneratorTest.kt (+42 -42)
📝 pkl-codegen-kotlin/src/main/kotlin/org/pkl/codegen/kotlin/CliKotlinCodeGeneratorOptions.kt (+3 -3)
📝 pkl-codegen-kotlin/src/test/kotlin/org/pkl/codegen/kotlin/CliKotlinCodeGeneratorTest.kt (+17 -17)
📝 pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliException.kt (+3 -3)
📝 pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/OptionExtensions.kt (+3 -3)
📝 pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/ProjectOptions.kt (+4 -4)
📝 pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/TestOptions.kt (+2 -2)

...and 59 more files

📄 Description

When we updated spotless's Java and Kotlin formatter, we changed the underlying formatting rules.
However, due to spotless ratcheting, these formatting changes don't get applied unless a file gets touched in a commit.

To avoid future PRs introducing lines of change that aren't related to the intention of the PR, this is a one-time format of all files.

_{🔄 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/958 **Author:** [@bioball](https://github.com/bioball) **Created:** 2/15/2025 **Status:** ✅ Merged **Merged:** 2/17/2025 **Merged by:** [@bioball](https://github.com/bioball) **Base:** `main` ← **Head:** `run-kotlin-formatter` --- ### 📝 Commits (1) - [`5f5be46`](https://github.com/apple/pkl/commit/5f5be4608952bb402cd313020ce6a2262ce79713) Run spotless Java/Kotlin formatting ### 📊 Changes **79 files changed** (+679 additions, -682 deletions) <details> <summary>View changed files</summary> 📝 `buildSrc/src/main/kotlin/MergeSourcesJars.kt` (+2 -2) 📝 `pkl-cli/src/main/kotlin/org/pkl/cli/CliPackageDownloader.kt` (+2 -2) 📝 `pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectPackager.kt` (+3 -3) 📝 `pkl-cli/src/main/kotlin/org/pkl/cli/CliProjectResolver.kt` (+4 -4) 📝 `pkl-cli/src/main/kotlin/org/pkl/cli/CliRepl.kt` (+5 -5) 📝 `pkl-cli/src/main/kotlin/org/pkl/cli/CliTestRunner.kt` (+2 -2) 📝 `pkl-cli/src/main/kotlin/org/pkl/cli/repl/Repl.kt` (+2 -2) 📝 `pkl-cli/src/test/kotlin/org/pkl/cli/CliImportAnalyzerTest.kt` (+2 -2) 📝 `pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectPackagerTest.kt` (+44 -44) 📝 `pkl-cli/src/test/kotlin/org/pkl/cli/CliProjectResolverTest.kt` (+22 -22) 📝 `pkl-codegen-java/src/main/kotlin/org/pkl/codegen/java/CliJavaCodeGeneratorOptions.kt` (+3 -3) 📝 `pkl-codegen-java/src/test/kotlin/org/pkl/codegen/java/CliJavaCodeGeneratorTest.kt` (+20 -20) 📝 `pkl-codegen-java/src/test/kotlin/org/pkl/codegen/java/InMemoryJavaCompiler.kt` (+2 -2) 📝 `pkl-codegen-java/src/test/kotlin/org/pkl/codegen/java/JavaCodeGeneratorTest.kt` (+42 -42) 📝 `pkl-codegen-kotlin/src/main/kotlin/org/pkl/codegen/kotlin/CliKotlinCodeGeneratorOptions.kt` (+3 -3) 📝 `pkl-codegen-kotlin/src/test/kotlin/org/pkl/codegen/kotlin/CliKotlinCodeGeneratorTest.kt` (+17 -17) 📝 `pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/CliException.kt` (+3 -3) 📝 `pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/OptionExtensions.kt` (+3 -3) 📝 `pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/ProjectOptions.kt` (+4 -4) 📝 `pkl-commons-cli/src/main/kotlin/org/pkl/commons/cli/commands/TestOptions.kt` (+2 -2) _...and 59 more files_ </details> ### 📄 Description When we updated spotless's Java and Kotlin formatter, we changed the underlying formatting rules. However, due to spotless ratcheting, these formatting changes don't get applied unless a file gets touched in a commit. To avoid future PRs introducing lines of change that aren't related to the intention of the PR, this is a one-time format of all files. --- <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:27:03 +01:00

adam closed this issue

2025-12-30 01:27:03 +01:00

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/pkl#828