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

Kotlin 1.4.20 #4

Merged
altavir merged 10 commits from kotlin-1.4.20 into dev 2020-11-25 22:20:48 +03:00
Conversation 0 Commits 10 Files Changed 15 +54 -45
2 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be571a9028 - Show all commits

2
src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt
View File

@ -112,7 +112,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
afterEvaluate { afterEvaluate {
extensions.findByType<JavaPluginExtension>()?.apply { extensions.findByType<JavaPluginExtension>()?.apply {
targetCompatibility = KScienceVersions.JVM_TARGET targetCompatibility = KScienceVersions.JVM_TARGET
withSourcesJar() //withSourcesJar()
//withJavadocJar() //withJavadocJar()
} }

17
src/main/kotlin/ru/mipt/npm/gradle/dependencies.kt
View File

@ -3,6 +3,8 @@ package ru.mipt.npm.gradle
import org.gradle.api.Project import org.gradle.api.Project
import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.invoke import org.gradle.kotlin.dsl.invoke
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
enum class DependencyConfiguration { enum class DependencyConfiguration {
@ -37,10 +39,12 @@ internal fun Project.useDependency(
} }
} }
} }
}
}
pairs.find { it.first == "jvm" }?.let { dep -> pairs.find { it.first == "jvm" }?.let { dep ->
pluginManager.withPlugin("org.jetbrains.kotlin.jvm") { pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
configure<KotlinJvmProjectExtension> {
sourceSets.findByName(dependencySourceSet.setName)?.apply { sourceSets.findByName(dependencySourceSet.setName)?.apply {
dependencies.apply { dependencies.apply {
val configurationName = when (dependencyConfiguration) { val configurationName = when (dependencyConfiguration) {
@ -53,9 +57,11 @@ internal fun Project.useDependency(
} }
} }
} }
}
pairs.find { it.first == "js" }?.let { dep -> pairs.find { it.first == "js" }?.let { dep ->
pluginManager.withPlugin("org.jetbrains.kotlin.js") { pluginManager.withPlugin("org.jetbrains.kotlin.js") {
configure<KotlinJsProjectExtension> {
sourceSets.findByName(dependencySourceSet.setName)?.apply { sourceSets.findByName(dependencySourceSet.setName)?.apply {
dependencies.apply { dependencies.apply {
val configurationName = when (dependencyConfiguration) { val configurationName = when (dependencyConfiguration) {
@ -69,8 +75,6 @@ internal fun Project.useDependency(
} }
} }
} }
}
} }
internal fun Project.useCommonDependency( internal fun Project.useCommonDependency(
@ -89,8 +93,12 @@ internal fun Project.useCommonDependency(
} }
} }
} }
}
}
withPlugin("org.jetbrains.kotlin.jvm") { withPlugin("org.jetbrains.kotlin.jvm") {
configure<KotlinJvmProjectExtension> {
sourceSets.findByName(dependencySourceSet.setName)?.apply { sourceSets.findByName(dependencySourceSet.setName)?.apply {
dependencies.apply { dependencies.apply {
val configurationName = when (dependencyConfiguration) { val configurationName = when (dependencyConfiguration) {
@ -102,7 +110,9 @@ internal fun Project.useCommonDependency(
} }
} }
} }
}
withPlugin("org.jetbrains.kotlin.js") { withPlugin("org.jetbrains.kotlin.js") {
configure<KotlinJsProjectExtension> {
sourceSets.findByName(dependencySourceSet.setName)?.apply { sourceSets.findByName(dependencySourceSet.setName)?.apply {
dependencies.apply { dependencies.apply {
val configurationName = when (dependencyConfiguration) { val configurationName = when (dependencyConfiguration) {
@ -115,5 +125,4 @@ internal fun Project.useCommonDependency(
} }
} }
} }
}
} }