kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases9 Wiki Activity

Fixed deploy to bintray and dokka configuration

Browse Source
This commit is contained in:
Alexander Nozik 2019-11-01 22:57:53 +03:00
parent 1f03951cff
commit af1e79ddba
3 changed files with 46 additions and 38 deletions

8
src/main/kotlin/scientifik/ScientifikJVMPlugin.kt

@ -17,7 +17,6 @@ open class ScientifikJVMPlugin : Plugin<Project> {
with(project) { with(project) {
plugins.apply("org.jetbrains.kotlin.jvm") plugins.apply("org.jetbrains.kotlin.jvm")
plugins.apply("maven-publish")
repositories.applyRepos() repositories.applyRepos()
@ -49,6 +48,8 @@ open class ScientifikJVMPlugin : Plugin<Project> {
from(sourceSet.kotlin.srcDirs.first()) from(sourceSet.kotlin.srcDirs.first())
} }
pluginManager.withPlugin("maven-publish") {
configure<PublishingExtension> { configure<PublishingExtension> {
publications { publications {
register("jvm", MavenPublication::class) { register("jvm", MavenPublication::class) {
@ -57,7 +58,6 @@ open class ScientifikJVMPlugin : Plugin<Project> {
} }
} }
} }
}
pluginManager.withPlugin("org.jetbrains.dokka") { pluginManager.withPlugin("org.jetbrains.dokka") {
val dokka by tasks.getting(DokkaTask::class) { val dokka by tasks.getting(DokkaTask::class) {
@ -81,6 +81,10 @@ open class ScientifikJVMPlugin : Plugin<Project> {
} }
} }
} }
}
}
} }

2
src/main/kotlin/scientifik/ScientifikMPPlugin.kt

@ -94,6 +94,7 @@ open class ScientifikMPPlugin : Plugin<Project> {
from("$buildDir/javadoc") from("$buildDir/javadoc")
} }
pluginManager.withPlugin("maven-publish") {
configure<PublishingExtension> { configure<PublishingExtension> {
targets.all { targets.all {
@ -105,6 +106,7 @@ open class ScientifikMPPlugin : Plugin<Project> {
} }
} }
} }
}

10
src/main/kotlin/scientifik/ScientifikPublishPlugin.kt

@ -120,7 +120,7 @@ open class ScientifikPublishPlugin : Plugin<Project> {
if (bintrayRepo == null) { if (bintrayRepo == null) {
project.logger.warn("[${project.name}] Bintray repository not defined") project.logger.warn("[${project.name}] Bintray repository not defined")
} else { } else {
project.logger.info("Adding bintray publishing to project [${project.name}]")
project.configure<PublishingExtension> { project.configure<PublishingExtension> {
repositories { repositories {
maven("https://bintray.com/mipt-npm/$bintrayRepo") maven("https://bintray.com/mipt-npm/$bintrayRepo")
@ -143,16 +143,18 @@ open class ScientifikPublishPlugin : Plugin<Project> {
setLicenses("Apache-2.0") setLicenses("Apache-2.0")
vcsUrl = vcs vcsUrl = vcs
version.apply { version.apply {
name = project.version.toString() this.name = project.version.toString()
vcsTag = project.version.toString() this.vcsTag = project.version.toString()
released = java.util.Date().toString() this.released = java.util.Date().toString()
} }
} }
//workaround bintray bug //workaround bintray bug
afterEvaluate {
setPublications(*project.extensions.findByType<PublishingExtension>()!!.publications.names.toTypedArray()) setPublications(*project.extensions.findByType<PublishingExtension>()!!.publications.names.toTypedArray())
} }
} }
} }
} }
} }
}