Use dev version of dokka because we are in 1.4-M2

This commit is contained in:
Ugljesa Jovanovic 2020-06-13 18:16:07 +02:00
parent f24b817bad
commit a3cb4f653a
No known key found for this signature in database
GPG Key ID: 178E6DFCECCB0E0F
8 changed files with 11 additions and 32 deletions

View File

@ -23,6 +23,7 @@ buildscript {
google() google()
maven ("https://kotlin.bintray.com/kotlinx") maven ("https://kotlin.bintray.com/kotlinx")
maven ("https://dl.bintray.com/kotlin/kotlin-eap") maven ("https://dl.bintray.com/kotlin/kotlin-eap")
maven ("https://dl.bintray.com/kotlin/kotlin-dev")
gradlePluginPortal() gradlePluginPortal()
jcenter() jcenter()
} }
@ -30,6 +31,7 @@ buildscript {
dependencies { dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
classpath ("gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.0.0") classpath ("gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:5.0.0")
classpath ("org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokkaPlugin}")
} }
} }
@ -40,7 +42,7 @@ allprojects {
google() google()
maven ("https://kotlin.bintray.com/kotlinx") maven ("https://kotlin.bintray.com/kotlinx")
maven ("https://dl.bintray.com/kotlin/kotlin-eap") maven ("https://dl.bintray.com/kotlin/kotlin-eap")
maven ("https://kotlin.bintray.com/kotlin-dev") maven ("https://dl.bintray.com/kotlin/kotlin-dev")
jcenter() jcenter()
maven { maven {
url = uri("https://oss.sonatype.org/content/repositories/snapshots") url = uri("https://oss.sonatype.org/content/repositories/snapshots")

View File

@ -23,6 +23,7 @@ plugins {
repositories { repositories {
mavenCentral() mavenCentral()
maven ("https://dl.bintray.com/kotlin/kotlin-eap") maven ("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
jcenter() jcenter()
} }

View File

@ -20,7 +20,7 @@ object Versions {
val kotlinSerialization = "0.20.0-1.4-M2" val kotlinSerialization = "0.20.0-1.4-M2"
val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build val atomicfu = "0.14.3-M2-2-SNAPSHOT" //NOTE: my linux arm32 and arm64 build
val nodePlugin = "1.3.0" val nodePlugin = "1.3.0"
val dokkaPlugin = "0.9.18" val dokkaPlugin = "0.11.0-dev-44"
val taskTreePlugin = "1.5" val taskTreePlugin = "1.5"
val kotlinBigNumVersion = "0.1.6-1.4-M2-SNAPSHOT" val kotlinBigNumVersion = "0.1.6-1.4-M2-SNAPSHOT"

View File

@ -24,7 +24,7 @@ plugins {
kotlin(PluginsDeps.multiplatform) kotlin(PluginsDeps.multiplatform)
id (PluginsDeps.mavenPublish) id (PluginsDeps.mavenPublish)
id (PluginsDeps.signing) id (PluginsDeps.signing)
id (PluginsDeps.dokka) version Versions.dokkaPlugin id (PluginsDeps.dokka)
} }
repositories { repositories {
@ -275,16 +275,7 @@ tasks {
} }
dokka { dokka {
println ("Dokka !") println("Dokka !")
impliedPlatforms = mutableListOf("Common")
kotlinTasks {
listOf()
}
sourceRoot {
println ("Common !")
path = "/home/ionspin/Projects/Future/kotlin-multiplatform-crypto/crypto/src/commonMain" //TODO remove static path!
platforms = listOf("Common")
}
} }
if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {

View File

@ -26,7 +26,7 @@ plugins {
id(PluginsDeps.mavenPublish) id(PluginsDeps.mavenPublish)
id(PluginsDeps.signing) id(PluginsDeps.signing)
id(PluginsDeps.node) version Versions.nodePlugin id(PluginsDeps.node) version Versions.nodePlugin
id(PluginsDeps.dokka) version Versions.dokkaPlugin id(PluginsDeps.dokka)
id(PluginsDeps.taskTree) version Versions.taskTreePlugin id(PluginsDeps.taskTree) version Versions.taskTreePlugin
} }
@ -542,6 +542,7 @@ tasks {
} }
dokka { dokka {
println("Dokka !")
} }
if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {
val jvmTest by getting(Test::class) { val jvmTest by getting(Test::class) {

View File

@ -24,7 +24,7 @@ plugins {
id(PluginsDeps.mavenPublish) id(PluginsDeps.mavenPublish)
id(PluginsDeps.signing) id(PluginsDeps.signing)
id(PluginsDeps.node) version Versions.nodePlugin id(PluginsDeps.node) version Versions.nodePlugin
id(PluginsDeps.dokka) version Versions.dokkaPlugin id(PluginsDeps.dokka)
} }
val sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" val sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@ -369,16 +369,6 @@ tasks {
dokka { dokka {
println("Dokka !") println("Dokka !")
impliedPlatforms = mutableListOf("Common")
kotlinTasks {
listOf()
}
sourceRoot {
println("Common !")
path =
"/home/ionspin/Projects/Future/kotlin-multiplatform-crypto/crypto/src/commonMain" //TODO remove static path!
platforms = listOf("Common")
}
} }
if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") { if (getHostOsName() == "linux" && getHostArchitecture() == "x86-64") {

View File

@ -25,7 +25,6 @@ plugins {
id (PluginsDeps.mavenPublish) id (PluginsDeps.mavenPublish)
id (PluginsDeps.signing) id (PluginsDeps.signing)
id (PluginsDeps.node) version Versions.nodePlugin id (PluginsDeps.node) version Versions.nodePlugin
id (PluginsDeps.dokka) version Versions.dokkaPlugin
} }
val sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" val sonatypeStaging = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
@ -279,12 +278,6 @@ kotlin {
tasks { tasks {
create<Jar>("javadocJar") {
dependsOn(dokka)
archiveClassifier.set("javadoc")
from(dokka.get().outputDirectory)
}
if (getHostOsName() == "linux") { if (getHostOsName() == "linux") {

View File

@ -18,6 +18,7 @@
pluginManagement { pluginManagement {
repositories { repositories {
maven("https://dl.bintray.com/kotlin/kotlin-eap") maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://dl.bintray.com/kotlin/kotlin-dev")
mavenCentral() mavenCentral()