build: Fix dependency uploading to bintray repo

This commit is contained in:
Ilya Matveev
2017-05-02 14:55:00 +07:00
committed by ilmat192
parent 654ece0311
commit 94c1716899
5 changed files with 13 additions and 7 deletions
+1
View File
@@ -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 {
+9 -6
View File
@@ -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)
}
}
+1 -1
View File
@@ -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
+1
View File
@@ -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 {
+1
View File
@@ -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 {