From 94c1716899ce4694470b84fcb02e4eca1526689f Mon Sep 17 00:00:00 2001
From: Ilya Matveev <ilya.matveev@jetbrains.com>
Date: Tue, 2 May 2017 14:55:00 +0700
Subject: [PATCH] build: Fix dependency uploading to bintray repo

---
 backend.native/build.gradle      |  1 +
 dependencies/build.gradle        | 15 +++++++++------
 gradle.properties                |  2 +-
 tools/gradle-plugin/build.gradle |  1 +
 tools/helpers/build.gradle       |  1 +
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index 333b49dbb91..2d2be19fa06 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -39,6 +39,7 @@ allprojects {
     repositories {
         maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
         maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
+        //maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
     }
 
     configurations.all {
diff --git a/dependencies/build.gradle b/dependencies/build.gradle
index 9aeb81f7e0e..c551a49f8d5 100644
--- a/dependencies/build.gradle
+++ b/dependencies/build.gradle
@@ -36,6 +36,7 @@ configurations {
 repositories {
     maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
     maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
+    //maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
 }
 
 dependencies {
@@ -53,12 +54,14 @@ task generatePom(type: DefaultTask) {
 
     doLast {
         def xml = new XmlParser().parse(originalPom)
-        def parent = xml.parent // <parent> </parent> section, not the parent node.
-        def groupId = parent.groupId
-        def version = parent.version
-        xml.append(groupId)
-        xml.append(version)
-        xml.remove(parent)
+        def parent = xml.children().find() { it.name().localPart == 'parent' } // <parent> </parent> section, not the parent node.
+        if (parent != null) {
+            def groupId = parent.groupId
+            def version = parent.version
+            xml.append(groupId)
+            xml.append(version)
+            xml.remove(parent)
+        }
         new XmlNodePrinter(new PrintWriter(new FileWriter(newPom))).print(xml)
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 98474275640..f14d54ab772 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,5 +21,5 @@ remoteRoot=konan_tests
 #kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-SNAPSHOT
 # Download artifacts of https://teamcity.jetbrains.com/viewType.html?buildTypeId=bt345
 testDataVersion=1053418:id
-kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170426.212805-507
+kotlinCompilerModule=org.jetbrains.kotlin:kotlin-compiler:1.1-20170427.203056-511
 konanVersion=0.1
diff --git a/tools/gradle-plugin/build.gradle b/tools/gradle-plugin/build.gradle
index e24606335a8..b9d00190efb 100644
--- a/tools/gradle-plugin/build.gradle
+++ b/tools/gradle-plugin/build.gradle
@@ -26,6 +26,7 @@ allprojects {
     repositories {
         maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
         maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
+        //maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
     }
 
     configurations.all {
diff --git a/tools/helpers/build.gradle b/tools/helpers/build.gradle
index c995e0189b9..1e8d9c28339 100644
--- a/tools/helpers/build.gradle
+++ b/tools/helpers/build.gradle
@@ -35,6 +35,7 @@ buildscript {
 repositories {
     maven { url 'http://dl.bintray.com/jetbrains/kotlin-native-dependencies' }
     maven { url 'http://oss.sonatype.org/content/repositories/snapshots' }
+    //maven { url 'http://dl.bintray.com/kotlin/kotlin-dev' }
 }
 
 configurations.all {