From a93c49baf1354b105fe015dbc4a85b5cb1f22fbb Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Wed, 17 May 2023 15:57:56 +0200 Subject: [PATCH] [Build] Fix a bunch of buildscript compilation warnings #KTI-1221 Fixed --- build.gradle.kts | 6 +++--- compiler/fir/fir2ir/build.gradle.kts | 2 +- compiler/ir/ir.psi2ir/build.gradle.kts | 2 +- compiler/ir/serialization.common/build.gradle.kts | 2 +- gradle.properties | 2 -- gradle/jps.gradle.kts | 4 ++-- gradle/report.gradle.kts | 2 +- libraries/kotlin.test/js-ir/build.gradle.kts | 6 +++--- libraries/kotlin.test/js-ir/it/build.gradle.kts | 4 ++-- libraries/kotlin.test/wasm/build.gradle.kts | 6 +++--- libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts | 4 ++-- libraries/stdlib/js-ir/build.gradle.kts | 8 ++++---- libraries/stdlib/wasm/build.gradle.kts | 9 +++++---- libraries/tools/kotlin-gradle-plugin/build.gradle.kts | 2 +- libraries/tools/kotlin-project-model/build.gradle.kts | 2 +- .../kotlin-jps-plugin-classpath/build.gradle.kts | 1 + wasm/wasm.tests/build.gradle.kts | 2 +- 17 files changed, 32 insertions(+), 32 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3fb8d7f91b3..2cdfb6b09e4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -430,7 +430,7 @@ allprojects { val isReflect = requested.name == "kotlin-reflect" || requested.name == "kotlin-reflect-api" // More strict check for "compilerModules". We can't apply this check for all modules because it would force to // exclude kotlin-reflect from transitive dependencies of kotlin-poet, ktor, com.android.tools.build:gradle, etc - if (project.path in (rootProject.extra["compilerModules"] as Array)) { + if (project.path in @Suppress("UNCHECKED_CAST") (rootProject.extra["compilerModules"] as Array)) { val expectedReflectVersion = commonDependencyVersion("org.jetbrains.kotlin", "kotlin-reflect") if (isReflect) { check(requested.version == expectedReflectVersion) { @@ -934,9 +934,9 @@ gradle.taskGraph.whenReady(checkYarnAndNPMSuppressed) plugins.withType(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin::class) { extensions.configure(org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension::class.java) { - npmInstallTaskProvider?.configure { + npmInstallTaskProvider.configure { args += listOf("--network-concurrency", "1", "--mutex", "network") - } ?: error("kotlinNpmInstall task should exist inside NodeJsRootExtension") + } } } diff --git a/compiler/fir/fir2ir/build.gradle.kts b/compiler/fir/fir2ir/build.gradle.kts index 9c2cbfc5b0d..a88bc0e38b6 100644 --- a/compiler/fir/fir2ir/build.gradle.kts +++ b/compiler/fir/fir2ir/build.gradle.kts @@ -59,7 +59,7 @@ sourceSets { } tasks { - val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { + named("compileKotlin") { kotlinOptions { freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" } diff --git a/compiler/ir/ir.psi2ir/build.gradle.kts b/compiler/ir/ir.psi2ir/build.gradle.kts index 36e9ee88a3a..1e4e3342292 100644 --- a/compiler/ir/ir.psi2ir/build.gradle.kts +++ b/compiler/ir/ir.psi2ir/build.gradle.kts @@ -17,7 +17,7 @@ sourceSets { } tasks { - val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { + named("compileKotlin") { kotlinOptions { freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" } diff --git a/compiler/ir/serialization.common/build.gradle.kts b/compiler/ir/serialization.common/build.gradle.kts index 431ca7fad47..eff2f458604 100644 --- a/compiler/ir/serialization.common/build.gradle.kts +++ b/compiler/ir/serialization.common/build.gradle.kts @@ -22,7 +22,7 @@ sourceSets { } tasks { - val compileKotlin by existing(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class) { + named("compileKotlin") { kotlinOptions { freeCompilerArgs += "-opt-in=org.jetbrains.kotlin.ir.ObsoleteDescriptorBasedAPI" } diff --git a/gradle.properties b/gradle.properties index c9988505201..b92886ee3f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,8 +23,6 @@ org.gradle.java.installations.fromEnv=\ systemProp.org.gradle.internal.http.connectionTimeout=90000 systemProp.org.gradle.internal.http.socketTimeout=90000 -# Enable caching for precompiled script accessors: https://github.com/gradle/gradle/issues/20416 -systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true cacheRedirectorEnabled=true defaultSnapshotVersion=1.9.255-SNAPSHOT diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts index a065350b693..f737295a7d8 100644 --- a/gradle/jps.gradle.kts +++ b/gradle/jps.gradle.kts @@ -535,7 +535,7 @@ fun RecursiveArtifact.sourceJarsFromConfiguration(configuration: Configuration, .map { it.id.componentIdentifier } .filterIsInstance() .forEach { - val jarBaseName = project(it.projectPath).the().archivesBaseName + val jarBaseName = project(it.projectPath).the().archivesName.get() val renamed = renamer("$jarBaseName-sources") + ".jar" archive(renamed) { project(it.projectPath) @@ -560,7 +560,7 @@ fun RecursiveArtifact.jarsFromConfiguration(configuration: Configuration, rename .map { it.id.componentIdentifier } .filterIsInstance() .forEach { - val jarBaseName = project(it.projectPath).the().archivesBaseName + val jarBaseName = project(it.projectPath).the().archivesName.get() val artifactName = renamer(jarBaseName) + ".jar" if (it.projectName in jarArtifactProjects) { artifact(artifactName) diff --git a/gradle/report.gradle.kts b/gradle/report.gradle.kts index 146537a921c..e8539239996 100644 --- a/gradle/report.gradle.kts +++ b/gradle/report.gradle.kts @@ -54,7 +54,7 @@ private class BuildTimeReporter( UNCATEGORIZED; private fun String.toTitleCase() = - if (length <= 1) capitalize() else { get(0).toUpperCase() + substring(1).toLowerCase() } + if (length <= 1) capitalize() else { get(0).uppercase() + substring(1).lowercase() } fun description(): String = name.replace("_", " ").toTitleCase() diff --git a/libraries/kotlin.test/js-ir/build.gradle.kts b/libraries/kotlin.test/js-ir/build.gradle.kts index f583b1baa92..5a811e4555b 100644 --- a/libraries/kotlin.test/js-ir/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/build.gradle.kts @@ -28,16 +28,16 @@ kotlin { } sourceSets { - val commonMain by getting { + named("commonMain") { dependencies { api(project(":kotlin-stdlib-js-ir")) } kotlin.srcDir(commonMainSources.get().destinationDir) } - val commonTest by getting { + named("commonTest") { kotlin.srcDir(commonTestSources.get().destinationDir) } - val jsMain by getting { + named("jsMain") { dependencies { api(project(":kotlin-stdlib-js-ir")) } diff --git a/libraries/kotlin.test/js-ir/it/build.gradle.kts b/libraries/kotlin.test/js-ir/it/build.gradle.kts index f701e0aa9a3..0519ace9af4 100644 --- a/libraries/kotlin.test/js-ir/it/build.gradle.kts +++ b/libraries/kotlin.test/js-ir/it/build.gradle.kts @@ -38,7 +38,7 @@ kotlin { } sourceSets { - val test by getting { + named("test") { kotlin.srcDir(jsMainSources.get().destinationDir) } } @@ -78,7 +78,7 @@ fun createFrameworkTest(name: String): TaskProvider { return tasks.register("test$name", NpmTask::class.java) { dependsOn(compileTestDevelopmentExecutableKotlinJs, populateNodeModules, "npmInstall") val testName = name - val lowerName = name.toLowerCase() + val lowerName = name.lowercase() val tcOutput = project.file("$buildDir/tc-${lowerName}.log") val stdOutput = "$buildDir/test-${lowerName}.log" val errOutput = "$buildDir/test-${lowerName}.err.log" diff --git a/libraries/kotlin.test/wasm/build.gradle.kts b/libraries/kotlin.test/wasm/build.gradle.kts index fa42886cd12..521624c47ec 100644 --- a/libraries/kotlin.test/wasm/build.gradle.kts +++ b/libraries/kotlin.test/wasm/build.gradle.kts @@ -13,20 +13,20 @@ val commonMainSources by task { } kotlin { + @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class) wasm { nodejs() } - @Suppress("UNUSED_VARIABLE") sourceSets { - val commonMain by getting { + named("commonMain") { dependencies { api(project(":kotlin-stdlib-wasm")) } kotlin.srcDir(commonMainSources.get().destinationDir) } - val wasmMain by getting { + named("wasmMain") { dependencies { api(project(":kotlin-stdlib-wasm")) } diff --git a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts index 80de132e49b..b7605e8e2d4 100644 --- a/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts +++ b/libraries/stdlib/js-ir-minimal-for-test/build.gradle.kts @@ -125,11 +125,11 @@ val jsMainSources by task { kotlin { sourceSets { - val commonMain by getting { + named("commonMain") { kotlin.srcDir(files(commonMainSources.map { it.destinationDir })) kotlin.srcDir(files(commonMainCollectionSources.map { it.destinationDir })) } - val jsMain by getting { + named("jsMain") { kotlin.srcDir(files(jsMainSources.map { it.destinationDir })) } } diff --git a/libraries/stdlib/js-ir/build.gradle.kts b/libraries/stdlib/js-ir/build.gradle.kts index 4fc06f4faf4..2b75ebe8791 100644 --- a/libraries/stdlib/js-ir/build.gradle.kts +++ b/libraries/stdlib/js-ir/build.gradle.kts @@ -113,22 +113,22 @@ val jsTestSources by task { kotlin { sourceSets { - val commonMain by getting { + named("commonMain") { kotlin.srcDir(files(commonMainSources.map { it.destinationDir })) } - val jsMain by getting { + named("jsMain") { kotlin.srcDir(files(jsMainSources.map { it.destinationDir })) kotlin.srcDir("builtins") kotlin.srcDir("runtime") kotlin.srcDir("src") } - val commonTest by getting { + named("commonTest") { dependencies { api(project(":kotlin-test:kotlin-test-js-ir")) } kotlin.srcDir(files(commonTestSources.map { it.destinationDir })) } - val jsTest by getting { + named("jsTest") { dependencies { api(project(":kotlin-test:kotlin-test-js-ir")) } diff --git a/libraries/stdlib/wasm/build.gradle.kts b/libraries/stdlib/wasm/build.gradle.kts index 491d89ad74d..21d4f83a25f 100644 --- a/libraries/stdlib/wasm/build.gradle.kts +++ b/libraries/stdlib/wasm/build.gradle.kts @@ -78,29 +78,30 @@ val commonTestSources by task { D8RootPlugin.apply(rootProject).version = v8Version kotlin { + @OptIn(org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl::class) wasm { d8() } sourceSets { - val wasmMain by getting { + named("wasmMain") { kotlin.srcDirs("builtins", "internal", "runtime", "src", "stubs") kotlin.srcDirs("$rootDir/libraries/stdlib/native-wasm/src") kotlin.srcDirs(files(builtInsSources.map { it.destinationDir })) } - val commonMain by getting { + named("commonMain") { kotlin.srcDirs(files(commonMainSources.map { it.destinationDir })) } - val commonTest by getting { + named("commonTest") { dependencies { api(project(":kotlin-test:kotlin-test-wasm")) } kotlin.srcDir(files(commonTestSources.map { it.destinationDir })) } - val wasmTest by getting { + named("wasmTest") { dependencies { api(project(":kotlin-test:kotlin-test-wasm")) } diff --git a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts index d26aca120ee..cba4119afc5 100644 --- a/libraries/tools/kotlin-gradle-plugin/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin/build.gradle.kts @@ -336,7 +336,7 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) { implementation(project(":kotlin-tooling-metadata")) implementation(project.dependencies.testFixtures(project(":kotlin-gradle-plugin-idea"))) implementation("com.github.gundy:semver4j:0.16.4:nodeps") { - (this as ExternalModuleDependency).exclude(group = "*") + exclude(group = "*") } implementation("org.reflections:reflections:0.10.2") } diff --git a/libraries/tools/kotlin-project-model/build.gradle.kts b/libraries/tools/kotlin-project-model/build.gradle.kts index 2b17db14a9f..bcb38487d95 100644 --- a/libraries/tools/kotlin-project-model/build.gradle.kts +++ b/libraries/tools/kotlin-project-model/build.gradle.kts @@ -1,4 +1,4 @@ -import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompile +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile plugins { kotlin("jvm") diff --git a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts index 05fb66eb97a..82c03e62b19 100644 --- a/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts +++ b/prepare/ide-plugin-dependencies/kotlin-jps-plugin-classpath/build.gradle.kts @@ -4,6 +4,7 @@ idePluginDependency { val embeddedDependencies = rootProject.extra["kotlinJpsPluginEmbeddedDependencies"] as List @Suppress("UNCHECKED_CAST") val mavenDependencies = rootProject.extra["kotlinJpsPluginMavenDependencies"] as List + @Suppress("UNCHECKED_CAST") val mavenDependenciesLibs = rootProject.extra["kotlinJpsPluginMavenDependenciesNonTransitiveLibs"] as List val otherProjects = listOf(":jps:jps-plugin", ":jps:jps-common") diff --git a/wasm/wasm.tests/build.gradle.kts b/wasm/wasm.tests/build.gradle.kts index 62718e6c5a0..cded54174e6 100644 --- a/wasm/wasm.tests/build.gradle.kts +++ b/wasm/wasm.tests/build.gradle.kts @@ -33,7 +33,7 @@ val currentOsType = run { val osArch = when (providers.systemProperty("sun.arch.data.model").get()) { "32" -> OsArch.X86_32 - "64" -> when (providers.systemProperty("os.arch").get().toLowerCase()) { + "64" -> when (providers.systemProperty("os.arch").get().lowercase()) { "aarch64" -> OsArch.ARM64 else -> OsArch.X86_64 }