diff options
-rw-r--r-- | build.gradle | 4 | ||||
-rw-r--r-- | core/build.gradle | 2 | ||||
-rw-r--r-- | dokka-gradle-plugin/build.gradle | 2 | ||||
-rw-r--r-- | gradle.properties | 6 | ||||
-rw-r--r-- | maven-plugin/pom.xml | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/build.gradle b/build.gradle index af41e0fc..790e9dbc 100644 --- a/build.gradle +++ b/build.gradle @@ -39,7 +39,7 @@ bintray { key = System.getenv('BINTRAY_KEY') pkg { - repo = dokka_eap ? 'kotlin-eap' : 'dokka' + repo = dokka_eap.toBoolean() ? 'kotlin-eap' : 'dokka' name = 'dokka' userOrg = 'kotlin' desc = 'Dokka, the Kotlin documentation tool' @@ -52,6 +52,6 @@ bintray { filesSpec { from 'maven-plugin/upload' - into "/kotlin/${dokka_eap ? 'kotlin-eap' : 'dokka'}/dokka/${dokka_version}/org/jetbrains/dokka/dokka-maven-plugin/${dokka_version}" + into "/kotlin/${dokka_eap.toBoolean() ? 'kotlin-eap' : 'dokka'}/dokka/${dokka_version}/org/jetbrains/dokka/dokka-maven-plugin/${dokka_version}" } } diff --git a/core/build.gradle b/core/build.gradle index c35c2cdb..42fa30e1 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -99,7 +99,7 @@ bintray { key = System.getenv('BINTRAY_KEY') pkg { - repo = dokka_eap ? 'kotlin-eap' : 'dokka' + repo = dokka_eap.toBoolean() ? 'kotlin-eap' : 'dokka' name = 'dokka' userOrg = 'kotlin' desc = 'Dokka, the Kotlin documentation tool' diff --git a/dokka-gradle-plugin/build.gradle b/dokka-gradle-plugin/build.gradle index d1d16a57..f603dcc7 100644 --- a/dokka-gradle-plugin/build.gradle +++ b/dokka-gradle-plugin/build.gradle @@ -67,7 +67,7 @@ bintray { key = System.getenv('BINTRAY_KEY') pkg { - repo = dokka_eap ? 'kotlin-eap' : 'dokka' + repo = dokka_eap.toBoolean() ? 'kotlin-eap' : 'dokka' name = 'dokka' userOrg = 'kotlin' desc = 'Dokka, the Kotlin documentation tool' diff --git a/gradle.properties b/gradle.properties index 9bc03980..86fbdbf3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -kotlin_version=1.0.0-rc-1007 -dokka_version=0.9.5 -dokka_eap=true +kotlin_version=1.0.0-rc-1036 +dokka_version=0.9.6 +dokka_eap=false diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index d33c22ce..d6ea1eca 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -2,13 +2,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jetbrains.dokka</groupId> <artifactId>dokka-maven-plugin</artifactId> - <version>0.9.4</version> + <version>0.9.6</version> <packaging>maven-plugin</packaging> <properties> <maven-plugin-anno.version>1.4.1</maven-plugin-anno.version> <maven.version>3.0.5</maven.version> <plexus.version>3.0.22</plexus.version> - <kotlinVersion>1.0.0-rc-1007</kotlinVersion> + <kotlinVersion>1.0.0-rc-1036</kotlinVersion> </properties> <dependencies> <dependency> |