mirror of
https://github.com/apple/pkl.git
synced 2026-03-27 19:41:18 +01:00
Run spotless formatting (#958)
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 commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
* Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -24,7 +24,7 @@ import org.pkl.core.packages.PackageUri
|
||||
class CliPackageDownloader(
|
||||
baseOptions: CliBaseOptions,
|
||||
private val packageUris: List<PackageUri>,
|
||||
private val noTransitive: Boolean
|
||||
private val noTransitive: Boolean,
|
||||
) : CliCommand(baseOptions) {
|
||||
|
||||
override fun doRun() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
* Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -32,7 +32,7 @@ class CliProjectPackager(
|
||||
private val outputPath: String,
|
||||
private val skipPublishCheck: Boolean,
|
||||
private val consoleWriter: Writer = System.out.writer(),
|
||||
private val errWriter: Writer = System.err.writer()
|
||||
private val errWriter: Writer = System.err.writer(),
|
||||
) : CliProjectCommand(baseOptions, projectDirs) {
|
||||
|
||||
private fun runApiTests(project: Project) {
|
||||
@@ -85,7 +85,7 @@ class CliProjectPackager(
|
||||
securityManager,
|
||||
httpClient,
|
||||
skipPublishCheck,
|
||||
consoleWriter
|
||||
consoleWriter,
|
||||
)
|
||||
.createPackages()
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
* Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -27,7 +27,7 @@ class CliProjectResolver(
|
||||
baseOptions: CliBaseOptions,
|
||||
projectDirs: List<Path>,
|
||||
private val consoleWriter: Writer = System.out.writer(),
|
||||
private val errWriter: Writer = System.err.writer()
|
||||
private val errWriter: Writer = System.err.writer(),
|
||||
) : CliProjectCommand(baseOptions, projectDirs) {
|
||||
override fun doRun() {
|
||||
for (projectFile in normalizedProjectFiles) {
|
||||
@@ -38,10 +38,10 @@ class CliProjectResolver(
|
||||
allowedModules,
|
||||
allowedResources,
|
||||
SecurityManagers.defaultTrustLevels,
|
||||
rootDir
|
||||
rootDir,
|
||||
),
|
||||
httpClient,
|
||||
moduleCacheDir
|
||||
moduleCacheDir,
|
||||
)
|
||||
val dependencies = ProjectDependenciesResolver(project, packageResolver, errWriter).resolve()
|
||||
val depsFile =
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
* Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -34,13 +34,13 @@ internal class CliRepl(private val options: CliEvaluatorOptions) : CliCommand(op
|
||||
allowedModules,
|
||||
allowedResources,
|
||||
SecurityManagers.defaultTrustLevels,
|
||||
rootDir
|
||||
rootDir,
|
||||
),
|
||||
httpClient,
|
||||
Loggers.stdErr(),
|
||||
listOf(
|
||||
ModuleKeyFactories.standardLibrary,
|
||||
ModuleKeyFactories.modulePath(modulePathResolver)
|
||||
ModuleKeyFactories.modulePath(modulePathResolver),
|
||||
) +
|
||||
ModuleKeyFactories.fromServiceProviders() +
|
||||
listOf(
|
||||
@@ -48,7 +48,7 @@ internal class CliRepl(private val options: CliEvaluatorOptions) : CliCommand(op
|
||||
ModuleKeyFactories.http,
|
||||
ModuleKeyFactories.pkg,
|
||||
ModuleKeyFactories.projectpackage,
|
||||
ModuleKeyFactories.genericUrl
|
||||
ModuleKeyFactories.genericUrl,
|
||||
),
|
||||
listOf(
|
||||
ResourceReaders.environmentVariable(),
|
||||
@@ -58,7 +58,7 @@ internal class CliRepl(private val options: CliEvaluatorOptions) : CliCommand(op
|
||||
ResourceReaders.http(),
|
||||
ResourceReaders.https(),
|
||||
ResourceReaders.pkg(),
|
||||
ResourceReaders.projectpackage()
|
||||
ResourceReaders.projectpackage(),
|
||||
),
|
||||
environmentVariables,
|
||||
externalProperties,
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
* Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -31,7 +31,7 @@ constructor(
|
||||
private val options: CliBaseOptions,
|
||||
private val testOptions: CliTestOptions,
|
||||
private val consoleWriter: Writer = System.out.writer(),
|
||||
private val errWriter: Writer = System.err.writer()
|
||||
private val errWriter: Writer = System.err.writer(),
|
||||
) : CliCommand(options) {
|
||||
|
||||
override fun doRun() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright © 2024 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
* Copyright © 2024-2025 Apple Inc. and the Pkl project authors. All rights reserved.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -45,7 +45,7 @@ internal class Repl(workingDir: Path, private val server: ReplServer) {
|
||||
option(Option.DISABLE_EVENT_EXPANSION, true)
|
||||
variable(
|
||||
org.jline.reader.LineReader.HISTORY_FILE,
|
||||
(IoUtils.getPklHomeDir().resolve("repl-history"))
|
||||
(IoUtils.getPklHomeDir().resolve("repl-history")),
|
||||
)
|
||||
}
|
||||
.build()
|
||||
|
||||
Reference in New Issue
Block a user