From e2b83aecd748a9e43010eff3d05a2d49033420de Mon Sep 17 00:00:00 2001
From: Vyacheslav Gerasimov <vyacheslav.gerasimov@jetbrains.com>
Date: Wed, 17 Jan 2018 15:31:55 +0300
Subject: [PATCH] Fix publishing to Gradle plugin portal

---
 libraries/configureGradleTools.gradle | 52 ++++++++++++++-------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/libraries/configureGradleTools.gradle b/libraries/configureGradleTools.gradle
index d846af312be..0ab7acc678d 100644
--- a/libraries/configureGradleTools.gradle
+++ b/libraries/configureGradleTools.gradle
@@ -2,35 +2,37 @@
 configure([project(':kotlin-gradle-plugin'), project(':kotlin-allopen'), project(':kotlin-noarg')]) { project ->
     apply plugin: 'com.gradle.plugin-publish'
 
-    if (project.hasProperty('publishPluginsVersion')) {
-        configurations.archives.artifacts.all {
-            version = project.getProperty('publishPluginsVersion')
+    afterEvaluate {
+        if (project.hasProperty('publishPluginsVersion')) {
+            configurations.archives.artifacts.all {
+                version = project.getProperty('publishPluginsVersion')
+            }
         }
-    }
 
-    if (project.hasProperty("${project.name}-jar")) {
-        println("Using pre-built artifact for ${project.name}")
-        configurations.archives.artifacts.clear()
+        if (project.hasProperty("${project.name}-jar")) {
+            println("Using pre-built artifact for ${project.name}")
+            configurations.archives.artifacts.clear()
 
-        artifacts {
-            archives(file(project.getProperty("${project.name}-jar"))) {
-                name project.name
+            artifacts {
+                archives(file(project.getProperty("${project.name}-jar"))) {
+                    name project.name
+                }
+            }
+        }
+
+        publishPlugins.doFirst {
+            assert !kotlinVersion.contains('SNAPSHOT')
+        }
+
+        pluginBundle {
+            website = 'https://kotlinlang.org/'
+            vcsUrl = 'https://github.com/JetBrains/kotlin/'
+            description = 'Kotlin plugins for Gradle'
+            tags = ['kotlin']
+
+            mavenCoordinates {
+                groupId = "org.jetbrains.kotlin"
             }
         }
     }
-
-    publishPlugins.doFirst {
-        assert !kotlinVersion.contains('SNAPSHOT')
-    }
-
-    pluginBundle {
-        website = 'https://kotlinlang.org/'
-        vcsUrl = 'https://github.com/JetBrains/kotlin/'
-        description = 'Kotlin plugins for Gradle'
-        tags = ['kotlin']
-
-        mavenCoordinates {
-            groupId = "org.jetbrains.kotlin"
-        }
-    }
 }