From e2a342751d53917446d86117017eb069c3075824 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sat, 31 Dec 2022 12:32:53 +0300 Subject: [PATCH] 1.8.0 --- CHANGELOG.md | 77 +++++++++++-------- build.gradle.kts | 1 - gradle/libs.versions.toml | 14 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- .../kscience/gradle/KScienceProjectPlugin.kt | 4 + .../kscience/gradle/commonConfigurations.kt | 20 +---- 6 files changed, 59 insertions(+), 59 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31ae7d8..c18235d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,48 +1,55 @@ # Changelog - All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## Unreleased + +### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security + +## 0.13.4-kotlin-1.8.0 - 2022-12-31 + ### Added - Public `isInDevelopment` project flag -- Add `-Xjdk-release` key ### Changed - Require manual pom config for publications -- Kotlin 1.7.20-Beta +- Kotlin 1.8.0 - Versions update - Project group changed to `space.kscience` +- Moved `yarn.lock` to `gradle` directory ### Deprecated - FX configuration ### Removed - Xjdk-release flag because it is broken until https://youtrack.jetbrains.com/issue/KT-52823 +- Use CSS loader in JS by default -### Fixed - -### Security - -## [0.11.6-kotlin-1.7.0] -### Added +## 0.11.6-kotlin-1.7.0 ### Changed - Coroutines tests are applied only when explicit `useCoroutines` is used. -### Deprecated - ### Removed - Atomicfu support inside the plugin ### Fixed - Rollback coroutines to 1.6.1 -### Security +## 0.11.5-kotlin-1.7.0 -## [0.11.5-kotlin-1.7.0] ### Added - Coroutine tests as default dependency for tests - Context receiver flag @@ -59,7 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Moved signing out of sonatype block -## [0.11.1-kotlin-1.6.10] +## 0.11.1-kotlin-1.6.10 + ### Added - Default templates for README and ARTIFACT @@ -69,36 +77,37 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - JS publication sources jar -## [0.10.9-kotlin-1.6.10] +## 0.10.9-kotlin-1.6.10 + ### Added - html builders for readme ### Changed - Kotlin 1.6.0 -- Use indy lambdas by default #32 +- Use indy lambdas by default #32 - Change version scheme to `-kotlin-` ### Fixed - remove `nativeMain` dependency from `nativeTest` -## [0.10.4] +## 0.10.4 + ### Changed - Kotlin 1.6 ### Fixed - Some issues with opt-ins -## [0.10.2] +## 0.10.2 + ### Added - Experimental automatic JS project bundling in MPP ### Changed - Remove vcs requirement for Space publication -### Fixed --Release task (#19) +## 0.10.0 -## [0.10.0] ### Added - Lazy readme properties - BOM for kotlin-wrappers on JS @@ -111,7 +120,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - bson support -## [0.9.5] +## 0.9.5 + ### Added - Disable API validation for snapshots - `-Xjvm-default=all` on JVM @@ -128,7 +138,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0 -## [0.9.0] +## 0.9.0 + ### Added - Skip sonatype publishing for dev versions @@ -142,7 +153,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - Bintray publishing -## [0.8.4] +## 0.8.4 + ### Added - Adaptive support for host OS in native - CSS support for JS targets @@ -156,7 +168,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Release task - Readme generation for multi-module project -## [0.8.1] +## 0.8.1 + ### Added - Ktor version to versions - Add sonatype publishing @@ -176,7 +189,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fix publishing load order for sonatype - Fix root project readme -## [0.7.4] +## 0.7.4 + ### Added - Changelog plugin automatically applied to `project`. - Feature matrix and Readme generation task for a `project` plugin. @@ -202,16 +216,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - `useDokka` method. Documentation jar should be added manually if needed. -## [0.6.0] +## 0.6.0 + ### Added - Migrate to kotlin 1.4.0 - Separate Native (current platform) and nodeJs plugins. - Add `application()` toggle in plugin configuration to produce binaries on JS and applicaion plugin on jvm. - Add `publish` to expose publishing configuration. -### Changed --Publishing in bintray now is automatic. +## 0.5.2 -## [0.5.2] ### Added -- Copy resources for jvm modules and jvm source sets in mpp. \ No newline at end of file +- Copy resources for jvm modules and jvm source sets in mpp. diff --git a/build.gradle.kts b/build.gradle.kts index 00345b5..f22cdf4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,6 @@ plugins { alias(libs.plugins.changelog) alias(libs.plugins.dokka) - alias(libs.plugins.kotlin.jvm) `java-gradle-plugin` `kotlin-dsl` `maven-publish` diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 38eac58..b951e61 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,12 +1,12 @@ [versions] -tools = "0.13.3-kotlin-1.8.0-Beta" -kotlin = "1.8.0-Beta" +tools = "0.13.4-kotlin-1.8.0" +kotlin = "1.8.0" atomicfu = "0.18.5" binary-compatibility-validator = "0.12.1" changelog = "2.0.0" -dokka = "1.7.10" -kotlin-jupyter = "0.11.0-176" -kotlinx-benchmark = "0.4.5" +dokka = "1.7.20" +kotlin-jupyter = "0.11.0-216" +kotlinx-benchmark = "0.4.7" kotlinx-cli = "0.3.5" kotlinx-coroutines = "1.6.4" kotlinx-datetime = "0.4.0" @@ -14,10 +14,10 @@ kotlinx-html = "0.8.0" kotlinx-knit = "0.4.0" kotlinx-nodejs = "0.0.7" kotlinx-serialization = "1.4.1" -ktor = "2.1.3" +ktor = "2.2.1" xmlutil = "0.84.3" yamlkt = "0.12.0" -jsBom = "1.0.0-pre.423" +jsBom = "1.0.0-pre.466" junit = "5.8.2" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c68..070cb70 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.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt index 2f0a3e1..1c4b584 100644 --- a/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt +++ b/src/main/kotlin/space/kscience/gradle/KScienceProjectPlugin.kt @@ -281,6 +281,10 @@ public open class KScienceProjectPlugin : Plugin { logger.warn("API validation is disabled for snapshot or dev version") } } + + plugins.withType(org.jetbrains.kotlin.gradle.targets.js.yarn.YarnPlugin::class.java) { + rootProject.the().lockFileDirectory = rootDir.resolve("gradle") + } } public companion object { diff --git a/src/main/kotlin/space/kscience/gradle/commonConfigurations.kt b/src/main/kotlin/space/kscience/gradle/commonConfigurations.kt index 7d9fc70..37aa7e3 100644 --- a/src/main/kotlin/space/kscience/gradle/commonConfigurations.kt +++ b/src/main/kotlin/space/kscience/gradle/commonConfigurations.kt @@ -81,15 +81,7 @@ public fun Project.configureKScience( //logger.info("Applying KScience configuration for JS project") configure { - js(IR) { - browser { - commonWebpackConfig { - cssSupport { - enabled.set(true) - } - } - } - } + js(IR) { browser { } } sourceSets.all { languageSettings.applySettings(kotlinVersion) @@ -129,15 +121,7 @@ public fun Project.configureKScience( } } - js(IR) { - browser { - commonWebpackConfig { - cssSupport { - enabled.set(true) - } - } - } - } + js(IR) { browser { } } sourceSets { val commonMain by getting {