From be63f09f8fad292aebc24837a35af1096261b484 Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Wed, 18 Oct 2017 18:13:08 +0300
Subject: [PATCH] Remove some workarounds for extra properties and signing,

use new syntax for maven repo definition.
---
 build.gradle.kts                                |  4 ++--
 buildSrc/build.gradle.kts                       |  8 ++++----
 .../kotlin/plugins/PublishedKotlinModule.kt     | 17 ++++++-----------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0d42ba56c43..56e95577075 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -23,7 +23,7 @@ buildscript {
 
     repositories {
         for (repo in repos) {
-            maven { setUrl(repo) }
+            maven(url = repo)
         }
     }
 
@@ -69,7 +69,7 @@ val scriptRuntimeCfg = configurations.create("scriptRuntime").extendsFrom(script
 
 repositories {
     for (repo in (rootProject.extra["repos"] as List<String>)) {
-        maven { setUrl(repo) }
+        maven(url = repo)
     }
 }
 
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
index 92d323cdc4a..4a3c6669f62 100644
--- a/buildSrc/build.gradle.kts
+++ b/buildSrc/build.gradle.kts
@@ -1,12 +1,12 @@
 
 buildscript {
     val buildSrcKotlinVersion: String by extra(findProperty("buildSrc.kotlin.version")?.toString() ?: embeddedKotlinVersion)
-    extra["buildSrcKotlinRepo"] = findProperty("buildSrc.kotlin.repo")
+    val buildSrcKotlinRepo: String? by extra(findProperty("buildSrc.kotlin.repo") as String?)
     extra["versions.shadow"] = "2.0.1"
 
     repositories {
-        extra["buildSrcKotlinRepo"]?.let {
-            maven { setUrl(it) }
+        buildSrcKotlinRepo?.let {
+            maven(url = it)
         }
     }
 
@@ -31,7 +31,7 @@ plugins {
 
 repositories {
     extra["buildSrcKotlinRepo"]?.let {
-        maven { setUrl(it) }
+        maven(url = it)
     }
     maven(url = "https://dl.bintray.com/kotlin/kotlin-dev") // for dex-method-list
 //    maven { setUrl("https://repo.gradle.org/gradle/libs-releases-local") }
diff --git a/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt b/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
index 8b6a03dff56..2bf5fd8783c 100644
--- a/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
+++ b/buildSrc/src/main/kotlin/plugins/PublishedKotlinModule.kt
@@ -4,7 +4,7 @@ import org.codehaus.groovy.runtime.InvokerHelper
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Dependency
-import org.gradle.api.artifacts.maven.MavenDeployer
+import org.gradle.api.artifacts.maven.MavenDeployment
 import org.gradle.api.artifacts.maven.MavenResolver
 
 import org.gradle.api.plugins.MavenRepositoryHandlerConvention
@@ -100,21 +100,16 @@ open class PublishedKotlinModule : Plugin<Project> {
 
                 var repository: MavenRemoteRepository by Delegates.notNull()
 
-                val signPom = rootProject.extra["signPom"] as groovy.lang.Closure<*>
-
                 repositories {
                     withConvention(MavenRepositoryHandlerConvention::class) {
 
                         mavenDeployer {
-                            signPom.call(project, this as MavenDeployer)
-
                             withGroovyBuilder {
-                                // TODO: Use with kotlin-dsl 0.12+ instead of signPom
-//                                "beforeDeployment" {
-//                                    val signing = project.the<SigningExtension>()
-//                                    if (signing.isRequired)
-//                                        signing.signPom(this as MavenDeployment)
-//                                }
+                                "beforeDeployment" {
+                                    val signing = project.the<SigningExtension>()
+                                    if (signing.isRequired)
+                                        signing.signPom(delegate as MavenDeployment)
+                                }
 
                                 "repository"("url" to repoUrl)!!.also { repository = it as MavenRemoteRepository }.withGroovyBuilder {
                                     if (username != null && password != null) {