Use spotless to format remaining Kotlin files

Also: fix issue where some commented out Kotlin files are invalid.
This commit is contained in:
Dan Chao
2024-06-29 07:36:07 -07:00
committed by Daniel Chao
parent 3659ad8b7a
commit 7a9b571f6e
7 changed files with 118 additions and 68 deletions

View File

@@ -1,5 +1,18 @@
import org.jetbrains.kotlin.config.JvmTarget
/**
* 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.
*/
plugins {
`kotlin-dsl`
}
@@ -7,9 +20,7 @@ plugins {
dependencies {
implementation(libs.downloadTaskPlugin)
implementation(libs.spotlessPlugin)
implementation(libs.kotlinPlugin) {
exclude(module = "kotlin-android-extensions")
}
implementation(libs.kotlinPlugin) { exclude(module = "kotlin-android-extensions") }
implementation(libs.shadowPlugin)
// fix from the Gradle team: makes version catalog symbols available in build scripts
@@ -22,12 +33,4 @@ java {
targetCompatibility = JavaVersion.VERSION_17
}
kotlin {
target {
compilations.configureEach {
kotlinOptions {
jvmTarget = "17"
}
}
}
}
kotlin { target { compilations.configureEach { kotlinOptions { jvmTarget = "17" } } } }