From 0ba835925e57beffb5febfbbcc59c8c5657e861d Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Sat, 27 Nov 2021 01:26:29 +0700 Subject: [PATCH] Update the version catalog --- gradle/libs.versions.toml | 10 +++++----- .../ru/mipt/npm/gradle/KScienceCommonPlugin.kt | 4 ++-- .../kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt | 2 +- .../kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt | 5 ++++- .../ru/mipt/npm/gradle/KScienceProjectPlugin.kt | 12 ++++++++++-- .../kotlin/ru/mipt/npm/gradle/internal/common.kt | 4 ++-- src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt | 1 - 7 files changed, 24 insertions(+), 14 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ff079c..e689a50 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,21 +1,21 @@ [versions] tools = "0.10.7" kotlin = "1.6.0" -atomicfu = "0.16.3" +atomicfu = "0.17.0" binary-compatibility-validator = "0.8.0" changelog = "1.3.1" -dokka = "1.5.30" -kotlin-jupyter = "0.10.3-36" +dokka = "1.6.0" +kotlin-jupyter = "0.11.0-6" kotlinx-benchmark = "0.3.1" kotlinx-cli = "0.3.3" kotlinx-collections-immutable = "0.3.4" kotlinx-coroutines = "1.5.2" kotlinx-datetime = "0.3.1" kotlinx-html = "0.7.3" -kotlinx-knit = "0.2.3" +kotlinx-knit = "0.3.0" kotlinx-nodejs = "0.0.7" kotlinx-serialization = "1.3.1" -ktor = "1.6.3" +ktor = "1.6.5" xmlutil = "0.83.0" yamlkt = "0.10.2" jsBom = "0.0.1-pre.265-kotlin-1.5.31" diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index ee8db3a..28b16bc 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -17,8 +17,8 @@ import ru.mipt.npm.gradle.internal.fromJsDependencies @Suppress("UNUSED_VARIABLE") public open class KScienceCommonPlugin : Plugin { - public companion object{ - public val defaultJvmArgs: List = listOf("-Xjvm-default=all","-Xlambdas=indy") + public companion object { + public val defaultJvmArgs: List = listOf("-Xjvm-default=all", "-Xlambdas=indy") } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt index 0b0fa43..6ee5518 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceMPPlugin.kt @@ -16,5 +16,5 @@ public open class KScienceMPPlugin : Plugin { } apply() - } + } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt index 261a337..b3ebb78 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceNodePlugin.kt @@ -2,7 +2,10 @@ package ru.mipt.npm.gradle import org.gradle.api.Plugin import org.gradle.api.Project -import org.gradle.kotlin.dsl.* +import org.gradle.kotlin.dsl.apply +import org.gradle.kotlin.dsl.configure +import org.gradle.kotlin.dsl.findPlugin +import org.gradle.kotlin.dsl.invoke import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension /** diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 5eae110..5b75919 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -67,7 +67,12 @@ public class KSciencePublishingExtension(public val project: Project) { * @param githubOrg the GitHub user or organization. * @param release whether publish packages in the `release` task to the GitHub repository. */ - public fun github(githubProject: String, githubOrg: String = "mipt-npm", release: Boolean = false, publish: Boolean = true) { + public fun github( + githubProject: String, + githubOrg: String = "mipt-npm", + release: Boolean = false, + publish: Boolean = true + ) { // Automatically initialize VCS using GitHub if (!isVcsInitialized) { git("https://github.com/$githubOrg/${githubProject}", "https://github.com/$githubOrg/${githubProject}.git") @@ -87,7 +92,10 @@ public class KSciencePublishingExtension(public val project: Project) { * @param spaceRepo the repository URL. * @param release whether publish packages in the `release` task to the Space repository. */ - public fun space(spaceRepo: String = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven", release: Boolean = true) { + public fun space( + spaceRepo: String = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven", + release: Boolean = true + ) { project.addSpacePublishing(spaceRepo) if (release) linkPublicationsToReleaseTask("space") diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt index b8c8f13..21f0ef9 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -48,10 +48,10 @@ internal fun Copy.fromJsDependencies(configurationName: String) = project.run { from(task) } } - } + } } -internal fun KotlinMultiplatformExtension.bundleJsBinaryAsResource(bundleName: String = "js/bundle.js"){ +internal fun KotlinMultiplatformExtension.bundleJsBinaryAsResource(bundleName: String = "js/bundle.js") { js { binaries.executable() browser { diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt index 3420cb3..c64c81b 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/fx.kt @@ -2,7 +2,6 @@ package ru.mipt.npm.gradle.internal import org.apache.tools.ant.taskdefs.condition.Os import org.gradle.api.Project -import org.gradle.kotlin.dsl.configure import org.gradle.kotlin.dsl.findByType import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension