From a221951197ec1fd6a46d1627c67c6a78823acf90 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 8 May 2021 13:57:46 +0300 Subject: [PATCH 01/16] 0.9.6 --- build.gradle.kts | 2 +- src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt | 2 +- .../kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt | 8 ++++++++ src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 8 ++++---- .../kotlin/ru/mipt/npm/gradle/SerializationTargets.kt | 7 +------ 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2d3f61f..95dc701 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.5" +version = "0.9.6" description = "Build tools for DataForge and kscience projects" diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index 110f22d..0863f7a 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -103,7 +103,7 @@ class KScienceExtension(val project: Project) { ) = project.useFx(modules.toList(), configuration, version, platform) fun useHtml( - version: String = KScienceVersions.atomicVersion, + version: String = KScienceVersions.htmlVersion, sourceSet: DependencySourceSet = DependencySourceSet.MAIN, configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION ): Unit = project.useCommonDependency( diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 8d33965..14f38a3 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -7,6 +7,7 @@ import org.gradle.api.Plugin import org.gradle.api.Project import org.gradle.kotlin.dsl.* import org.jetbrains.changelog.ChangelogPlugin +import org.jetbrains.changelog.ChangelogPluginExtension import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaTask import ru.mipt.npm.gradle.internal.* @@ -63,6 +64,13 @@ class KSciencePublishingExtension(val project: Project) { open class KScienceProjectPlugin : Plugin { override fun apply(target: Project): Unit = target.run { apply() + + if(!isSnapshot()) { + configure { + version = project.version.toString() + } + } + apply() apply() diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index eb8f07e..baf60eb 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -8,17 +8,17 @@ import org.gradle.api.JavaVersion object KScienceVersions { const val kotlinVersion = "1.5.0" const val kotlinxNodeVersion = "0.0.7" - const val coroutinesVersion = "1.4.3" - const val serializationVersion = "1.1.0" + const val coroutinesVersion = "1.5.0-RC" + const val serializationVersion = "1.2.0" const val atomicVersion = "0.16.1" const val ktorVersion = "1.5.3" const val htmlVersion = "0.7.3" - const val dateTimeVersion = "0.1.1" + const val dateTimeVersion = "0.2.0" val JVM_TARGET = JavaVersion.VERSION_11 object Serialization{ - const val xmlVersion = "0.81.2" + const val xmlVersion = "0.82.0" const val bsonVersion = "0.4.4" const val yamlKtVersion = "0.9.0" } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt index f9972d3..531a608 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt @@ -1,8 +1,6 @@ package ru.mipt.npm.gradle import org.gradle.api.Project -import org.gradle.kotlin.dsl.maven -import org.gradle.kotlin.dsl.repositories import ru.mipt.npm.gradle.internal.useCommonDependency import ru.mipt.npm.gradle.internal.useDependency @@ -44,11 +42,8 @@ class SerializationTargets( fun Project.xml( version: String = KScienceVersions.Serialization.xmlVersion ) { - repositories { - maven("https://dl.bintray.com/pdvrieze/maven") - } useCommonDependency( - "net.devrieze:xmlutil-serialization:$version", + "io.github.pdvrieze.xmlutil:serialization:$version", dependencySourceSet = sourceSet, dependencyConfiguration = configuration ) From ba4548b3d74e2940e55f4d57f6f86645677ea47c Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 14 May 2021 12:53:57 +0300 Subject: [PATCH 02/16] Fix publishing for generic plugins --- build.gradle.kts | 2 +- src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 2 +- src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 95dc701..7b8bf3a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.6" +version = "0.9.7" description = "Build tools for DataForge and kscience projects" diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index baf60eb..2831243 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -9,7 +9,7 @@ object KScienceVersions { const val kotlinVersion = "1.5.0" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.5.0-RC" - const val serializationVersion = "1.2.0" + const val serializationVersion = "1.2.1" const val atomicVersion = "0.16.1" const val ktorVersion = "1.5.3" const val htmlVersion = "0.7.3" diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt index dbb42a4..d37ebeb 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt @@ -20,7 +20,7 @@ internal fun Project.setupPublication(vcs: String) = allprojects { plugins.withId("maven-publish") { configure { - plugins.withId("ru.mipt.npm.gradle.js") { + plugins.withId("org.jetbrains.kotlin.js") { val kotlin = extensions.findByType()!! val sourcesJar: Jar by tasks.creating(Jar::class) { @@ -36,7 +36,7 @@ internal fun Project.setupPublication(vcs: String) = allprojects { } } - plugins.withId("ru.mipt.npm.gradle.jvm") { + plugins.withId("org.jetbrains.kotlin.jvm") { val kotlin = extensions.findByType()!! val sourcesJar: Jar by tasks.creating(Jar::class) { From 5ff90436f51cc54a16f3a7355bd0d21d28dad4fd Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 14 May 2021 20:10:07 +0300 Subject: [PATCH 03/16] update coroutines version --- src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 2831243..5bd3499 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -8,7 +8,7 @@ import org.gradle.api.JavaVersion object KScienceVersions { const val kotlinVersion = "1.5.0" const val kotlinxNodeVersion = "0.0.7" - const val coroutinesVersion = "1.5.0-RC" + const val coroutinesVersion = "1.5.0" const val serializationVersion = "1.2.1" const val atomicVersion = "0.16.1" const val ktorVersion = "1.5.3" From 023ca7b80c4ac3c92aabbd1eaf36120cb983e578 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 18 May 2021 12:16:33 +0300 Subject: [PATCH 04/16] adjust release publishing --- build.gradle.kts | 2 +- settings.gradle | 2 -- settings.gradle.kts | 1 + .../mipt/npm/gradle/KScienceCommonPlugin.kt | 2 -- .../ru/mipt/npm/gradle/KScienceExtension.kt | 1 + .../mipt/npm/gradle/KScienceProjectPlugin.kt | 34 ++++++++++++++----- .../ru/mipt/npm/gradle/KScienceVersions.kt | 2 +- .../ru/mipt/npm/gradle/internal/common.kt | 1 - .../ru/mipt/npm/gradle/internal/publishing.kt | 8 +---- 9 files changed, 31 insertions(+), 22 deletions(-) delete mode 100644 settings.gradle create mode 100644 settings.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 7b8bf3a..c18e67a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.7" +version = "0.9.8" description = "Build tools for DataForge and kscience projects" diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index bc059c6..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'gradle-tools' - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..666c23d --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "gradle-tools" \ No newline at end of file diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index 33a9556..c4b280a 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -40,7 +40,6 @@ open class KScienceCommonPlugin : Plugin { } tasks.withType { kotlinOptions { - useIR = true jvmTarget = KScienceVersions.JVM_TARGET.toString() freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" } @@ -95,7 +94,6 @@ open class KScienceCommonPlugin : Plugin { jvm { compilations.all { kotlinOptions { - useIR = true jvmTarget = KScienceVersions.JVM_TARGET.toString() freeCompilerArgs = freeCompilerArgs + "-Xjvm-default=all" } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index 0863f7a..a4cfef2 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -147,6 +147,7 @@ class KScienceExtension(val project: Project) { } } + @Deprecated("Replace by applying maven-publish plugin") fun publish() { project.plugins.apply(MavenPublishPlugin::class) } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 14f38a3..22207d4 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -16,7 +16,7 @@ import ru.mipt.npm.gradle.internal.* class KSciencePublishingExtension(val project: Project) { private var initializedFlag = false - fun configurePublications(vcsUrl: String) { + fun vcs(vcsUrl: String) { if (!initializedFlag) { project.setupPublication(vcsUrl) initializedFlag = true @@ -25,21 +25,35 @@ class KSciencePublishingExtension(val project: Project) { /** * github publishing + * @param publish include github packages in release publishing. By default - false */ - fun github(githubProject: String, githubOrg: String = "mipt-npm") { + fun github(githubProject: String, githubOrg: String = "mipt-npm", publish: Boolean = false) { //automatically initialize vcs using github if (!initializedFlag) { - configurePublications("https://github.com/$githubOrg/$githubProject") + vcs("https://github.com/$githubOrg/$githubProject") } project.addGithubPublishing(githubOrg, githubProject) + + if (publish) { + val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToGithubRepository") + releaseTask?.dependsOn(publicationTask) + } + } + + private val releaseTask by lazy { + project.tasks.findByName("release") } /** * Space publishing */ - fun space(spaceRepo: String = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven") { - require(initializedFlag) { "The publishing is not set up use 'configurePublications' method to do so" } + fun space(spaceRepo: String = "https://maven.pkg.jetbrains.space/mipt-npm/p/sci/maven", publish: Boolean = false) { + require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" } project.addSpacePublishing(spaceRepo) + if (publish) { + val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToSpaceRepository") + releaseTask?.dependsOn(publicationTask) + } } // // Bintray publishing @@ -51,9 +65,13 @@ class KSciencePublishingExtension(val project: Project) { /** * Sonatype publishing */ - fun sonatype() { - require(initializedFlag) { "The publishing is not set up use 'configurePublications' method to do so" } + fun sonatype(publish: Boolean = true) { + require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" } project.addSonatypePublishing() + if (publish) { + val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToSonatypeRepository") + releaseTask?.dependsOn(publicationTask) + } } } @@ -65,7 +83,7 @@ open class KScienceProjectPlugin : Plugin { override fun apply(target: Project): Unit = target.run { apply() - if(!isSnapshot()) { + if (!isSnapshot()) { configure { version = project.version.toString() } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 5bd3499..76c2a9a 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -11,7 +11,7 @@ object KScienceVersions { const val coroutinesVersion = "1.5.0" const val serializationVersion = "1.2.1" const val atomicVersion = "0.16.1" - const val ktorVersion = "1.5.3" + const val ktorVersion = "1.5.4" const val htmlVersion = "0.7.3" const val dateTimeVersion = "0.2.0" 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 775dc2f..930ddb6 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -22,7 +22,6 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit { internal fun RepositoryHandler.applyRepos(): Unit { mavenCentral() maven("https://repo.kotlin.link") - maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt index d37ebeb..b8a3079 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt @@ -110,7 +110,7 @@ internal val Project.publicationTarget: String internal fun Project.addGithubPublishing( githubOrg: String, - githubProject: String + githubProject: String, ) { if (requestPropertyOrNull("publishing.enabled") != "true") { logger.info("Skipping github publishing because publishing is disabled") @@ -139,8 +139,6 @@ internal fun Project.addGithubPublishing( } } } - val publicationTask = tasks.getByName("publish${publicationTarget}ToGithubRepository") - rootProject.tasks.findByName("release")?.dependsOn(publicationTask) } } } @@ -174,8 +172,6 @@ internal fun Project.addSpacePublishing(spaceRepo: String) { } } } - val publicationTask = tasks.getByName("publish${publicationTarget}ToSpaceRepository") - rootProject.tasks.findByName("release")?.dependsOn(publicationTask) } } } @@ -229,8 +225,6 @@ internal fun Project.addSonatypePublishing() { } } } - val publicationTask = tasks.getByName("publish${publicationTarget}ToSonatypeRepository") - rootProject.tasks.findByName("release")?.dependsOn(publicationTask) } } } From c5b8c688a2011c8fd0787b76633b6b5cde3704b8 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Tue, 18 May 2021 15:07:50 +0300 Subject: [PATCH 05/16] API validation disabled for dev versions --- CHANGELOG.md | 1 + .../kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a68ea7f..afa83f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added ### Changed +- API validation disabled for dev versions ### Deprecated diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 22207d4..9b1caaa 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -83,6 +83,8 @@ open class KScienceProjectPlugin : Plugin { override fun apply(target: Project): Unit = target.run { apply() + + if (!isSnapshot()) { configure { version = project.version.toString() @@ -92,6 +94,12 @@ open class KScienceProjectPlugin : Plugin { apply() apply() + if (isSnapshot()) { + configure { + validationDisabled = true + } + } + val rootReadmeExtension = KScienceReadmeExtension(this) extensions.add("ksciencePublish", KSciencePublishingExtension(this)) extensions.add("readme", rootReadmeExtension) From e0d331d4d48d040ff8477d44f00ae948549506a3 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Wed, 19 May 2021 15:24:24 +0300 Subject: [PATCH 06/16] Fix publication task dependency --- .../ru/mipt/npm/gradle/KScienceProjectPlugin.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 9b1caaa..9a4e0d2 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -35,8 +35,9 @@ class KSciencePublishingExtension(val project: Project) { project.addGithubPublishing(githubOrg, githubProject) if (publish) { - val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToGithubRepository") - releaseTask?.dependsOn(publicationTask) + project.tasks.findByName("publish${project.publicationTarget}ToGithubRepository")?.let {publicationTask-> + releaseTask?.dependsOn(publicationTask) + } } } @@ -51,8 +52,9 @@ class KSciencePublishingExtension(val project: Project) { require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" } project.addSpacePublishing(spaceRepo) if (publish) { - val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToSpaceRepository") - releaseTask?.dependsOn(publicationTask) + project.tasks.findByName("publish${project.publicationTarget}ToSpaceRepository")?.let { publicationTask -> + releaseTask?.dependsOn(publicationTask) + } } } @@ -69,8 +71,10 @@ class KSciencePublishingExtension(val project: Project) { require(initializedFlag) { "The project vcs is not set up use 'vcs' method to do so" } project.addSonatypePublishing() if (publish) { - val publicationTask = project.tasks.getByName("publish${project.publicationTarget}ToSonatypeRepository") - releaseTask?.dependsOn(publicationTask) + project.tasks.findByName("publish${project.publicationTarget}ToSonatypeRepository") + ?.let { publicationTask -> + releaseTask?.dependsOn(publicationTask) + } } } } From e44bf118dc7bbecab948a1f737bcbc9edfe447b6 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 21 May 2021 10:05:46 +0300 Subject: [PATCH 07/16] Fix dependency loading --- .../ru/mipt/npm/gradle/KScienceExtension.kt | 28 ++++++++++++++----- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index a4cfef2..711ae06 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -49,7 +49,7 @@ class KScienceExtension(val project: Project) { fun useCoroutines( version: String = KScienceVersions.coroutinesVersion, sourceSet: DependencySourceSet = DependencySourceSet.MAIN, - configuration: DependencyConfiguration = DependencyConfiguration.API + configuration: DependencyConfiguration = DependencyConfiguration.API, ): Unit = project.useCommonDependency( "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version", dependencySourceSet = sourceSet, @@ -62,7 +62,7 @@ class KScienceExtension(val project: Project) { fun useAtomic( version: String = KScienceVersions.atomicVersion, sourceSet: DependencySourceSet = DependencySourceSet.MAIN, - configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION + configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION, ): Unit = project.run { plugins.apply("kotlinx-atomicfu") useCommonDependency( @@ -79,7 +79,7 @@ class KScienceExtension(val project: Project) { version: String = KScienceVersions.serializationVersion, sourceSet: DependencySourceSet = DependencySourceSet.MAIN, configuration: DependencyConfiguration = DependencyConfiguration.API, - block: SerializationTargets.() -> Unit = {} + block: SerializationTargets.() -> Unit = {}, ): Unit = project.run { plugins.apply("org.jetbrains.kotlin.plugin.serialization") val artifactName = if (version.startsWith("0")) { @@ -95,17 +95,23 @@ class KScienceExtension(val project: Project) { SerializationTargets(sourceSet, configuration).apply(block) } + /** + * Add platform-specific JavaFX dependencies with given list of [FXModule]s + */ fun useFx( vararg modules: FXModule, configuration: DependencyConfiguration = DependencyConfiguration.COMPILE_ONLY, version: String = "11", - platform: FXPlatform = defaultPlatform + platform: FXPlatform = defaultPlatform, ) = project.useFx(modules.toList(), configuration, version, platform) + /** + * Add dependency on kotlinx-html library + */ fun useHtml( version: String = KScienceVersions.htmlVersion, sourceSet: DependencySourceSet = DependencySourceSet.MAIN, - configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION + configuration: DependencyConfiguration = DependencyConfiguration.API, ): Unit = project.useCommonDependency( "org.jetbrains.kotlinx:kotlinx-html:$version", dependencySourceSet = sourceSet, @@ -115,8 +121,16 @@ class KScienceExtension(val project: Project) { /** * Use kotlinx-datetime library with default version or [version] */ - fun useDateTime(version: String = KScienceVersions.dateTimeVersion){ - project.useCommonDependency("org.jetbrains.kotlinx:kotlinx-datetime:$version") + fun useDateTime( + version: String = KScienceVersions.dateTimeVersion, + sourceSet: DependencySourceSet = DependencySourceSet.MAIN, + configuration: DependencyConfiguration = DependencyConfiguration.API, + ) { + project.useCommonDependency( + "org.jetbrains.kotlinx:kotlinx-datetime:$version", + dependencySourceSet = sourceSet, + dependencyConfiguration = configuration + ) } /** From 357e4c03be9e332e281f51abb148abea63647e60 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 21 May 2021 10:11:58 +0300 Subject: [PATCH 08/16] bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c18e67a..d13f0b2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.8" +version = "0.9.9" description = "Build tools for DataForge and kscience projects" From ddbb12869296e4a4d7426bac4a8e3140897cbbed Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 21 May 2021 16:11:48 +0300 Subject: [PATCH 09/16] Fix snapshot detection --- .../mipt/npm/gradle/KScienceProjectPlugin.kt | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 9a4e0d2..4092836 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -87,20 +87,18 @@ open class KScienceProjectPlugin : Plugin { override fun apply(target: Project): Unit = target.run { apply() - - - if (!isSnapshot()) { - configure { - version = project.version.toString() - } - } - apply() apply() - if (isSnapshot()) { - configure { - validationDisabled = true + afterEvaluate { + if (isSnapshot()) { + configure { + validationDisabled = true + } + } else { + configure { + version = project.version.toString() + } } } From 5cd86474de03c734945eb0fbcf4ed4c011356105 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 4 Jun 2021 18:21:12 +0300 Subject: [PATCH 10/16] Update kotlin to 1.5.10 --- build.gradle.kts | 4 ++-- src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 4 ++-- src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt | 1 + src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d13f0b2..76d7f9c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.9" +version = "0.9.10" description = "Build tools for DataForge and kscience projects" @@ -22,7 +22,7 @@ repositories { maven("https://repo.kotlin.link") } -val kotlinVersion = "1.5.0" +val kotlinVersion = "1.5.10" java { targetCompatibility = JavaVersion.VERSION_1_8 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index 76c2a9a..df0b3d5 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -11,9 +11,9 @@ object KScienceVersions { const val coroutinesVersion = "1.5.0" const val serializationVersion = "1.2.1" const val atomicVersion = "0.16.1" - const val ktorVersion = "1.5.4" + const val ktorVersion = "1.6.0" const val htmlVersion = "0.7.3" - const val dateTimeVersion = "0.2.0" + const val dateTimeVersion = "0.2.1" val JVM_TARGET = JavaVersion.VERSION_11 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt index 531a608..a87ee2b 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt @@ -59,6 +59,7 @@ class SerializationTargets( ) } + @Deprecated("To be removed") fun Project.bson( version: String = KScienceVersions.Serialization.bsonVersion ) { 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 930ddb6..9b8b60e 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/common.kt @@ -22,7 +22,6 @@ internal fun LanguageSettingsBuilder.applySettings(): Unit { internal fun RepositoryHandler.applyRepos(): Unit { mavenCentral() maven("https://repo.kotlin.link") - maven("https://maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-js-wrappers") } internal fun Copy.fromJsDependencies(configurationName: String) = project.run { From 24af07eb7ba8615515d25adeb0b426d0c2935945 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 4 Jun 2021 18:22:34 +0300 Subject: [PATCH 11/16] Update kotlin to 1.5.10 --- CHANGELOG.md | 1 + src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index afa83f3..c463fb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - API validation disabled for dev versions ### Deprecated +- bson support ### Removed diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index c4b280a..e7a1922 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -14,6 +14,7 @@ import ru.mipt.npm.gradle.internal.applyRepos import ru.mipt.npm.gradle.internal.applySettings import ru.mipt.npm.gradle.internal.fromJsDependencies +@Suppress("UNUSED_VARIABLE") open class KScienceCommonPlugin : Plugin { override fun apply(project: Project): Unit = project.run { //Common configuration From 329bfa5881af00425c8ff7f3ac50b5e93f432f95 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 4 Jun 2021 18:50:20 +0300 Subject: [PATCH 12/16] Fix publishing for js --- gradle/wrapper/gradle-wrapper.properties | 2 +- .../ru/mipt/npm/gradle/internal/publishing.kt | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..0f80bbf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt index b8a3079..59d7de4 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt @@ -21,16 +21,20 @@ internal fun Project.setupPublication(vcs: String) = allprojects { configure { plugins.withId("org.jetbrains.kotlin.js") { - val kotlin = extensions.findByType()!! + val kotlin: KotlinJsProjectExtension = extensions.findByType()!! val sourcesJar: Jar by tasks.creating(Jar::class) { archiveClassifier.set("sources") - from(kotlin.sourceSets["main"].kotlin) + kotlin.sourceSets.forEach{ + from(it.kotlin) + } } publications { create("js", MavenPublication::class) { - from(components["kotlin"]) + kotlin.js().components.forEach { + from(it) + } artifact(sourcesJar) } } @@ -41,12 +45,16 @@ internal fun Project.setupPublication(vcs: String) = allprojects { val sourcesJar: Jar by tasks.creating(Jar::class) { archiveClassifier.set("sources") - from(kotlin.sourceSets["main"].kotlin) + kotlin.sourceSets.forEach{ + from(it.kotlin) + } } publications { create("jvm", MavenPublication::class) { - from(components["kotlin"]) + kotlin.target.components.forEach { + from(it) + } artifact(sourcesJar) } } From 670a4ca71ee0a9b714eaef63fa7582ad478fedf9 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 4 Jun 2021 19:02:25 +0300 Subject: [PATCH 13/16] Fix publishing for js --- .../ru/mipt/npm/gradle/internal/publishing.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt index 59d7de4..94eccc8 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/internal/publishing.kt @@ -21,7 +21,7 @@ internal fun Project.setupPublication(vcs: String) = allprojects { configure { plugins.withId("org.jetbrains.kotlin.js") { - val kotlin: KotlinJsProjectExtension = extensions.findByType()!! + val kotlin: KotlinJsProjectExtension = extensions.findByType()!! val sourcesJar: Jar by tasks.creating(Jar::class) { archiveClassifier.set("sources") @@ -29,13 +29,14 @@ internal fun Project.setupPublication(vcs: String) = allprojects { from(it.kotlin) } } - - publications { - create("js", MavenPublication::class) { - kotlin.js().components.forEach { - from(it) + afterEvaluate { + publications { + create("js", MavenPublication::class) { + kotlin.js().components.forEach { + from(it) + } + artifact(sourcesJar) } - artifact(sourcesJar) } } } From 19a604f3b34802ed1570d8310558e0a5d51daa9b Mon Sep 17 00:00:00 2001 From: Iaroslav Postovalov Date: Tue, 15 Jun 2021 03:25:35 +0700 Subject: [PATCH 14/16] Publish a function to add dynamic readme properties --- gradlew | 0 .../ru/mipt/npm/gradle/KScienceProjectPlugin.kt | 3 ++- .../mipt/npm/gradle/KScienceReadmeExtension.kt | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) mode change 100644 => 100755 gradlew diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt index 4092836..16862e9 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceProjectPlugin.kt @@ -8,6 +8,7 @@ import org.gradle.api.Project import org.gradle.kotlin.dsl.* import org.jetbrains.changelog.ChangelogPlugin import org.jetbrains.changelog.ChangelogPluginExtension +import org.jetbrains.dokka.gradle.AbstractDokkaTask import org.jetbrains.dokka.gradle.DokkaPlugin import org.jetbrains.dokka.gradle.DokkaTask import ru.mipt.npm.gradle.internal.* @@ -200,7 +201,7 @@ open class KScienceProjectPlugin : Plugin { } } - tasks.withType { + tasks.withType { dependsOn(generateReadme) } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt index 53e6e71..874a166 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceReadmeExtension.kt @@ -36,15 +36,15 @@ class KScienceReadmeExtension(val project: Project) { data class Feature(val id: String, val description: String, val ref: String?, val name: String = id) - val features = ArrayList() + val features: MutableList = ArrayList() @Deprecated("Use lambda builder instead") fun feature(id: String, description: String, ref: String? = null, name: String = id) { - features.add(Feature(id, description, ref, name)) + features += Feature(id, description, ref, name) } fun feature(id: String, ref: String? = null, name: String = id, description: () -> String) { - features.add(Feature(id, description(), ref, name)) + features += Feature(id, description(), ref, name) } private val properties: MutableMap Any?> = mutableMapOf( @@ -55,14 +55,16 @@ class KScienceReadmeExtension(val project: Project) { ) val actualizedProperties - get() = properties.mapValues { (_, value) -> - value.invoke() - } + get() = properties.mapValues { (_, value) -> value() } fun property(key: String, value: Any?) { properties[key] = { value } } + fun property(key: String, value: () -> Any?) { + properties[key] = value + } + fun propertyByTemplate(key: String, template: String) { val actual = actualizedProperties properties[key] = { SimpleTemplateEngine().createTemplate(template).make(actual).toString() } @@ -73,7 +75,7 @@ class KScienceReadmeExtension(val project: Project) { fun propertyByTemplate(key: String, template: File) { val actual = actualizedProperties properties[key] = { SimpleTemplateEngine().createTemplate(template).make(actual).toString() } - additionalFiles.add(template) + additionalFiles += template } /** From 35e01abf93cfafc92cb8f89f0ad137563c4f0364 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 19 Jun 2021 14:09:57 +0300 Subject: [PATCH 15/16] v0.10.0 --- CHANGELOG.md | 6 +++++- build.gradle.kts | 10 +++++----- .../ru/mipt/npm/gradle/KScienceCommonPlugin.kt | 13 ++++++++++--- .../kotlin/ru/mipt/npm/gradle/KScienceExtension.kt | 14 +++++++------- .../kotlin/ru/mipt/npm/gradle/KScienceVersions.kt | 4 ++-- .../ru/mipt/npm/gradle/SerializationTargets.kt | 12 ------------ 6 files changed, 29 insertions(+), 30 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c463fb1..b1efe71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added +- Lazy readme properties +- BOM for kotlin-wrappers on JS +- Jupyter loader ### Changed - API validation disabled for dev versions +- Kotlin plugins are propagated downstream ### Deprecated -- bson support ### Removed +- bson support ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index 76d7f9c..6f24dd6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { } group = "ru.mipt.npm" -version = "0.9.10" +version = "0.10.0" description = "Build tools for DataForge and kscience projects" @@ -25,17 +25,17 @@ repositories { val kotlinVersion = "1.5.10" java { - targetCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_11 } -// Add plugins used in buildSrc as dependencies, also we should specify version only here dependencies { - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + api("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") + implementation("org.jetbrains.kotlin:kotlin-jupyter-api-gradle-plugin:0.10.0-53") implementation("org.jetbrains.kotlin:kotlin-serialization:$kotlinVersion") implementation("org.jetbrains.kotlinx:atomicfu-gradle-plugin:0.16.1") implementation("org.jetbrains.dokka:dokka-gradle-plugin:1.4.32") implementation("org.jetbrains.intellij.plugins:gradle-changelog-plugin:1.1.2") - implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.5.0") + implementation("org.jetbrains.kotlinx:binary-compatibility-validator:0.6.0") } project.extensions.findByType()?.apply { diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt index e7a1922..63d2c37 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceCommonPlugin.kt @@ -63,7 +63,7 @@ open class KScienceCommonPlugin : Plugin { explicitApiWarning() js(IR) { - browser{ + browser { commonWebpackConfig { cssSupport.enabled = true } @@ -72,6 +72,9 @@ open class KScienceCommonPlugin : Plugin { sourceSets["main"].apply { languageSettings.applySettings() + dependencies { + api(project.dependencies.platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${KScienceVersions.jsBom}")) + } } sourceSets["test"].apply { @@ -102,7 +105,7 @@ open class KScienceCommonPlugin : Plugin { } js(IR) { - browser{ + browser { commonWebpackConfig { cssSupport.enabled = true } @@ -110,7 +113,11 @@ open class KScienceCommonPlugin : Plugin { } sourceSets.invoke { - val commonMain by getting + val commonMain by getting { + dependencies { + api(project.dependencies.platform("org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom:${KScienceVersions.jsBom}")) + } + } val commonTest by getting { dependencies { implementation(kotlin("test-common")) diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index 711ae06..dee6d7d 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -2,8 +2,6 @@ package ru.mipt.npm.gradle import org.gradle.api.Project import org.gradle.api.plugins.ApplicationPlugin -import org.gradle.api.publish.maven.plugins.MavenPublishPlugin -import org.gradle.kotlin.dsl.apply import org.gradle.kotlin.dsl.findByType import org.jetbrains.kotlin.gradle.dsl.KotlinJsProjectExtension import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension @@ -133,6 +131,13 @@ class KScienceExtension(val project: Project) { ) } + /** + * Apply jupyter plugin + */ + fun useJupyter() { + project.plugins.apply("org.jetbrains.kotlin.jupyter.api") + } + /** * Mark this module as an application module. JVM application should be enabled separately */ @@ -160,11 +165,6 @@ class KScienceExtension(val project: Project) { } } } - - @Deprecated("Replace by applying maven-publish plugin") - fun publish() { - project.plugins.apply(MavenPublishPlugin::class) - } } internal fun Project.registerKScienceExtension() { diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt index df0b3d5..06ada3c 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt @@ -6,7 +6,7 @@ import org.gradle.api.JavaVersion * Build constants */ object KScienceVersions { - const val kotlinVersion = "1.5.0" + const val kotlinVersion = "1.5.10" const val kotlinxNodeVersion = "0.0.7" const val coroutinesVersion = "1.5.0" const val serializationVersion = "1.2.1" @@ -14,12 +14,12 @@ object KScienceVersions { const val ktorVersion = "1.6.0" const val htmlVersion = "0.7.3" const val dateTimeVersion = "0.2.1" + const val jsBom = "0.0.1-pre.213-kotlin-1.5.10" val JVM_TARGET = JavaVersion.VERSION_11 object Serialization{ const val xmlVersion = "0.82.0" - const val bsonVersion = "0.4.4" const val yamlKtVersion = "0.9.0" } } diff --git a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt index a87ee2b..62873c0 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/SerializationTargets.kt @@ -2,7 +2,6 @@ package ru.mipt.npm.gradle import org.gradle.api.Project import ru.mipt.npm.gradle.internal.useCommonDependency -import ru.mipt.npm.gradle.internal.useDependency class SerializationTargets( val sourceSet: DependencySourceSet, @@ -58,15 +57,4 @@ class SerializationTargets( dependencyConfiguration = configuration ) } - - @Deprecated("To be removed") - fun Project.bson( - version: String = KScienceVersions.Serialization.bsonVersion - ) { - useDependency( - "jvm" to "com.github.jershell:kbson:$version", - dependencySourceSet = sourceSet, - dependencyConfiguration = configuration - ) - } } From 663f2ea6309e7f9c4b15a245b9ca8eb3d6b0c7ee Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 19 Jun 2021 14:10:40 +0300 Subject: [PATCH 16/16] update readme --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1efe71..ee5ca99 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security +## [0.10.0] +### Added - Lazy readme properties - BOM for kotlin-wrappers on JS - Jupyter loader