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

Merge branch 'beta/1.9.0' into dev

Browse Source
This commit is contained in:
Alexander Nozik 2023-07-07 11:29:11 +03:00
commit 72f2678f3d
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle/libs.versions.toml
View File

@ -1,6 +1,6 @@
[versions] [versions]
tools = "0.14.9-kotlin-1.8.20" tools = "0.14.9-kotlin-1.9.0-RC-dev-1"
kotlin = "1.8.20" kotlin = "1.9.0-RC"
atomicfu = "0.20.2" atomicfu = "0.20.2"
binary-compatibility-validator = "0.13.1" binary-compatibility-validator = "0.13.1"
changelog = "2.0.0" changelog = "2.0.0"
@ -8,12 +8,12 @@ dokka = "1.8.10"
kotlin-jupyter = "0.11.0-360" kotlin-jupyter = "0.11.0-360"
kotlinx-benchmark = "0.4.7" kotlinx-benchmark = "0.4.7"
kotlinx-cli = "0.3.5" kotlinx-cli = "0.3.5"
kotlinx-coroutines = "1.7.0-RC" kotlinx-coroutines = "1.7.1"
kotlinx-datetime = "0.4.0" kotlinx-datetime = "0.4.0"
kotlinx-html = "0.8.0" kotlinx-html = "0.8.0"
kotlinx-knit = "0.4.0" kotlinx-knit = "0.4.0"
kotlinx-nodejs = "0.0.7" kotlinx-nodejs = "0.0.7"
kotlinx-serialization = "1.5.0" kotlinx-serialization = "1.5.1"
ktor = "2.3.0" ktor = "2.3.0"
xmlutil = "0.86.0" xmlutil = "0.86.0"
yamlkt = "0.13.0" yamlkt = "0.13.0"

5
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"))
} }
} }
@ -474,7 +474,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
binaries.executable() binaries.executable()
browser { browser {
webpackTask { webpackTask {
outputFileName = bundleName mainOutputFileName.set(bundleName)
} }
browserConfig() browserConfig()
} }
@ -564,6 +564,7 @@ public open class KScienceMppExtension(project: Project) : KScienceExtension(pro
} }
configure(nativeTargets) { configure(nativeTargets) {
compilations["main"]?.apply { compilations["main"]?.apply {
configure(kotlinSourceSets) { configure(kotlinSourceSets) {
dependsOn(nativeMain) dependsOn(nativeMain)

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
}
} }
} }