Build: Fix various warnings in build files

Required for Gradle 7+ #KTI-559

build.gradle.kts

@@ -562,15 +562,15 @@ allprojects {
             println("${project.path} $role classpath:\n  ${joinToString("\n  ") { it.toProjectRootRelativePathOrSelf() }}")
 
         try {
-            javaPluginConvention()
+            javaPluginExtension()
         } catch (_: UnknownDomainObjectException) {
             null
-        }?.let { javaConvention ->
+        }?.let { javaExtension ->
             tasks {
-                register("printCompileClasspath") { doFirst { javaConvention.sourceSets["main"].compileClasspath.printClassPath("compile") } }
+                register("printCompileClasspath") { doFirst { javaExtension.sourceSets["main"].compileClasspath.printClassPath("compile") } }
-                register("printRuntimeClasspath") { doFirst { javaConvention.sourceSets["main"].runtimeClasspath.printClassPath("runtime") } }
+                register("printRuntimeClasspath") { doFirst { javaExtension.sourceSets["main"].runtimeClasspath.printClassPath("runtime") } }
-                register("printTestCompileClasspath") { doFirst { javaConvention.sourceSets["test"].compileClasspath.printClassPath("test compile") } }
+                register("printTestCompileClasspath") { doFirst { javaExtension.sourceSets["test"].compileClasspath.printClassPath("test compile") } }
-                register("printTestRuntimeClasspath") { doFirst { javaConvention.sourceSets["test"].runtimeClasspath.printClassPath("test runtime") } }
+                register("printTestRuntimeClasspath") { doFirst { javaExtension.sourceSets["test"].runtimeClasspath.printClassPath("test runtime") } }
             }
         }
 

buildSrc/src/main/kotlin/CommonUtil.kt

@@ -6,7 +6,7 @@ import org.gradle.api.Project
 import org.gradle.api.Task
 import org.gradle.api.file.CopySourceSpec
 import org.gradle.api.file.SourceDirectorySet
-import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.JavaExec
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetOutput
@@ -70,9 +70,9 @@ fun Project.getBooleanProperty(name: String): Boolean? = this.findProperty(name)
 
 inline fun CopySourceSpec.from(crossinline filesProvider: () -> Any?): CopySourceSpec = from(Callable { filesProvider() })
 
-fun Project.javaPluginConvention(): JavaPluginConvention = the()
+fun Project.javaPluginExtension(): JavaPluginExtension = extensions.getByType()
 
-fun Project.findJavaPluginConvention(): JavaPluginConvention? = convention.findByType() ?: convention.findPlugin()
+fun Project.findJavaPluginExtension(): JavaPluginExtension? = extensions.findByType()
 
 fun JavaExec.pathRelativeToWorkingDir(file: File): String = file.relativeTo(workingDir).invariantSeparatorsPath
 
@@ -83,7 +83,7 @@ fun Task.singleOutputFile(): File = when (this) {
 }
 
 val Project.isConfigurationCacheDisabled
-    get() = (gradle.startParameter as? org.gradle.api.internal.StartParameterInternal)?.isConfigurationCache != true
+    get() = (gradle.startParameter as? org.gradle.api.internal.StartParameterInternal)?.configurationCache?.get() != true
 
 val Project.isIdeaActive
     get() = providers.systemProperty("idea.active").forUseAtConfigurationTime().isPresent

buildSrc/src/main/kotlin/InstrumentJava.kt

@@ -39,7 +39,7 @@ class InstrumentJava(@Transient val javaInstrumentator: Configuration, @Transien
                 javaSourceDirectories.forEach { directory ->
                     "instrumentIdeaExtensions"(
                         "srcdir" to directory,
-                        "destdir" to task.destinationDir,
+                        "destdir" to task.destinationDirectory.asFile.get(),
                         "classpath" to task.classpath.asPath,
                         "includeantruntime" to false,
                         "instrumentNotNull" to true

buildSrc/src/main/kotlin/LibrariesCommon.kt

@@ -34,7 +34,7 @@ fun Project.configureJava9Compilation(
 
         // module-info.java should be in java9 source set by convention
         val java9SourceSet = sourceSets["java9"].java
-        destinationDir = file("${java9SourceSet.outputDir}/META-INF/versions/9")
+        destinationDirectory.set(java9SourceSet.destinationDirectory.asFile.get().resolve("META-INF/versions/9"))
         options.sourcepath = files(java9SourceSet.srcDirs)
         val compileClasspath = configurations["java9CompileClasspath"]
         val moduleFiles = objects.fileCollection().from(moduleOutputs)

buildSrc/src/main/kotlin/SmartJavaExec.kt

@@ -19,7 +19,7 @@ fun Project.smartJavaExec(configure: JavaExec.() -> Unit) = tasks.creating(JavaE
 fun JavaExec.passClasspathInJar() {
     val jarTask = project.task("${name}WriteClassPath", Jar::class) {
         val classpath = classpath
-        val main = main
+        val main = mainClass.get()
         dependsOn(classpath)
         inputs.files(classpath)
         inputs.property("main", main)
@@ -42,7 +42,7 @@ fun JavaExec.passClasspathInJar() {
 
     dependsOn(jarTask)
 
-    main = "-jar"
+    mainClass.set("-jar")
     classpath = project.files()
     args = listOf(jarTask.outputs.files.singleFile.path) + args.orEmpty()
 }

buildSrc/src/main/kotlin/artifacts.kt

@@ -13,7 +13,7 @@ import org.gradle.api.attributes.LibraryElements
 import org.gradle.api.attributes.Usage
 import org.gradle.api.component.AdhocComponentWithVariants
 import org.gradle.api.file.DuplicatesStrategy
-import org.gradle.api.plugins.BasePluginConvention
+import org.gradle.api.plugins.BasePluginExtension
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaPlugin.*
 import org.gradle.api.plugins.JavaPluginExtension
@@ -76,7 +76,7 @@ fun Project.runtimeJar(body: Jar.() -> Unit = {}): TaskProvider<out Jar> {
                 embedded.map(::zipTree)
             }
         }
-        setupPublicJar(project.the<BasePluginConvention>().archivesBaseName)
+        setupPublicJar(project.extensions.getByType<BasePluginExtension>().archivesName.get())
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         body()
     }
@@ -90,7 +90,7 @@ fun Project.runtimeJar(task: TaskProvider<ShadowJar>, body: ShadowJar.() -> Unit
 
     task.configure {
         configurations = configurations + listOf(project.configurations["embedded"])
-        setupPublicJar(project.the<BasePluginConvention>().archivesBaseName)
+        setupPublicJar(project.extensions.getByType<BasePluginExtension>().archivesName.get())
         duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         body()
     }
@@ -108,7 +108,7 @@ fun Project.sourcesJar(body: Jar.() -> Unit = {}): TaskProvider<Jar> {
     }
 
     val sourcesJar = getOrCreateTask<Jar>("sourcesJar") {
-        fun Project.mainJavaPluginSourceSet() = findJavaPluginConvention()?.sourceSets?.findByName("main")
+        fun Project.mainJavaPluginSourceSet() = findJavaPluginExtension()?.sourceSets?.findByName("main")
         fun Project.mainKotlinSourceSet() =
             (extensions.findByName("kotlin") as? KotlinSourceSetContainer)?.sourceSets?.findByName("main")
 

buildSrc/src/main/kotlin/copyright.kt

@@ -6,7 +6,7 @@
 package tasks
 
 import groovy.util.Node
-import groovy.util.XmlParser
+import groovy.xml.XmlParser
 import org.gradle.api.DefaultTask
 import org.gradle.api.file.RegularFileProperty
 import org.gradle.api.provider.Property

buildSrc/src/main/kotlin/sourceSets.kt

@@ -1,5 +1,5 @@
 import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.tasks.SourceSetContainer
 
@@ -36,16 +36,16 @@ val SourceSet.projectDefault: Project.() -> Unit
     }
 
 val Project.sourceSets: SourceSetContainer
-    get() = javaPluginConvention().sourceSets
+    get() = javaPluginExtension().sourceSets
 
 val Project.mainSourceSet: SourceSet
-    get() = javaPluginConvention().mainSourceSet
+    get() = javaPluginExtension().mainSourceSet
 
 val Project.testSourceSet: SourceSet
-    get() = javaPluginConvention().testSourceSet
+    get() = javaPluginExtension().testSourceSet
 
-val JavaPluginConvention.mainSourceSet: SourceSet
+val JavaPluginExtension.mainSourceSet: SourceSet
     get() = sourceSets.getByName("main")
 
-val JavaPluginConvention.testSourceSet: SourceSet
+val JavaPluginExtension.testSourceSet: SourceSet
     get() = sourceSets.getByName("test")

kotlin-native/backend.native/build.gradle

@@ -238,6 +238,7 @@ task trove4jCopy(type: Copy) {
 externalJars.each { arg ->
     def jar = arg.replace('_', '-') // :(
     task("${arg}Copy", type: Copy) {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
         from configurations.getByName("kotlin_${arg}_jar") {
             include "kotlin-${jar}*.jar"
             rename "kotlin-${jar}(.*).jar", "kotlin-${jar}.jar"