azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: fix some warnings in buildSrc and build.gradle.kts

Browse Source
This commit is contained in:
Alexander Udalov
2023-06-23 16:22:38 +02:00
committed by Space Team
parent 89507c1b82
commit c66bc36382
14 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/prepare-deps/build.gradle.kts
+4 -4
View File
@@ -129,7 +129,7 @@ fun prepareDeps(
) {
val makeIntellijCore = buildIvyRepositoryTask(intellijCore, customDepsOrg, customDepsRepoDir)
val makeIntellijAnnotations = tasks.register("makeIntellijAnnotations${intellij.name.capitalize()}", Copy::class) {
val makeIntellijAnnotations = tasks.register("makeIntellijAnnotations${intellij.name.replaceFirstChar(Char::uppercase)}", Copy::class) {
dependsOn(makeIntellijCore)
val intellijCoreRepo = CleanableStore[repoDir.resolve("intellij-core").absolutePath][intellijVersion].use()
@@ -160,7 +160,7 @@ fun prepareDeps(
}
}
val mergeSources = tasks.create("mergeSources${intellij.name.capitalize()}", Jar::class.java) {
val mergeSources = tasks.create("mergeSources${intellij.name.replaceFirstChar(Char::uppercase)}", Jar::class.java) {
dependsOn(sources)
isPreserveFileTimestamps = false
isReproducibleFileOrder = true
@@ -236,7 +236,7 @@ fun buildIvyRepositoryTask(
fun ResolvedArtifact.moduleDirectory(): File =
storeDirectory()[moduleVersion.id.version].use()
return tasks.register("buildIvyRepositoryFor${configuration.name.capitalize()}") {
return tasks.register("buildIvyRepositoryFor${configuration.name.replaceFirstChar(Char::uppercase)}") {
dependsOn(configuration)
inputs.files(configuration)
@@ -366,7 +366,7 @@ fun writeIvyXml(
element("publications") {
artifactDir.listFiles()
?.filter(::shouldIncludeIntellijJar)
?.sortedBy { it.name.toLowerCase() }
?.sortedBy { it.name.lowercase() }
?.forEach { jarFile ->
val relativeName = jarFile.toRelativeString(baseDir).removeSuffix(".jar")
emptyElement("artifact") {
compiler/tests-java8/build.gradle.kts
+3 -1
View File
@@ -1,3 +1,5 @@
import kotlin.io.path.createTempDirectory
plugins {
kotlin("jvm")
id("jps-compatible")
@@ -26,7 +28,7 @@ val generateTests by generator("org.jetbrains.kotlin.generators.tests.GenerateJa
val generateKotlinUseSiteFromJavaOnesForJspecifyTests by generator("org.jetbrains.kotlin.generators.tests.GenerateKotlinUseSitesFromJavaOnesForJspecifyTestsKt")
task<Exec>("downloadJspecifyTests") {
val tmpDirPath = createTempDir().absolutePath
val tmpDirPath = createTempDirectory().toAbsolutePath().toString()
doFirst {
executable("git")
args("clone", "https://github.com/jspecify/jspecify/", tmpDirPath)
gradle/checkCacheability.gradle.kts
+1
View File
@@ -5,6 +5,7 @@ val checkCacheability = findProperty("kotlin.build.cache.check.enabled") as Stri
val isTeamcityBuild = project.hasProperty("teamcity") || System.getenv("TEAMCITY_VERSION") != null
if (checkCacheability && buildCacheEnabled()) {
@Suppress("DEPRECATION")
gradle.taskGraph.afterTask {
if (isCacheable()) {
if (isTeamcityBuild)
gradle/report.gradle.kts
+3 -2
View File
@@ -4,7 +4,6 @@
*/
import org.gradle.api.Task
import org.gradle.api.execution.TaskExecutionListener
import org.gradle.api.invocation.Gradle
import org.gradle.api.logging.Logger
import org.gradle.api.tasks.TaskState
@@ -19,7 +18,7 @@ private class BuildTimeReporter(
private val javaCompileClass: Class<*>,
private val jarClass: Class<*>,
private val proguardClass: Class<*>
) : TaskExecutionListener {
) : @Suppress("DEPRECATION") org.gradle.api.execution.TaskExecutionListener {
companion object {
fun configure(gradle: Gradle) {
val rootProject = gradle.rootProject
@@ -40,7 +39,9 @@ private class BuildTimeReporter(
jarClass = findClass("org.gradle.jvm.tasks.Jar") ?: return,
proguardClass = findClass("proguard.gradle.ProGuardTask") ?: return
)
@Suppress("DEPRECATION")
gradle.taskGraph.addTaskExecutionListener(reporter)
@Suppress("DEPRECATION")
gradle.buildFinished {
reporter.report(logger)
}
libraries/kotlin-dom-api-compat/build.gradle.kts
+1
View File
@@ -10,6 +10,7 @@ val jsStdlibSources = "${projectDir}/../stdlib/js/src"
kotlin {
js(IR) {
@Suppress("UNUSED_VARIABLE")
sourceSets {
val main by getting {
if (!kotlinBuildProperties.isInIdeaSync) {
libraries/kotlin.test/js-ir/it/build.gradle.kts
+1
View File
@@ -53,6 +53,7 @@ val nodeModules by configurations.registering {
}
val compileTestDevelopmentExecutableKotlinJs = tasks.named<KotlinJsIrLink>("compileTestDevelopmentExecutableKotlinJs") {
@Suppress("DEPRECATION")
kotlinOptions.outputFile = buildDir.resolve("compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js").normalize().absolutePath
}
libraries/reflect/build.gradle.kts
+1 -1
View File
@@ -176,7 +176,7 @@ val proguard by task<CacheableProguardTask> {
"jre/lib/rt.jar",
"../Classes/classes.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
}
)
)
libraries/scripting/dependencies-maven-all/build.gradle.kts
+3 -3
View File
@@ -121,17 +121,17 @@ val proguard by task<CacheableProguardTask> {
"jre/lib/rt.jar",
"../Classes/classes.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
firstFromJavaHomeThatExists(
"jre/lib/jsse.jar",
"../Classes/jsse.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
}
)
)
libraries/tools/kotlin-main-kts/build.gradle.kts
+3 -3
View File
@@ -98,17 +98,17 @@ val proguard by task<CacheableProguardTask> {
"jre/lib/rt.jar",
"../Classes/classes.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
firstFromJavaHomeThatExists(
"jre/lib/jsse.jar",
"../Classes/jsse.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
}
)
)
plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts
+2 -1
View File
@@ -8,6 +8,7 @@ kotlin {
binaries.executable()
}
@Suppress("UNUSED_VARIABLE")
sourceSets {
val commonMain by getting {
dependencies {
@@ -15,7 +16,7 @@ kotlin {
}
}
val jvmMain by getting {
dependencies {1
dependencies {
implementation(kotlin("stdlib-jdk8"))
}
}
prepare/compiler/build.gradle.kts
+3 -3
View File
@@ -324,17 +324,17 @@ val proguard by task<CacheableProguardTask> {
"jre/lib/rt.jar",
"../Classes/classes.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
firstFromJavaHomeThatExists(
"jre/lib/jsse.jar",
"../Classes/jsse.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
}
)
)
prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts
+3 -3
View File
@@ -63,17 +63,17 @@ idePluginDependency {
"jre/lib/rt.jar",
"../Classes/classes.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
firstFromJavaHomeThatExists(
"jre/lib/jsse.jar",
"../Classes/jsse.jar",
jdkHome = it.metadata.installationPath.asFile
)
)!!
},
javaLauncher.map {
org.gradle.internal.jvm.Jvm.forHome(it.metadata.installationPath.asFile).toolsJar
org.gradle.internal.jvm.Jvm.forHome(it.metadata.installationPath.asFile).toolsJar!!
}
)
)
repo/scripts/cache-redirector.settings.gradle.kts
+1
View File
@@ -14,6 +14,7 @@ import org.gradle.util.GradleVersion
// This script is also being used in the Gradle integration tests which runs older Gradle versions
fun <T : Any> Provider<T>.forUseAtConfigurationTimeCompat(): Provider<T> =
if (GradleVersion.current() < GradleVersion.version("7.4")) {
@Suppress("DEPRECATION")
forUseAtConfigurationTime()
} else {
this
repo/scripts/kotlin-bootstrap.settings.gradle.kts
+2 -2
View File
@@ -69,7 +69,7 @@ fun getRootSettings(
}
else -> {
val gradleParent = gradle.parent ?: error("Could not get includedBuild parent build for ${settings.rootDir}!")
getRootSettings(gradle.parent!!.settings, gradle.parent!!)
getRootSettings(gradleParent.settings, gradleParent)
}
}
}
@@ -138,7 +138,7 @@ fun String?.propValueToBoolean(default: Boolean = false): Boolean {
}
}
fun Provider<String>.mapToBoolean(): Provider<Boolean> = map { it?.propValueToBoolean() }
fun Provider<String>.mapToBoolean(): Provider<Boolean> = map { it.propValueToBoolean() }
fun RepositoryHandler.addBootstrapRepo(
bootstrapRepo: String,