From 76c54a8ff3bf1446d417f179e5216ba7e07f02ab Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Sun, 19 Mar 2023 16:10:37 +0100 Subject: [PATCH] Build: Fix usages of apis deprecated in Gradle 8 --- analysis/analysis-api-fir/build.gradle.kts | 2 +- benchmarks/build.gradle.kts | 2 +- compiler/ir/ir.tree/build.gradle.kts | 2 +- compiler/ir/ir.tree/tree-generator/build.gradle.kts | 2 +- kotlin-native/build.gradle | 8 ++++---- libraries/kotlin.test/js/build.gradle | 4 ++-- libraries/reflect/api/build.gradle | 2 +- libraries/stdlib/jvm/build.gradle | 2 +- .../tools/kotlin-annotation-processing/build.gradle.kts | 2 +- native/commonizer/build.gradle.kts | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/analysis/analysis-api-fir/build.gradle.kts b/analysis/analysis-api-fir/build.gradle.kts index ec3e7780e6b..4a1b9ec6ec7 100644 --- a/analysis/analysis-api-fir/build.gradle.kts +++ b/analysis/analysis-api-fir/build.gradle.kts @@ -84,7 +84,7 @@ val generateCode by tasks.registering(NoDebugJavaExec::class) { workingDir = rootDir classpath = generatorClasspath - main = "org.jetbrains.kotlin.analysis.api.fir.generator.MainKt" + mainClass.set("org.jetbrains.kotlin.analysis.api.fir.generator.MainKt") systemProperties["line.separator"] = "\n" } diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts index 516d9988c07..cf112f13f62 100644 --- a/benchmarks/build.gradle.kts +++ b/benchmarks/build.gradle.kts @@ -89,7 +89,7 @@ tasks.register("runBenchmark") { val benchmarkJarPath = "$buildDir/benchmarks/main/jars/benchmarks.jar" args = mutableListOf("-Didea.home.path=$ideaHome", benchmarkJarPath, "-rf", "json", "-rff", resultFilePath) + jmhArgs.split("\\s".toRegex()) - main = "-jar" + mainClass.set("-jar") doLast { if (project.kotlinBuildProperties.isTeamcityBuild) { diff --git a/compiler/ir/ir.tree/build.gradle.kts b/compiler/ir/ir.tree/build.gradle.kts index dbd8857e7c5..c5938b7cfe4 100644 --- a/compiler/ir/ir.tree/build.gradle.kts +++ b/compiler/ir/ir.tree/build.gradle.kts @@ -48,7 +48,7 @@ val generateTree by tasks.registering(NoDebugJavaExec::class) { args(generationRoot) workingDir = rootDir classpath = generatorClasspath - main = "org.jetbrains.kotlin.ir.generator.MainKt" + mainClass.set("org.jetbrains.kotlin.ir.generator.MainKt") systemProperties["line.separator"] = "\n" } diff --git a/compiler/ir/ir.tree/tree-generator/build.gradle.kts b/compiler/ir/ir.tree/tree-generator/build.gradle.kts index 4ec5540073e..0ccd44eca24 100644 --- a/compiler/ir/ir.tree/tree-generator/build.gradle.kts +++ b/compiler/ir/ir.tree/tree-generator/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { } application { - mainClassName = "org.jetbrains.kotlin.ir.generator.MainKt" + mainClass.set("org.jetbrains.kotlin.ir.generator.MainKt") } sourceSets { diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index 6ffb26fb2c6..cc90f0b5f9d 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle @@ -627,14 +627,14 @@ task samples { task samplesZip(type: Zip) task samplesTar(type: Tar) { - extension = 'tar.gz' + archiveExtension = 'tar.gz' compression = Compression.GZIP } configure([samplesZip, samplesTar]) { - baseName "kotlin-native-samples-$kotlinVersion" - destinationDir = projectDir - into(baseName) + archiveBaseName = "kotlin-native-samples-$kotlinVersion" + destinationDirectory = projectDir + into(archiveBaseName) from(file('samples')) { // Process properties files separately. diff --git a/libraries/kotlin.test/js/build.gradle b/libraries/kotlin.test/js/build.gradle index 6ab6fcb3033..7105d9e8358 100644 --- a/libraries/kotlin.test/js/build.gradle +++ b/libraries/kotlin.test/js/build.gradle @@ -44,7 +44,7 @@ jar { } task libraryJarWithoutIr(type: Jar, dependsOn: compileKotlin2Js) { - classifier = null + archiveClassifier.set(null) destinationDirectory = file("$buildDir/lib/dist") from("$buildDir/classes/main") manifestAttributes(manifest, project, 'Test') @@ -69,7 +69,7 @@ task libraryJarWithIr(type: Zip, dependsOn: libraryJarWithoutIr) { jar.dependsOn(libraryJarWithIr) task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' + archiveClassifier.set('sources') from (sourceSets.main.allSource) } diff --git a/libraries/reflect/api/build.gradle b/libraries/reflect/api/build.gradle index 032368f4b6e..dffd3d9579c 100644 --- a/libraries/reflect/api/build.gradle +++ b/libraries/reflect/api/build.gradle @@ -66,7 +66,7 @@ jar { } task java9Jar(type: Jar) { - classifier = "java9" + archiveClassifier.set("java9") if (includeJava9) { from sourceSets.java9.output } diff --git a/libraries/stdlib/jvm/build.gradle b/libraries/stdlib/jvm/build.gradle index 48f44ffc5a2..eaac7109535 100644 --- a/libraries/stdlib/jvm/build.gradle +++ b/libraries/stdlib/jvm/build.gradle @@ -117,7 +117,7 @@ sourcesJar { task distSourcesJar(type: Jar) { dependsOn(sourcesJar, configurations.commonSources) destinationDirectory = file("$buildDir/lib/dist") - classifier = 'sources' + archiveClassifier.set('sources') duplicatesStrategy = DuplicatesStrategy.FAIL from zipTree(sourcesJar.outputs.files.singleFile) diff --git a/libraries/tools/kotlin-annotation-processing/build.gradle.kts b/libraries/tools/kotlin-annotation-processing/build.gradle.kts index fb879305509..0cd6d7e4bc8 100644 --- a/libraries/tools/kotlin-annotation-processing/build.gradle.kts +++ b/libraries/tools/kotlin-annotation-processing/build.gradle.kts @@ -22,7 +22,7 @@ projectTest(parallel = true) { publish() tasks.named("jar").configure { - classifier = "base" + archiveClassifier.set("base") } runtimeJar(rewriteDepsToShadedCompiler( diff --git a/native/commonizer/build.gradle.kts b/native/commonizer/build.gradle.kts index ecf32f9d322..8aa46772fef 100644 --- a/native/commonizer/build.gradle.kts +++ b/native/commonizer/build.gradle.kts @@ -48,7 +48,7 @@ dependencies { val runCommonizer by tasks.registering(JavaExec::class) { classpath(configurations.compileOnly, sourceSets.main.get().runtimeClasspath) - main = "org.jetbrains.kotlin.commonizer.cli.CommonizerCLI" + mainClass.set("org.jetbrains.kotlin.commonizer.cli.CommonizerCLI") } sourceSets {