kscience/gradle-tools
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

correct dev repository.

Browse Source
This commit is contained in:
Alexander Nozik 2019-07-21 13:31:11 +03:00
parent 91d0bd9d2e
commit 1a98759c2b
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/kotlin/scientifik/ScientifikMPPlugin.kt
View File

@ -19,7 +19,6 @@ open class ScientifikMPPlugin : Plugin<Project> {
maven("https://dl.bintray.com/kotlin/kotlin-eap") maven("https://dl.bintray.com/kotlin/kotlin-eap")
maven("https://kotlin.bintray.com/kotlinx") maven("https://kotlin.bintray.com/kotlinx")
maven("https://dl.bintray.com/mipt-npm/dev") maven("https://dl.bintray.com/mipt-npm/dev")
maven("https://dl.bintray.com/mipt-npm/scientifik")
} }
project.configure<KotlinMultiplatformExtension> { project.configure<KotlinMultiplatformExtension> {
@ -31,14 +30,8 @@ open class ScientifikMPPlugin : Plugin<Project> {
} }
} }
js { js{
compilations.all { browser{}
kotlinOptions {
sourceMap = true
sourceMapEmbedSources = "always"
moduleKind = "umd"
}
}
} }
if (extension.native) { if (extension.native) {

11
src/main/kotlin/scientifik/ScientifikPublishPlugin.kt
View File

@ -28,7 +28,7 @@ private val Project.bintrayRepo: String?
?: (findProperty("bintrayRepo") as? String) ?: (findProperty("bintrayRepo") as? String)
private val Project.githubProject: String? private val Project.githubProject: String?
get() = extensions.findByType<ScientifikExtension>()?.vcs get() = extensions.findByType<ScientifikExtension>()?.githubProject
?: parent?.githubProject ?: parent?.githubProject
?: (findProperty("githubProject") as? String) ?: (findProperty("githubProject") as? String)
@ -51,7 +51,12 @@ open class ScientifikPublishPlugin : Plugin<Project> {
project.plugins.apply("org.jetbrains.dokka") project.plugins.apply("org.jetbrains.dokka")
} }
val bintrayRepo = project.bintrayRepo val bintrayRepo = if (project.version.toString().contains("dev")) {
"dev"
} else {
project.bintrayRepo
}
val vcs = project.vcs val vcs = project.vcs
if (vcs == null) { if (vcs == null) {
@ -257,7 +262,7 @@ open class ScientifikPublishPlugin : Plugin<Project> {
// this is a problem of this plugin // this is a problem of this plugin
pkg.apply { pkg.apply {
userOrg = "mipt-npm" userOrg = "mipt-npm"
repo = if (project.version.toString().contains("dev")) "dev" else bintrayRepo repo = bintrayRepo
name = project.name name = project.name
issueTrackerUrl = "$vcs/issues" issueTrackerUrl = "$vcs/issues"
setLicenses("Apache-2.0") setLicenses("Apache-2.0")