This commit is contained in:
Alexander Nozik 2022-12-31 12:32:53 +03:00
parent 6de53f5c0a
commit e2a342751d
6 changed files with 59 additions and 59 deletions

View File

@ -1,48 +1,55 @@
# Changelog # Changelog
All notable changes to this project will be documented in this file. 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/), 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). 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 ### Added
- Public `isInDevelopment` project flag - Public `isInDevelopment` project flag
- Add `-Xjdk-release` key
### Changed ### Changed
- Require manual pom config for publications - Require manual pom config for publications
- Kotlin 1.7.20-Beta - Kotlin 1.8.0
- Versions update - Versions update
- Project group changed to `space.kscience` - Project group changed to `space.kscience`
- Moved `yarn.lock` to `gradle` directory
### Deprecated ### Deprecated
- FX configuration - FX configuration
### Removed ### Removed
- Xjdk-release flag because it is broken until https://youtrack.jetbrains.com/issue/KT-52823 - Xjdk-release flag because it is broken until https://youtrack.jetbrains.com/issue/KT-52823
- Use CSS loader in JS by default
### Fixed ## 0.11.6-kotlin-1.7.0
### Security
## [0.11.6-kotlin-1.7.0]
### Added
### Changed ### Changed
- Coroutines tests are applied only when explicit `useCoroutines` is used. - Coroutines tests are applied only when explicit `useCoroutines` is used.
### Deprecated
### Removed ### Removed
- Atomicfu support inside the plugin - Atomicfu support inside the plugin
### Fixed ### Fixed
- Rollback coroutines to 1.6.1 - Rollback coroutines to 1.6.1
### Security ## 0.11.5-kotlin-1.7.0
## [0.11.5-kotlin-1.7.0]
### Added ### Added
- Coroutine tests as default dependency for tests - Coroutine tests as default dependency for tests
- Context receiver flag - Context receiver flag
@ -59,7 +66,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Moved signing out of sonatype block - Moved signing out of sonatype block
## [0.11.1-kotlin-1.6.10] ## 0.11.1-kotlin-1.6.10
### Added ### Added
- Default templates for README and ARTIFACT - Default templates for README and ARTIFACT
@ -69,7 +77,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- JS publication sources jar - JS publication sources jar
## [0.10.9-kotlin-1.6.10] ## 0.10.9-kotlin-1.6.10
### Added ### Added
- html builders for readme - html builders for readme
@ -81,24 +90,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- remove `nativeMain` dependency from `nativeTest` - remove `nativeMain` dependency from `nativeTest`
## [0.10.4] ## 0.10.4
### Changed ### Changed
- Kotlin 1.6 - Kotlin 1.6
### Fixed ### Fixed
- Some issues with opt-ins - Some issues with opt-ins
## [0.10.2] ## 0.10.2
### Added ### Added
- Experimental automatic JS project bundling in MPP - Experimental automatic JS project bundling in MPP
### Changed ### Changed
- Remove vcs requirement for Space publication - Remove vcs requirement for Space publication
### Fixed ## 0.10.0
-Release task (#19)
## [0.10.0]
### Added ### Added
- Lazy readme properties - Lazy readme properties
- BOM for kotlin-wrappers on JS - 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 ### Removed
- bson support - bson support
## [0.9.5] ## 0.9.5
### Added ### Added
- Disable API validation for snapshots - Disable API validation for snapshots
- `-Xjvm-default=all` on JVM - `-Xjvm-default=all` on JVM
@ -128,7 +138,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed ### Fixed
- Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0 - Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0
## [0.9.0] ## 0.9.0
### Added ### Added
- Skip sonatype publishing for dev versions - 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 ### Removed
- Bintray publishing - Bintray publishing
## [0.8.4] ## 0.8.4
### Added ### Added
- Adaptive support for host OS in native - Adaptive support for host OS in native
- CSS support for JS targets - 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 - Release task
- Readme generation for multi-module project - Readme generation for multi-module project
## [0.8.1] ## 0.8.1
### Added ### Added
- Ktor version to versions - Ktor version to versions
- Add sonatype publishing - 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 publishing load order for sonatype
- Fix root project readme - Fix root project readme
## [0.7.4] ## 0.7.4
### Added ### Added
- Changelog plugin automatically applied to `project`. - Changelog plugin automatically applied to `project`.
- Feature matrix and Readme generation task for a `project` plugin. - 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 ### Removed
- `useDokka` method. Documentation jar should be added manually if needed. - `useDokka` method. Documentation jar should be added manually if needed.
## [0.6.0] ## 0.6.0
### Added ### Added
- Migrate to kotlin 1.4.0 - Migrate to kotlin 1.4.0
- Separate Native (current platform) and nodeJs plugins. - Separate Native (current platform) and nodeJs plugins.
- Add `application()` toggle in plugin configuration to produce binaries on JS and applicaion plugin on jvm. - Add `application()` toggle in plugin configuration to produce binaries on JS and applicaion plugin on jvm.
- Add `publish` to expose publishing configuration. - Add `publish` to expose publishing configuration.
### Changed ## 0.5.2
-Publishing in bintray now is automatic.
## [0.5.2]
### Added ### Added
- Copy resources for jvm modules and jvm source sets in mpp. - Copy resources for jvm modules and jvm source sets in mpp.

View File

@ -1,7 +1,6 @@
plugins { plugins {
alias(libs.plugins.changelog) alias(libs.plugins.changelog)
alias(libs.plugins.dokka) alias(libs.plugins.dokka)
alias(libs.plugins.kotlin.jvm)
`java-gradle-plugin` `java-gradle-plugin`
`kotlin-dsl` `kotlin-dsl`
`maven-publish` `maven-publish`

View File

@ -1,12 +1,12 @@
[versions] [versions]
tools = "0.13.3-kotlin-1.8.0-Beta" tools = "0.13.4-kotlin-1.8.0"
kotlin = "1.8.0-Beta" kotlin = "1.8.0"
atomicfu = "0.18.5" atomicfu = "0.18.5"
binary-compatibility-validator = "0.12.1" binary-compatibility-validator = "0.12.1"
changelog = "2.0.0" changelog = "2.0.0"
dokka = "1.7.10" dokka = "1.7.20"
kotlin-jupyter = "0.11.0-176" kotlin-jupyter = "0.11.0-216"
kotlinx-benchmark = "0.4.5" kotlinx-benchmark = "0.4.7"
kotlinx-cli = "0.3.5" kotlinx-cli = "0.3.5"
kotlinx-coroutines = "1.6.4" kotlinx-coroutines = "1.6.4"
kotlinx-datetime = "0.4.0" kotlinx-datetime = "0.4.0"
@ -14,10 +14,10 @@ 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.4.1" kotlinx-serialization = "1.4.1"
ktor = "2.1.3" ktor = "2.2.1"
xmlutil = "0.84.3" xmlutil = "0.84.3"
yamlkt = "0.12.0" yamlkt = "0.12.0"
jsBom = "1.0.0-pre.423" jsBom = "1.0.0-pre.466"
junit = "5.8.2" junit = "5.8.2"
[libraries] [libraries]

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists 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 zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -281,6 +281,10 @@ public open class KScienceProjectPlugin : Plugin<Project> {
logger.warn("API validation is disabled for snapshot or dev version") 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<org.jetbrains.kotlin.gradle.targets.js.yarn.YarnRootExtension>().lockFileDirectory = rootDir.resolve("gradle")
}
} }
public companion object { public companion object {

View File

@ -81,15 +81,7 @@ public fun Project.configureKScience(
//logger.info("Applying KScience configuration for JS project") //logger.info("Applying KScience configuration for JS project")
configure<KotlinJsProjectExtension> { configure<KotlinJsProjectExtension> {
js(IR) { js(IR) { browser { } }
browser {
commonWebpackConfig {
cssSupport {
enabled.set(true)
}
}
}
}
sourceSets.all { sourceSets.all {
languageSettings.applySettings(kotlinVersion) languageSettings.applySettings(kotlinVersion)
@ -129,15 +121,7 @@ public fun Project.configureKScience(
} }
} }
js(IR) { js(IR) { browser { } }
browser {
commonWebpackConfig {
cssSupport {
enabled.set(true)
}
}
}
}
sourceSets { sourceSets {
val commonMain by getting { val commonMain by getting {