From 0ba70aba5ce8b1e3dc350c5c4e16fd168f1b5aa9 Mon Sep 17 00:00:00 2001 From: Alexander Nozik Date: Sun, 12 Jun 2022 11:15:11 +0300 Subject: [PATCH] 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 */