2.0.0-RC1
This commit is contained in:
parent
cb1c6d79a7
commit
329d023438
@ -72,10 +72,10 @@ xmlutil = "0.86.2"
|
|||||||
# https://github.com/Him188/yamlkt
|
# https://github.com/Him188/yamlkt
|
||||||
yamlkt = "0.13.0"
|
yamlkt = "0.13.0"
|
||||||
# https://github.com/JetBrains/kotlin-wrappers
|
# https://github.com/JetBrains/kotlin-wrappers
|
||||||
jsBom = "1.0.0-pre.648"
|
jsBom = "1.0.0-pre.732"
|
||||||
junit = "5.9.3"
|
junit = "5.9.3"
|
||||||
# https://github.com/JetBrains/compose-multiplatform
|
# https://github.com/JetBrains/compose-multiplatform
|
||||||
compose = "1.6.10-beta01"
|
compose = "1.6.2"
|
||||||
# https://mvnrepository.com/artifact/org.slf4j/slf4j-api
|
# https://mvnrepository.com/artifact/org.slf4j/slf4j-api
|
||||||
slf4j = "2.0.9"
|
slf4j = "2.0.9"
|
||||||
# https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
|
# https://mvnrepository.com/artifact/ch.qos.logback/logback-classic
|
||||||
|
@ -9,6 +9,7 @@ import org.gradle.api.tasks.testing.Test
|
|||||||
import org.gradle.jvm.toolchain.JavaLanguageVersion
|
import org.gradle.jvm.toolchain.JavaLanguageVersion
|
||||||
import org.gradle.kotlin.dsl.*
|
import org.gradle.kotlin.dsl.*
|
||||||
import org.gradle.language.jvm.tasks.ProcessResources
|
import org.gradle.language.jvm.tasks.ProcessResources
|
||||||
|
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension
|
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
|
||||||
@ -359,6 +360,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
|
|||||||
project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
|
project.pluginManager.withPlugin("org.jetbrains.kotlin.multiplatform") {
|
||||||
project.configure<KotlinMultiplatformExtension> {
|
project.configure<KotlinMultiplatformExtension> {
|
||||||
jvm {
|
jvm {
|
||||||
|
@OptIn(ExperimentalKotlinGradlePluginApi::class)
|
||||||
compilerOptions{
|
compilerOptions{
|
||||||
freeCompilerArgs.addAll(defaultKotlinJvmArgs)
|
freeCompilerArgs.addAll(defaultKotlinJvmArgs)
|
||||||
}
|
}
|
||||||
|
@ -6,11 +6,13 @@ import org.gradle.kotlin.dsl.apply
|
|||||||
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.dokka.gradle.DokkaPlugin
|
import org.jetbrains.dokka.gradle.DokkaPlugin
|
||||||
|
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
|
||||||
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
|
||||||
import space.kscience.gradle.internal.applySettings
|
import space.kscience.gradle.internal.applySettings
|
||||||
import space.kscience.gradle.internal.defaultKotlinCommonArgs
|
import space.kscience.gradle.internal.defaultKotlinCommonArgs
|
||||||
|
|
||||||
public open class KScienceMPPlugin : Plugin<Project> {
|
public open class KScienceMPPlugin : Plugin<Project> {
|
||||||
|
|
||||||
override fun apply(project: Project): Unit = project.run {
|
override fun apply(project: Project): Unit = project.run {
|
||||||
if (!plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) {
|
if (!plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) {
|
||||||
//apply<KotlinMultiplatformPlugin>() for some reason it does not work
|
//apply<KotlinMultiplatformPlugin>() for some reason it does not work
|
||||||
@ -38,7 +40,7 @@ public open class KScienceMPPlugin : Plugin<Project> {
|
|||||||
languageSettings.applySettings()
|
languageSettings.applySettings()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@OptIn(ExperimentalKotlinGradlePluginApi::class)
|
||||||
compilerOptions{
|
compilerOptions{
|
||||||
freeCompilerArgs.addAll(defaultKotlinCommonArgs)
|
freeCompilerArgs.addAll(defaultKotlinCommonArgs)
|
||||||
}
|
}
|
||||||
|
@ -91,7 +91,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
|
|||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
maven("https://repo.kotlin.link")
|
maven("https://repo.kotlin.link")
|
||||||
maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev")
|
google()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Workaround for https://github.com/gradle/gradle/issues/15568
|
// Workaround for https://github.com/gradle/gradle/issues/15568
|
||||||
|
Loading…
Reference in New Issue
Block a user