From c66bc36382f4436a49406925b26a6d6adcf4387f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 23 Jun 2023 16:22:38 +0200 Subject: [PATCH] Build: fix some warnings in buildSrc and build.gradle.kts --- buildSrc/prepare-deps/build.gradle.kts | 8 ++++---- compiler/tests-java8/build.gradle.kts | 4 +++- gradle/checkCacheability.gradle.kts | 1 + gradle/report.gradle.kts | 5 +++-- libraries/kotlin-dom-api-compat/build.gradle.kts | 1 + libraries/kotlin.test/js-ir/it/build.gradle.kts | 1 + libraries/reflect/build.gradle.kts | 2 +- .../scripting/dependencies-maven-all/build.gradle.kts | 6 +++--- libraries/tools/kotlin-main-kts/build.gradle.kts | 6 +++--- .../plugin-annotations/build.gradle.kts | 3 ++- prepare/compiler/build.gradle.kts | 6 +++--- .../kotlin-backend-native-for-ide/build.gradle.kts | 6 +++--- repo/scripts/cache-redirector.settings.gradle.kts | 1 + repo/scripts/kotlin-bootstrap.settings.gradle.kts | 4 ++-- 14 files changed, 31 insertions(+), 23 deletions(-) diff --git a/buildSrc/prepare-deps/build.gradle.kts b/buildSrc/prepare-deps/build.gradle.kts index c88acfc72f7..b626b2584c9 100644 --- a/buildSrc/prepare-deps/build.gradle.kts +++ b/buildSrc/prepare-deps/build.gradle.kts @@ -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") { diff --git a/compiler/tests-java8/build.gradle.kts b/compiler/tests-java8/build.gradle.kts index 7cf9bb3aafd..3f2ac0e2934 100644 --- a/compiler/tests-java8/build.gradle.kts +++ b/compiler/tests-java8/build.gradle.kts @@ -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("downloadJspecifyTests") { - val tmpDirPath = createTempDir().absolutePath + val tmpDirPath = createTempDirectory().toAbsolutePath().toString() doFirst { executable("git") args("clone", "https://github.com/jspecify/jspecify/", tmpDirPath) diff --git a/gradle/checkCacheability.gradle.kts b/gradle/checkCacheability.gradle.kts index fcb1acef476..d9c37779580 100644 --- a/gradle/checkCacheability.gradle.kts +++ b/gradle/checkCacheability.gradle.kts @@ -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) diff --git a/gradle/report.gradle.kts b/gradle/report.gradle.kts index e8539239996..f418a25a2b7 100644 --- a/gradle/report.gradle.kts +++ b/gradle/report.gradle.kts @@ -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) } diff --git a/libraries/kotlin-dom-api-compat/build.gradle.kts b/libraries/kotlin-dom-api-compat/build.gradle.kts index b2302b50d21..17bee3fefe1 100644 --- a/libraries/kotlin-dom-api-compat/build.gradle.kts +++ b/libraries/kotlin-dom-api-compat/build.gradle.kts @@ -10,6 +10,7 @@ val jsStdlibSources = "${projectDir}/../stdlib/js/src" kotlin { js(IR) { + @Suppress("UNUSED_VARIABLE") sourceSets { val main by getting { if (!kotlinBuildProperties.isInIdeaSync) { diff --git a/libraries/kotlin.test/js-ir/it/build.gradle.kts b/libraries/kotlin.test/js-ir/it/build.gradle.kts index 72a8ce57038..8c8d432c7c7 100644 --- a/libraries/kotlin.test/js-ir/it/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/it/build.gradle.kts @@ -53,6 +53,7 @@ val nodeModules by configurations.registering { } val compileTestDevelopmentExecutableKotlinJs = tasks.named("compileTestDevelopmentExecutableKotlinJs") { + @Suppress("DEPRECATION") kotlinOptions.outputFile = buildDir.resolve("compileSync/js/test/testDevelopmentExecutable/kotlin/kotlin-kotlin-test-js-ir-it-test.js").normalize().absolutePath } diff --git a/libraries/reflect/build.gradle.kts b/libraries/reflect/build.gradle.kts index b84098c108f..97a41112c76 100644 --- a/libraries/reflect/build.gradle.kts +++ b/libraries/reflect/build.gradle.kts @@ -176,7 +176,7 @@ val proguard by task { "jre/lib/rt.jar", "../Classes/classes.jar", jdkHome = it.metadata.installationPath.asFile - ) + )!! } ) ) diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts index ccee4e4ea45..7180cba0b4d 100644 --- a/libraries/scripting/dependencies-maven-all/build.gradle.kts +++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts @@ -121,17 +121,17 @@ val proguard by task { "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!! } ) ) diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index 10d7fb16023..9148a71b400 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -98,17 +98,17 @@ val proguard by task { "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!! } ) ) diff --git a/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts b/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts index 236574d9114..cf8d80850ec 100644 --- a/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts +++ b/plugins/fir-plugin-prototype/plugin-annotations/build.gradle.kts @@ -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")) } } diff --git a/prepare/compiler/build.gradle.kts b/prepare/compiler/build.gradle.kts index 035e3abba83..b8d17adaa8d 100644 --- a/prepare/compiler/build.gradle.kts +++ b/prepare/compiler/build.gradle.kts @@ -324,17 +324,17 @@ val proguard by task { "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!! } ) ) diff --git a/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts index 51e1cbf4235..d239cec19f6 100644 --- a/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-backend-native-for-ide/build.gradle.kts @@ -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!! } ) ) diff --git a/repo/scripts/cache-redirector.settings.gradle.kts b/repo/scripts/cache-redirector.settings.gradle.kts index 4e02ecb2c86..2bf5af9ab0b 100644 --- a/repo/scripts/cache-redirector.settings.gradle.kts +++ b/repo/scripts/cache-redirector.settings.gradle.kts @@ -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 Provider.forUseAtConfigurationTimeCompat(): Provider = if (GradleVersion.current() < GradleVersion.version("7.4")) { + @Suppress("DEPRECATION") forUseAtConfigurationTime() } else { this diff --git a/repo/scripts/kotlin-bootstrap.settings.gradle.kts b/repo/scripts/kotlin-bootstrap.settings.gradle.kts index a8767de63cd..2e953a13a25 100644 --- a/repo/scripts/kotlin-bootstrap.settings.gradle.kts +++ b/repo/scripts/kotlin-bootstrap.settings.gradle.kts @@ -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.mapToBoolean(): Provider = map { it?.propValueToBoolean() } +fun Provider.mapToBoolean(): Provider = map { it.propValueToBoolean() } fun RepositoryHandler.addBootstrapRepo( bootstrapRepo: String,