diff --git a/libraries/kotlin.test/jvm/build.gradle b/libraries/kotlin.test/jvm/build.gradle index 5775d0caa55..7b7439a1ca5 100644 --- a/libraries/kotlin.test/jvm/build.gradle +++ b/libraries/kotlin.test/jvm/build.gradle @@ -2,7 +2,9 @@ description = 'Kotlin Test' apply plugin: 'kotlin-platform-jvm' -archivesBaseName = 'kotlin-test' +base { + archivesName = 'kotlin-test' +} JvmToolchain.configureJvmToolchain(project, JdkMajorVersion.JDK_1_8) @@ -32,12 +34,14 @@ RepoArtifacts.sourcesJar(project) RepoArtifacts.javadocJar(project) compileKotlin { - kotlinOptions.freeCompilerArgs = [ - "-Xallow-kotlin-package", - "-opt-in=kotlin.contracts.ExperimentalContracts", - "-opt-in=kotlin.RequiresOptIn", - ] - kotlinOptions.moduleName = project.archivesBaseName + compilerOptions { + freeCompilerArgs = [ + "-Xallow-kotlin-package", + "-opt-in=kotlin.contracts.ExperimentalContracts", + "-opt-in=kotlin.RequiresOptIn", + ] + moduleName = base.archivesName + } } compileTestKotlin { diff --git a/libraries/scripting/dependencies-maven-all/build.gradle.kts b/libraries/scripting/dependencies-maven-all/build.gradle.kts index 498842164a5..3efb8a0f1d6 100644 --- a/libraries/scripting/dependencies-maven-all/build.gradle.kts +++ b/libraries/scripting/dependencies-maven-all/build.gradle.kts @@ -5,7 +5,7 @@ import org.gradle.kotlin.dsl.support.serviceOf description = "Shaded Maven dependencies resolver" -val jarBaseName = property("archivesBaseName") as String +val jarBaseName = the().archivesName val embedded by configurations @@ -123,7 +123,7 @@ val proguard by task { injars(mapOf("filter" to "!META-INF/versions/**,!kotlinx/coroutines/debug/**"), normalizedJar.get().outputs.files) - outjars(layout.buildDirectory.file("libs/$jarBaseName-$version-after-proguard.jar")) + outjars(layout.buildDirectory.file(jarBaseName.map { "libs/$it-$version-after-proguard.jar" })) javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_8)) diff --git a/libraries/tools/kotlin-main-kts/build.gradle.kts b/libraries/tools/kotlin-main-kts/build.gradle.kts index d8be04960ac..0d1227ed506 100644 --- a/libraries/tools/kotlin-main-kts/build.gradle.kts +++ b/libraries/tools/kotlin-main-kts/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("jps-compatible") } -val jarBaseName = property("archivesBaseName") as String +val jarBaseName = the().archivesName val localPackagesToRelocate = listOf( @@ -87,7 +87,7 @@ val proguard by task { injars(mapOf("filter" to "!META-INF/versions/**,!kotlinx/coroutines/debug/**"), relocatedJar.get().outputs.files) - outjars(layout.buildDirectory.file("libs/$jarBaseName-$version-after-proguard.jar")) + outjars(layout.buildDirectory.file(jarBaseName.map { "libs/$it-$version-after-proguard.jar" })) javaLauncher.set(project.getToolchainLauncherFor(JdkMajorVersion.JDK_1_8))