Dev #5

Merged
altavir merged 24 commits from dev into master 2020-12-28 09:44:15 +03:00
Showing only changes of commit 3108f16dea - Show all commits

View File

@ -65,6 +65,11 @@ open class KScienceCommonPlugin : Plugin<Project> {
} }
} }
} }
(tasks.findByName("processResources") as? Copy)?.apply {
fromDependencies("runtimeClasspath")
}
} }
pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") { pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
@ -114,14 +119,16 @@ open class KScienceCommonPlugin : Plugin<Project> {
} }
} }
} }
(tasks.findByName("jsProcessResources") as? Copy)?.apply {
fromDependencies("jsRuntimeClasspath")
}
} }
} }
afterEvaluate { afterEvaluate {
extensions.findByType<JavaPluginExtension>()?.apply { extensions.findByType<JavaPluginExtension>()?.apply {
targetCompatibility = KScienceVersions.JVM_TARGET targetCompatibility = KScienceVersions.JVM_TARGET
//withSourcesJar()
//withJavadocJar()
} }
tasks.apply { tasks.apply {
@ -134,14 +141,6 @@ open class KScienceCommonPlugin : Plugin<Project> {
withType<Test> { withType<Test> {
useJUnitPlatform() useJUnitPlatform()
} }
(findByName("processResources") as? Copy)?.apply {
fromDependencies("runtimeClasspath")
}
(findByName("jsProcessResources") as? Copy)?.apply {
fromDependencies("jsRuntimeClasspath")
}
} }
} }
} }