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

2.0.0-RC1

Browse Source
This commit is contained in:
Alexander Nozik 2024-04-20 12:08:18 +03:00
parent cb1c6d79a7
commit 329d023438
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle/libs.versions.toml
View File

@ -72,10 +72,10 @@ xmlutil = "0.86.2"
# https://github.com/Him188/yamlkt
yamlkt = "0.13.0"
# https://github.com/JetBrains/kotlin-wrappers
jsBom = "1.0.0-pre.648"
jsBom = "1.0.0-pre.732"
junit = "5.9.3"
# https://github.com/JetBrains/compose-multiplatform
compose = "1.6.10-beta01"
compose = "1.6.2"
# https://mvnrepository.com/artifact/org.slf4j/slf4j-api
slf4j = "2.0.9"
# https://mvnrepository.com/artifact/ch.qos.logback/logback-classic

2
src/main/kotlin/space/kscience/gradle/KScienceExtension.kt
View File

@ -9,6 +9,7 @@ import org.gradle.api.tasks.testing.Test
import org.gradle.jvm.toolchain.JavaLanguageVersion
import org.gradle.kotlin.dsl.*
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.KotlinJvmProjectExtension
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.configure<KotlinMultiplatformExtension> {
jvm {
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions{
freeCompilerArgs.addAll(defaultKotlinJvmArgs)
}

4
src/main/kotlin/space/kscience/gradle/KScienceMPPlugin.kt
View File

@ -6,11 +6,13 @@ import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.invoke
import org.jetbrains.dokka.gradle.DokkaPlugin
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import space.kscience.gradle.internal.applySettings
import space.kscience.gradle.internal.defaultKotlinCommonArgs
public open class KScienceMPPlugin : Plugin<Project> {
override fun apply(project: Project): Unit = project.run {
if (!plugins.hasPlugin("org.jetbrains.kotlin.multiplatform")) {
//apply<KotlinMultiplatformPlugin>() for some reason it does not work
@ -38,7 +40,7 @@ public open class KScienceMPPlugin : Plugin<Project> {
languageSettings.applySettings()
}
}
@OptIn(ExperimentalKotlinGradlePluginApi::class)
compilerOptions{
freeCompilerArgs.addAll(defaultKotlinCommonArgs)
}

2
src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt
View File

@ -91,7 +91,7 @@ public open class KScienceProjectPlugin : Plugin<Project> {
repositories {
mavenCentral()
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