diff --git a/src/main/kotlin/scientifik/ScientifikMPPlugin.kt b/src/main/kotlin/scientifik/ScientifikMPPlugin.kt index 6eaa6d2..2da2efb 100644 --- a/src/main/kotlin/scientifik/ScientifikMPPlugin.kt +++ b/src/main/kotlin/scientifik/ScientifikMPPlugin.kt @@ -19,7 +19,6 @@ open class ScientifikMPPlugin : Plugin { maven("https://dl.bintray.com/kotlin/kotlin-eap") maven("https://kotlin.bintray.com/kotlinx") maven("https://dl.bintray.com/mipt-npm/dev") - maven("https://dl.bintray.com/mipt-npm/scientifik") } project.configure { @@ -31,14 +30,8 @@ open class ScientifikMPPlugin : Plugin { } } - js { - compilations.all { - kotlinOptions { - sourceMap = true - sourceMapEmbedSources = "always" - moduleKind = "umd" - } - } + js{ + browser{} } if (extension.native) { diff --git a/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt b/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt index 4d954f4..dca086c 100644 --- a/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt +++ b/src/main/kotlin/scientifik/ScientifikPublishPlugin.kt @@ -28,7 +28,7 @@ private val Project.bintrayRepo: String? ?: (findProperty("bintrayRepo") as? String) private val Project.githubProject: String? - get() = extensions.findByType()?.vcs + get() = extensions.findByType()?.githubProject ?: parent?.githubProject ?: (findProperty("githubProject") as? String) @@ -51,7 +51,12 @@ open class ScientifikPublishPlugin : Plugin { 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 if (vcs == null) { @@ -257,7 +262,7 @@ open class ScientifikPublishPlugin : Plugin { // this is a problem of this plugin pkg.apply { userOrg = "mipt-npm" - repo = if (project.version.toString().contains("dev")) "dev" else bintrayRepo + repo = bintrayRepo name = project.name issueTrackerUrl = "$vcs/issues" setLicenses("Apache-2.0")