From af891a21499d0b026fef89e96cf197f4922874f0 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Fri, 10 Jun 2022 20:18:00 +0300 Subject: [PATCH 1/4] remove kotlin-jvm plugin from build --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 389ecc3..ddc7545 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,7 @@ plugins { alias(libs.plugins.changelog) alias(libs.plugins.dokka) - alias(libs.plugins.kotlin.jvm) + //alias(libs.plugins.kotlin.jvm) apply false `java-gradle-plugin` `kotlin-dsl` `maven-publish` @@ -33,7 +33,7 @@ dependencies { implementation(libs.changelog.gradle) implementation(libs.dokka.gradle) implementation(libs.kotlin.jupyter.gradle) - implementation(libs.kotlin.serialization) + //implementation(libs.kotlin.serialization) implementation(libs.kotlinx.html) implementation("org.tomlj:tomlj:1.0.0") // // nexus publishing plugin From 0bea2d34a5ca1fb6c44d70ff361b0a52e1a7b3b5 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 12 Jun 2022 10:44:03 +0300 Subject: [PATCH 2/4] roll back atomicfu to 0.17.2 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 83ff673..41c3076 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] tools = "0.11.5-kotlin-1.7.0" kotlin = "1.7.0" -atomicfu = "0.17.3" +atomicfu = "0.17.2" binary-compatibility-validator = "0.9.0" changelog = "1.3.1" dokka = "1.6.21" From 0ba70aba5ce8b1e3dc350c5c4e16fd168f1b5aa9 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 12 Jun 2022 11:15:11 +0300 Subject: [PATCH 3/4] 0.11.6. Remove atomicfu from the plugin --- CHANGELOG.md | 1 + build.gradle.kts | 1 - gradle/libs.versions.toml | 4 ++-- .../ru/mipt/npm/gradle/KScienceExtension.kt | 17 ----------------- 4 files changed, 3 insertions(+), 20 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 581f827..099bb86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated ### Removed +- Atomicfu support inside the plugin ### Fixed diff --git a/build.gradle.kts b/build.gradle.kts index ddc7545..1566a36 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -28,7 +28,6 @@ kotlin.explicitApiWarning() dependencies { api(libs.kotlin.gradle) - implementation(libs.atomicfu.gradle) implementation(libs.binary.compatibility.validator) implementation(libs.changelog.gradle) implementation(libs.dokka.gradle) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 41c3076..5da12c1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] -tools = "0.11.5-kotlin-1.7.0" +tools = "0.11.6-kotlin-1.7.0" kotlin = "1.7.0" -atomicfu = "0.17.2" +atomicfu = "0.17.3" binary-compatibility-validator = "0.9.0" changelog = "1.3.1" dokka = "1.6.21" diff --git a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt index 5a3740f..4654e55 100644 --- a/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt +++ b/src/main/kotlin/ru/mipt/npm/gradle/KScienceExtension.kt @@ -1,6 +1,5 @@ package ru.mipt.npm.gradle -import kotlinx.atomicfu.plugin.gradle.AtomicFUGradlePlugin import org.gradle.api.Project import org.gradle.api.plugins.ApplicationPlugin import org.gradle.kotlin.dsl.apply @@ -57,22 +56,6 @@ public class KScienceExtension(public val project: Project) { dependencyConfiguration = configuration ) - /** - * Use kotlinx-atomicfu plugin and library - */ - public fun useAtomic( - version: String = KScienceVersions.atomicVersion, - sourceSet: DependencySourceSet = DependencySourceSet.MAIN, - configuration: DependencyConfiguration = DependencyConfiguration.IMPLEMENTATION, - ): Unit = project.run { - apply() - useCommonDependency( - "org.jetbrains.kotlinx:atomicfu:$version", - dependencySourceSet = sourceSet, - dependencyConfiguration = configuration - ) - } - /** * Use core serialization library and configure targets */ From 89bc45cd1cfa051c0f2c7e0643124ecbef509e01 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 12 Jun 2022 11:18:02 +0300 Subject: [PATCH 4/4] patch changelog --- CHANGELOG.md | 45 +++++++++++++-------------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 099bb86..7ae52d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Deprecated +### Removed + +### Fixed + +### Security + +## [0.11.6-kotlin-1.7.0] +### Added + +### Changed + +### Deprecated + ### Removed - Atomicfu support inside the plugin @@ -24,35 +37,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Coroutine tests as default dependency for tests - Context receiver flag - ### Changed - Separate release tasks for each target - Kotlin 1.7.0 - Ktor 2.0.1 - ExplicitAPI does not override existing value - -### Deprecated - ### Removed - Ktor specific artifacts from version catalog - ### Fixed - Moved signing out of sonatype block - -### Security - ## [0.11.1-kotlin-1.6.10] ### Added - Default templates for README and ARTIFACT - ### Changed - Replaced Groovy templates by FreeMarker - ### Fixed - JS publication sources jar @@ -60,13 +63,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - html builders for readme - ### Changed - Kotlin 1.6.0 - Use indy lambdas by default #32 - Change version scheme to `-kotlin-` - ### Fixed - remove `nativeMain` dependency from `nativeTest` @@ -74,7 +75,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Kotlin 1.6 - ### Fixed - Some issues with opt-ins @@ -82,11 +82,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Experimental automatic JS project bundling in MPP - ### Changed - Remove vcs requirement for Space publication - ### Fixed -Release task (#19) @@ -96,12 +94,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - BOM for kotlin-wrappers on JS - Jupyter loader - ### Changed - API validation disabled for dev versions - Kotlin plugins are propagated downstream - ### Removed - bson support @@ -110,18 +106,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Disable API validation for snapshots - `-Xjvm-default=all` on JVM - ### Changed - `publication.platform` changed to `publishing.platform` - Dokka version to `1.4.30` - `useDateTime` in extension - Kotlin 1.5 - ### Removed - Publish plugin. Use MavenPublish instead - ### Fixed - Removed unnecessary `afterEvaluate` for compatibility with gradle 7.0 @@ -129,16 +122,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Skip sonatype publishing for dev versions - ### Changed - Publishing repositories are explicit and defined in the top level project - Paths to publishing properties now use dot notation like `publishing.github.user` - ### Deprecated - Publishing plugin - ### Removed - Bintray publishing @@ -147,12 +137,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Adaptive support for host OS in native - CSS support for JS targets - ### Changed - Kotlin 1.4.31 - Coroutines 1.4.3 - ### Fixed - Plugin loading order for publishing - Release task @@ -164,7 +152,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Add sonatype publishing - Per-platform release publishing - ### Changed - Kotlin to 1.4.30 stable. - Added intermediate jsCommon main/test sourcesSet for node plugin. @@ -172,11 +159,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Common plugin id changed to `common` - Plugins group changed to `ru.mipt.npm` with `gradle` prefix - ### Removed - kaml - ### Fixed - Fix publishing load order for sonatype - Fix root project readme @@ -190,7 +175,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Moved all logic to a common plugin, leaving only proxies for platform plugins - Suppress API validation for modules with maturity below DEVELOPMENT - ### Changed - Remove node plugin. Node binaries should be turned on manually. - Use default webpack distribution path. @@ -201,12 +185,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Moved internals to internals - Kotlin 1.4.30-RC - ### Deprecated - Support of `kaml` and `snake-yaml` in favor of `yamlKt` - Publish plugin - ### Removed - `useDokka` method. Documentation jar should be added manually if needed. @@ -217,7 +199,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - 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.