0.15.8-kotlin-2.1.0 #51
@ -1,5 +1,5 @@
|
|||||||
[versions]
|
[versions]
|
||||||
tools = "0.14.8-kotlin-1.8.20"
|
tools = "0.14.9-kotlin-1.8.20"
|
||||||
kotlin = "1.8.20"
|
kotlin = "1.8.20"
|
||||||
atomicfu = "0.20.2"
|
atomicfu = "0.20.2"
|
||||||
binary-compatibility-validator = "0.13.1"
|
binary-compatibility-validator = "0.13.1"
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@ -13,6 +13,7 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinProjectExtension
|
||||||
|
import org.jetbrains.kotlin.gradle.plugin.KotlinCompilation
|
||||||
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
|
import org.jetbrains.kotlin.gradle.plugin.KotlinDependencyHandler
|
||||||
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
|
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTarget
|
||||||
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
|
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
|
||||||
@ -208,6 +209,7 @@ public open class KScienceExtension(public val project: Project) {
|
|||||||
/**
|
/**
|
||||||
* Mark this module as an application module. JVM application should be enabled separately
|
* Mark this module as an application module. JVM application should be enabled separately
|
||||||
*/
|
*/
|
||||||
|
@Deprecated("Use platform-specific applications")
|
||||||
public fun application() {
|
public fun application() {
|
||||||
project.extensions.findByType<KotlinProjectExtension>()?.apply {
|
project.extensions.findByType<KotlinProjectExtension>()?.apply {
|
||||||
explicitApi = null
|
explicitApi = null
|
||||||
@ -423,6 +425,11 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
|
|||||||
|
|
||||||
@OptIn(ExperimentalWasmDsl::class)
|
@OptIn(ExperimentalWasmDsl::class)
|
||||||
public fun wasm(block: KotlinWasmTargetDsl.() -> Unit = {}) {
|
public fun wasm(block: KotlinWasmTargetDsl.() -> Unit = {}) {
|
||||||
|
if(project.requestPropertyOrNull("kscience.wasm.disabled") == "true"){
|
||||||
|
project.logger.warn("Wasm target is disabled with 'kscience.wasm.disabled' property")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
|
project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
|
||||||
project.configure<KotlinMultiplatformExtension> {
|
project.configure<KotlinMultiplatformExtension> {
|
||||||
wasm {
|
wasm {
|
||||||
@ -474,8 +481,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
|
|||||||
}
|
}
|
||||||
jvm {
|
jvm {
|
||||||
val processResourcesTaskName =
|
val processResourcesTaskName =
|
||||||
compilations[org.jetbrains.kotlin.gradle.plugin.KotlinCompilation.MAIN_COMPILATION_NAME]
|
compilations[KotlinCompilation.MAIN_COMPILATION_NAME].processResourcesTaskName
|
||||||
.processResourcesTaskName
|
|
||||||
|
|
||||||
val jsBrowserDistribution = project.tasks.getByName("jsBrowserDistribution")
|
val jsBrowserDistribution = project.tasks.getByName("jsBrowserDistribution")
|
||||||
|
|
||||||
|
@ -27,19 +27,10 @@ internal fun Project.setupPublication(mavenPomConfiguration: MavenPom.() -> Unit
|
|||||||
plugins.withId("org.jetbrains.kotlin.js") {
|
plugins.withId("org.jetbrains.kotlin.js") {
|
||||||
val kotlin: KotlinJsProjectExtension = extensions.findByType()!!
|
val kotlin: KotlinJsProjectExtension = extensions.findByType()!!
|
||||||
|
|
||||||
val sourcesJar by tasks.creating(Jar::class) {
|
|
||||||
archiveClassifier.set("sources")
|
|
||||||
kotlin.sourceSets.forEach {
|
|
||||||
from(it.kotlin)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publications.create<MavenPublication>("js") {
|
publications.create<MavenPublication>("js") {
|
||||||
kotlin.targets.flatMap { it.components }.forEach {
|
kotlin.targets.flatMap { it.components }.forEach {
|
||||||
from(it)
|
from(it)
|
||||||
}
|
}
|
||||||
|
|
||||||
artifact(sourcesJar)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user