aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Jemerov <yole@jetbrains.com>2015-11-09 13:18:12 +0100
committerDmitry Jemerov <yole@jetbrains.com>2015-11-09 13:18:12 +0100
commite847b51d7bacf3a89e326ea8ab8833a1a293a5ad (patch)
tree832b55ccf4301e3fd9a5a7c11511816203737749
parent057ff293d1244382a875f666108484d564d649fa (diff)
downloaddokka-e847b51d7bacf3a89e326ea8ab8833a1a293a5ad.tar.gz
dokka-e847b51d7bacf3a89e326ea8ab8833a1a293a5ad.tar.bz2
dokka-e847b51d7bacf3a89e326ea8ab8833a1a293a5ad.zip
update org to kotlin; working upload script for Maven plugin
-rw-r--r--build.gradle24
-rw-r--r--dokka-fatjar/build.gradle2
-rw-r--r--dokka-gradle-plugin/build.gradle2
3 files changed, 23 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle
index 7adcb313..10768106 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,6 +13,24 @@ task updatePom << {
pomFile.setText(groovy.xml.XmlUtil.serialize(pom))
}
+task buildMavenPlugin << {
+ def process = "mvn clean package".execute(null, new File("maven-plugin"))
+ process.waitFor()
+ def mvnOutput = process.text
+ def exitValue = process.exitValue()
+ if (exitValue != 0) {
+ throw new IOException("Failed to run Maven command: exit value $exitValue, output $mvnOutput")
+ }
+
+ def uploadDir = new File("maven-plugin/upload")
+ uploadDir.mkdirs()
+ def releaseFileName = "dokka-maven-plugin-${dokka_version}"
+ new File("maven-plugin/target/${releaseFileName}.jar").renameTo(new File(uploadDir, "${releaseFileName}.jar"))
+ new File(uploadDir, "${releaseFileName}.pom").bytes = new File("maven-plugin/pom.xml").bytes
+}
+
+buildMavenPlugin.dependsOn(updatePom)
+
bintray {
user = System.getenv('BINTRAY_USER')
key = System.getenv('BINTRAY_KEY')
@@ -20,7 +38,7 @@ bintray {
pkg {
repo = 'dokka'
name = 'dokka'
- userOrg = 'jetbrains'
+ userOrg = 'kotlin'
desc = 'Dokka, the Kotlin documentation tool'
vcsUrl = 'https://github.com/kotlin/dokka.git'
licenses = ['Apache-2.0']
@@ -30,7 +48,7 @@ bintray {
}
filesSpec {
- from 'maven-plugin/target/dokka-maven-plugin-*.jar'
- into ''
+ from 'maven-plugin/upload'
+ into "/kotlin/dokka/dokka/${dokka_version}/org/jetbrains/dokka/dokka-maven-plugin/${dokka_version}"
}
}
diff --git a/dokka-fatjar/build.gradle b/dokka-fatjar/build.gradle
index 1c5784ec..85dc95f3 100644
--- a/dokka-fatjar/build.gradle
+++ b/dokka-fatjar/build.gradle
@@ -88,7 +88,7 @@ bintray {
pkg {
repo = 'dokka'
name = 'dokka'
- userOrg = 'jetbrains'
+ userOrg = 'kotlin'
desc = 'Dokka, the Kotlin documentation tool'
vcsUrl = 'https://github.com/kotlin/dokka.git'
licenses = ['Apache-2.0']
diff --git a/dokka-gradle-plugin/build.gradle b/dokka-gradle-plugin/build.gradle
index 768079be..53e24bef 100644
--- a/dokka-gradle-plugin/build.gradle
+++ b/dokka-gradle-plugin/build.gradle
@@ -68,7 +68,7 @@ bintray {
pkg {
repo = 'dokka'
name = 'dokka'
- userOrg = 'jetbrains'
+ userOrg = 'kotlin'
desc = 'Dokka, the Kotlin documentation tool'
vcsUrl = 'https://github.com/kotlin/dokka.git'
licenses = ['Apache-2.0']