Merge pull request #45 from mipt-npm/dev

0.11.6

CHANGELOG.md

@@ -18,40 +18,44 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
+## [0.11.6-kotlin-1.7.0]
+### Added
+
+### Changed
+
+### Deprecated
+
+### Removed
+- Atomicfu support inside the plugin
+
+### Fixed
+
+### Security
+
 ## [0.11.5-kotlin-1.7.0]
 ### Added
 - 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
 
@@ -59,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 `<version>-kotlin-<kotlin version>`
 
-
 ### Fixed
 - remove `nativeMain` dependency from `nativeTest`
 
@@ -73,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
 
@@ -81,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)
 
@@ -95,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
 
@@ -109,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
 
@@ -128,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
 
@@ -146,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
@@ -163,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.
@@ -171,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
@@ -189,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.
@@ -200,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.
 
@@ -216,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.
 

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`
@@ -28,12 +28,11 @@ kotlin.explicitApiWarning()
 
 dependencies {
     api(libs.kotlin.gradle)
-    implementation(libs.atomicfu.gradle)
     implementation(libs.binary.compatibility.validator)
     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

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-tools = "0.11.5-kotlin-1.7.0"
+tools = "0.11.6-kotlin-1.7.0"
 kotlin = "1.7.0"
 atomicfu = "0.17.3"
 binary-compatibility-validator = "0.9.0"

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<AtomicFUGradlePlugin>()
-        useCommonDependency(
-            "org.jetbrains.kotlinx:atomicfu:$version",
-            dependencySourceSet = sourceSet,
-            dependencyConfiguration = configuration
-        )
-    }
-
     /**
      * Use core serialization library and configure targets
      */