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

0.15.8-kotlin-2.1.0 #51

Merged
altavir merged 54 commits from dev into master 2024-12-09 09:49:38 +03:00
Conversation 0 Commits 54 Files Changed 16 +12 -7
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5463c9326b - Show all commits

2
gradle/libs.versions.toml
View File

@ -1,5 +1,5 @@
[versions] [versions]
tools = "0.14.9-kotlin-1.9.0-Beta" tools = "0.14.9-kotlin-1.9.0-Beta-dev-3"
kotlin = "1.9.0-Beta" kotlin = "1.9.0-Beta"
atomicfu = "0.20.2" atomicfu = "0.20.2"
binary-compatibility-validator = "0.13.1" binary-compatibility-validator = "0.13.1"

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

@ -437,7 +437,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
testTask { testTask {
useKarma { useKarma {
this.webpackConfig.experiments.add("topLevelAwait") this.webpackConfig.experiments.add("topLevelAwait")
useChromeHeadless() useChromeHeadlessWasmGc()
useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm")) useConfigDirectory(project.projectDir.resolve("karma.config.d").resolve("wasm"))
} }
} }

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

@ -12,6 +12,9 @@ import org.jetbrains.changelog.ChangelogPlugin
import org.jetbrains.changelog.ChangelogPluginExtension import org.jetbrains.changelog.ChangelogPluginExtension
import org.jetbrains.dokka.gradle.AbstractDokkaTask import org.jetbrains.dokka.gradle.AbstractDokkaTask
import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaPlugin
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnLockMismatchReport
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin
import org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension
import space.kscience.gradle.internal.* import space.kscience.gradle.internal.*
/** /**
@ -104,8 +107,8 @@ public open class KScienceProjectPlugin : Plugin<Project> {
apply<DokkaPlugin>() apply<DokkaPlugin>()
apply<BinaryCompatibilityValidatorPlugin>() apply<BinaryCompatibilityValidatorPlugin>()
allprojects{ allprojects {
repositories{ repositories {
mavenCentral() mavenCentral()
maven("https://repo.kotlin.link") maven("https://repo.kotlin.link")
maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev") maven("https://maven.pkg.jetbrains.space/spc/p/sci/dev")
@ -250,9 +253,11 @@ public open class KScienceProjectPlugin : Plugin<Project> {
} }
} }
plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) { plugins.withType<YarnPlugin>() {
rootProject.the<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension>().lockFileDirectory = rootProject.configure<YarnRootExtension> {
rootDir.resolve("gradle") lockFileDirectory = rootDir.resolve("gradle")
yarnLockMismatchReport = YarnLockMismatchReport.WARNING
}
} }
} }