Run spotless apply

This commit is contained in:
Dan Chao
2024-07-01 09:08:06 -07:00
committed by Daniel Chao
parent 7a9b571f6e
commit 8c1c10528f
127 changed files with 5325 additions and 3450 deletions
+37 -25
View File
@@ -1,3 +1,18 @@
/**
* Copyright © 2024 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.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.nio.charset.StandardCharsets
import java.util.*
@@ -11,11 +26,11 @@ val dummy: SourceSet by sourceSets.creating
val firstPartySourcesJars by configurations.existing
// Note: pkl-tools cannot (easily) contain pkl-config-kotlin
// Note: pkl-tools cannot (easily) contain pkl-config-kotlin
// because pkl-tools ships with a shaded Kotlin stdlib.
dependencies {
// Use scope `api` so that other subprojects
// can declare a normal project dependency on this project,
// Use scope `api` so that other subprojects
// can declare a normal project dependency on this project,
// which is desirable for IntelliJ integration.
// The published fat JAR doesn't declare any dependencies.
api(projects.pklCli)
@@ -24,7 +39,7 @@ dependencies {
api(projects.pklConfigJava)
api(projects.pklCore)
api(projects.pklDoc)
// used by `pklFatJar` plugin (ideally this would be inferred automatically)
firstPartySourcesJars(project(":pkl-cli", "sourcesJar"))
firstPartySourcesJars(project(":pkl-codegen-java", "sourcesJar"))
@@ -36,22 +51,17 @@ dependencies {
// TODO: need to figure out how to properly generate javadoc here.
// For now, we'll include a dummy javadoc jar.
val javadocDummy by tasks.creating(Javadoc::class) {
source = dummy.allJava
}
val javadocDummy by tasks.creating(Javadoc::class) { source = dummy.allJava }
java {
withJavadocJar()
}
java { withJavadocJar() }
val javadocJar by tasks.existing(Jar::class) {
from(javadocDummy.outputs.files)
archiveBaseName.set("pkl-tools-all")
}
val javadocJar by
tasks.existing(Jar::class) {
from(javadocDummy.outputs.files)
archiveBaseName.set("pkl-tools-all")
}
tasks.shadowJar {
archiveBaseName.set("pkl-tools-all")
}
tasks.shadowJar { archiveBaseName.set("pkl-tools-all") }
publishing {
publications {
@@ -59,14 +69,14 @@ publishing {
// don't use `-all` suffix because this is the only JAR we publish
artifactId = "pkl-tools"
// add dummy javadoc jar to publication
artifact(javadocJar.flatMap { it.archiveFile }) {
classifier = "javadoc"
}
artifact(javadocJar.flatMap { it.archiveFile }) { classifier = "javadoc" }
pom {
url.set("https://github.com/apple/pkl/tree/main/pkl-tools")
description.set("Fat Jar containing pkl-cli, pkl-codegen-java, " +
"pkl-codegen-kotlin, pkl-config-java, pkl-core, pkl-doc, " +
"and their shaded third-party dependencies.")
description.set(
"Fat Jar containing pkl-cli, pkl-codegen-java, " +
"pkl-codegen-kotlin, pkl-config-java, pkl-core, pkl-doc, " +
"and their shaded third-party dependencies."
)
name.set(artifactId)
// keep in sync with pklPublishLibrary
licenses {
@@ -104,8 +114,10 @@ publishing {
signing {
// provided as env vars `ORG_GRADLE_PROJECT_signingKey` and `ORG_GRADLE_PROJECT_signingPassword`
// in CI.
val signingKey = (findProperty("signingKey") as String?)
?.let { Base64.getDecoder().decode(it).toString(StandardCharsets.US_ASCII) }
val signingKey =
(findProperty("signingKey") as String?)?.let {
Base64.getDecoder().decode(it).toString(StandardCharsets.US_ASCII)
}
val signingPassword = findProperty("signingPassword") as String?
if (signingKey != null && signingPassword != null) {
useInMemoryPgpKeys(signingKey, signingPassword)