Dev #5

Merged
altavir merged 24 commits from dev into master 2020-12-28 09:44:15 +03:00
4 changed files with 13 additions and 4 deletions
Showing only changes of commit f418a101bf - Show all commits

View File

@ -6,7 +6,7 @@ plugins {
} }
group = "ru.mipt.npm" group = "ru.mipt.npm"
version = "0.7.0" version = "0.7.0-fix"
repositories { repositories {
gradlePluginPortal() gradlePluginPortal()

View File

@ -86,8 +86,8 @@ class KScienceExtension(val project: Project) {
js { js {
binaries.executable() binaries.executable()
} }
(targets.findByName("native") as? KotlinNativeTarget)?.apply { targets.filterIsInstance<KotlinNativeTarget>().forEach {
binaries.executable() it.binaries.executable()
} }
} }
} }

View File

@ -7,8 +7,9 @@ import org.gradle.kotlin.dsl.apply
open class KScienceMPPlugin : Plugin<Project> { open class KScienceMPPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.run { override fun apply(project: Project): Unit = project.run {
if (plugins.findPlugin("org.jetbrains.kotlin.multiplatform") == null) { if (plugins.findPlugin("org.jetbrains.kotlin.multiplatform") == null) {
logger.info("Kotlin multiplatform plugin is not resolved. Adding it automatically")
pluginManager.apply("org.jetbrains.kotlin.multiplatform") pluginManager.apply("org.jetbrains.kotlin.multiplatform")
} else {
logger.info("Kotlin MPP plugin is already present")
} }
plugins.apply(KScienceCommonPlugin::class) plugins.apply(KScienceCommonPlugin::class)
} }

View File

@ -14,6 +14,14 @@ open class KSciencePublishPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.run { override fun apply(project: Project): Unit = project.run {
plugins.apply("maven-publish") plugins.apply("maven-publish")
// plugins.withId("org.jetbrains.kotlin.jvm"){
// extensions.findByType<JavaPluginExtension>()?.apply {
// withSourcesJar()
// //withJavadocJar()
// }
// }
afterEvaluate { afterEvaluate {
val githubOrg: String = project.findProperty("githubOrg") as? String ?: "mipt-npm" val githubOrg: String = project.findProperty("githubOrg") as? String ?: "mipt-npm"
val githubProject: String? by project val githubProject: String? by project