Build: upgrade gradle to 4.10

buildSrc/build.gradle.kts

@@ -32,12 +32,12 @@ plugins {
 }
 
 gradlePlugin {
-    (plugins) {
-        "pill-configurable" {
+    plugins {
+        register("pill-configurable") {
             id = "pill-configurable"
             implementationClass = "org.jetbrains.kotlin.pill.PillConfigurablePlugin"
         }
-        "jps-compatible" {
+        register("jps-compatible") {
             id = "jps-compatible"
             implementationClass = "org.jetbrains.kotlin.pill.JpsCompatiblePlugin"
         }

buildSrc/src/main/kotlin/artifacts.kt

@@ -8,7 +8,6 @@ import org.gradle.api.file.DuplicatesStrategy
 import org.gradle.api.file.FileCollection
 import org.gradle.api.internal.artifacts.publish.ArchivePublishArtifact
 import org.gradle.api.plugins.BasePluginConvention
-import org.gradle.api.plugins.JavaPluginConvention
 import org.gradle.api.tasks.javadoc.Javadoc
 import org.gradle.jvm.tasks.Jar
 import java.io.File
@@ -65,7 +64,7 @@ fun Project.noDefaultJar() {
     }
 }
 
-fun<T> Project.runtimeJarArtifactBy(task: Task, artifactRef: T, body: ConfigurablePublishArtifact.() -> Unit = {}) {
+fun Project.runtimeJarArtifactBy(task: Task, artifactRef: Any, body: ConfigurablePublishArtifact.() -> Unit = {}) {
     addArtifact("archives", task, artifactRef, body)
     addArtifact("runtimeJar", task, artifactRef, body)
     configurations.findByName("runtime")?.let {
@@ -80,17 +79,17 @@ fun<T: Jar> Project.runtimeJar(task: T, body: T.() -> Unit = {}): T {
     }
     return task.apply {
         setupPublicJar(project.the<BasePluginConvention>().archivesBaseName)
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
         body()
         project.runtimeJarArtifactBy(this, this)
     }
 }
 
-fun Project.runtimeJar(taskName: String = "jar", body: Jar.() -> Unit = {}): Jar = runtimeJar(getOrCreateTask(taskName, body))
+fun Project.runtimeJar(body: Jar.() -> Unit = {}): Jar = runtimeJar(getOrCreateTask("jar", body), { })
 
 fun Project.sourcesJar(sourceSet: String? = "main", body: Jar.() -> Unit = {}): Jar =
         getOrCreateTask("sourcesJar") {
-            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
             classifier = "sources"
             try {
                 if (sourceSet != null) {
@@ -107,7 +106,7 @@ fun Project.sourcesJar(sourceSet: String? = "main", body: Jar.() -> Unit = {}):
 
 fun Project.javadocJar(body: Jar.() -> Unit = {}): Jar =
         getOrCreateTask("javadocJar") {
-            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
             classifier = "javadoc"
             tasks.findByName("javadoc")?.let{ it as Javadoc }?.takeIf { it.enabled }?.let {
                 dependsOn(it)
@@ -202,14 +201,14 @@ fun Jar.setupPublicJar(baseName: String, classifier: String = "") {
 }
 
 
-fun<T> Project.addArtifact(configuration: Configuration, task: Task, artifactRef: T, body: ConfigurablePublishArtifact.() -> Unit = {}) {
+fun Project.addArtifact(configuration: Configuration, task: Task, artifactRef: Any, body: ConfigurablePublishArtifact.() -> Unit = {}) {
     artifacts.add(configuration.name, artifactRef) {
         builtBy(task)
         body()
     }
 }
 
-fun<T> Project.addArtifact(configurationName: String, task: Task, artifactRef: T, body: ConfigurablePublishArtifact.() -> Unit = {}) =
+fun Project.addArtifact(configurationName: String, task: Task, artifactRef: Any, body: ConfigurablePublishArtifact.() -> Unit = {}) =
         addArtifact(configurations.getOrCreate(configurationName), task, artifactRef, body)
 
 fun Project.cleanArtifacts() {

buildSrc/src/main/kotlin/embeddable.kt

@@ -65,7 +65,7 @@ private fun Project.compilerShadowJar(taskName: String, body: ShadowJar.() -> Un
 
     return task<ShadowJar>(taskName) {
         destinationDir = File(buildDir, "libs")
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
         from(compilerJar)
         body()
     }
@@ -97,7 +97,7 @@ fun Project.embeddableCompilerDummyForDependenciesRewriting(taskName: String = "
 
     return task<ShadowJar>(taskName) {
         destinationDir = File(buildDir, "libs")
-        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        setDuplicatesStrategy(DuplicatesStrategy.EXCLUDE)
         from(compilerDummyJar)
         configureEmbeddableCompilerRelocation(withJavaxInject = false)
         body()
@@ -119,7 +119,7 @@ fun Project.rewriteDepsToShadedJar(originalJarTask: Jar, shadowJarTask: Jar, bod
         // which leads to the content of that JAR being excluded as well:
         exclude { it.file == compilerDummyJarFile }
 
-        classifier = null
+        classifier = ""
         body()
     }
 }

buildSrc/src/main/kotlin/instrument.kt

@@ -105,12 +105,12 @@ open class IntelliJInstrumentCodeTask : ConventionTask() {
         get() = project.files(sourceSet!!.allSource.srcDirs.filter { !sourceSet!!.resources.contains(it) && it.exists() })
 
     @get:OutputDirectory
-    var output: File? = null
+    lateinit var output: File
 
     @TaskAction
     fun instrumentClasses() {
         logger.info("input files are: ${originalClassesDirs?.joinToString("; ", transform = { "'${it.name}'${if (it.exists()) "" else " (does not exists)" }"})}")
-        output?.deleteRecursively()
+        output.deleteRecursively()
         copyOriginalClasses()
 
         val classpath = instrumentationClasspath!!

buildSrc/src/main/kotlin/instrument.kt.181

@@ -105,12 +105,12 @@ open class IntelliJInstrumentCodeTask : ConventionTask() {
         get() = project.files(sourceSet!!.allSource.srcDirs.filter { !sourceSet!!.resources.contains(it) && it.exists() })
 
     @get:OutputDirectory
-    var output: File? = null
+    lateinit var output: File
 
     @TaskAction
     fun instrumentClasses() {
         logger.info("input files are: ${originalClassesDirs?.joinToString("; ", transform = { "'${it.name}'${if (it.exists()) "" else " (does not exists)" }"})}")
-        output?.deleteRecursively()
+        output.deleteRecursively()
         copyOriginalClasses()
 
         val classpath = instrumentationClasspath!!

buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt

@@ -108,7 +108,7 @@ open class PublishedKotlinModule : Plugin<Project> {
                 val password: String? by preparePublication.extra
                 val repoUrl: String by preparePublication.extra
 
-                var repository: MavenRemoteRepository by Delegates.notNull()
+                var repository by Delegates.notNull<MavenRemoteRepository>()
 
                 repositories {
                     withConvention(MavenRepositoryHandlerConvention::class) {