1.4.30-RC
This commit is contained in:
parent
82436148f3
commit
8330a74457
@ -2,11 +2,11 @@ plugins {
|
|||||||
`java-gradle-plugin`
|
`java-gradle-plugin`
|
||||||
`kotlin-dsl`
|
`kotlin-dsl`
|
||||||
`maven-publish`
|
`maven-publish`
|
||||||
id("org.jetbrains.changelog") version "0.6.2"
|
id("org.jetbrains.changelog") version "1.0.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "ru.mipt.npm"
|
group = "ru.mipt.npm"
|
||||||
version = "0.7.1"
|
version = "0.7.3-1.4.30-RC"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
gradlePluginPortal()
|
gradlePluginPortal()
|
||||||
@ -16,7 +16,7 @@ repositories {
|
|||||||
maven("https://dl.bintray.com/kotlin/kotlin-dev")
|
maven("https://dl.bintray.com/kotlin/kotlin-dev")
|
||||||
}
|
}
|
||||||
|
|
||||||
val kotlinVersion = "1.4.21"
|
val kotlinVersion = "1.4.30-RC"
|
||||||
|
|
||||||
java {
|
java {
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
targetCompatibility = JavaVersion.VERSION_1_8
|
||||||
@ -29,7 +29,7 @@ dependencies {
|
|||||||
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.15.0")
|
implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.15.0")
|
||||||
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20")
|
implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20")
|
||||||
implementation("org.jetbrains.dokka:dokka-base:1.4.20")
|
implementation("org.jetbrains.dokka:dokka-base:1.4.20")
|
||||||
implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:0.6.2")
|
implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:1.0.0")
|
||||||
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.2.4")
|
implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.2.4")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
||||||
import ru.mipt.npm.gradle.internal.applyRepos
|
import ru.mipt.npm.gradle.internal.applyRepos
|
||||||
import ru.mipt.npm.gradle.internal.applySettings
|
import ru.mipt.npm.gradle.internal.applySettings
|
||||||
import ru.mipt.npm.gradle.internal.fromDependencies
|
import ru.mipt.npm.gradle.internal.fromJsDependencies
|
||||||
|
|
||||||
open class KScienceCommonPlugin : Plugin<Project> {
|
open class KScienceCommonPlugin : Plugin<Project> {
|
||||||
override fun apply(project: Project): Unit = project.run {
|
override fun apply(project: Project): Unit = project.run {
|
||||||
@ -67,7 +67,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
(tasks.findByName("processResources") as? Copy)?.apply {
|
(tasks.findByName("processResources") as? Copy)?.apply {
|
||||||
fromDependencies("runtimeClasspath")
|
fromJsDependencies("runtimeClasspath")
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -121,7 +121,7 @@ open class KScienceCommonPlugin : Plugin<Project> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
(tasks.findByName("jsProcessResources") as? Copy)?.apply {
|
(tasks.findByName("jsProcessResources") as? Copy)?.apply {
|
||||||
fromDependencies("jsRuntimeClasspath")
|
fromJsDependencies("jsRuntimeClasspath")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -8,6 +8,7 @@ import org.gradle.kotlin.dsl.maven
|
|||||||
import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder
|
import org.jetbrains.kotlin.gradle.plugin.LanguageSettingsBuilder
|
||||||
|
|
||||||
internal fun LanguageSettingsBuilder.applySettings(): Unit {
|
internal fun LanguageSettingsBuilder.applySettings(): Unit {
|
||||||
|
languageVersion = "1.5"
|
||||||
progressiveMode = true
|
progressiveMode = true
|
||||||
enableLanguageFeature("InlineClasses")
|
enableLanguageFeature("InlineClasses")
|
||||||
useExperimentalAnnotation("kotlin.Experimental")
|
useExperimentalAnnotation("kotlin.Experimental")
|
||||||
@ -30,7 +31,7 @@ internal fun RepositoryHandler.applyRepos(): Unit {
|
|||||||
maven("https://dl.bintray.com/mipt-npm/dataforge")
|
maven("https://dl.bintray.com/mipt-npm/dataforge")
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun Copy.fromDependencies(configurationName: String) = project.afterEvaluate {
|
internal fun Copy.fromJsDependencies(configurationName: String) = project.afterEvaluate {
|
||||||
val configuration = configurations[configurationName]
|
val configuration = configurations[configurationName]
|
||||||
?: error("Configuration with name $configurationName could not be resolved.")
|
?: error("Configuration with name $configurationName could not be resolved.")
|
||||||
val projectDeps = configuration.allDependencies.filterIsInstance<ProjectDependency>().map {
|
val projectDeps = configuration.allDependencies.filterIsInstance<ProjectDependency>().map {
|
||||||
|
Loading…
Reference in New Issue
Block a user