From fed57ab63b023b11f43c12cb428afc63de186048 Mon Sep 17 00:00:00 2001 From: nikky Date: Fri, 1 Oct 2021 13:06:38 +0200 Subject: [PATCH 1/2] add plugin publishing configuration --- atomicfu-gradle-plugin/build.gradle | 31 +++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/atomicfu-gradle-plugin/build.gradle b/atomicfu-gradle-plugin/build.gradle index 28091b61..dd6fe8ea 100644 --- a/atomicfu-gradle-plugin/build.gradle +++ b/atomicfu-gradle-plugin/build.gradle @@ -2,8 +2,21 @@ * Copyright 2017-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. */ +buildscript { + repositories { + maven { + url "https://plugins.gradle.org/m2/" + } + } + dependencies { + classpath "com.gradle.publish:plugin-publish-plugin:0.16.0" + } +} + apply plugin: 'kotlin' apply plugin: 'java-gradle-plugin' +apply plugin: 'maven-publish' +apply plugin: "com.gradle.plugin-publish" if (rootProject.ext.jvm_ir_enabled) { kotlin.target.compilations.all { @@ -73,3 +86,21 @@ task createClasspathManifest { dependencies { testRuntime files(createClasspathManifest) } + +gradlePlugin { + plugins { + create("atomicfu") { + id = "kotlinx-atomicfu" + displayName = "Kotlinx Atomicfu Plugin" + description = "The idiomatic way to use atomic operations in Kotlin " + implementationClass = "kotlinx.atomicfu.plugin.gradle.AtomicFUGradlePlugin" + } + } +} + +pluginBundle { + website = "https://github.com/Kotlin/kotlinx.atomicfu" + vcsUrl = "https://github.com/Kotlin/kotlinx.atomicfu" + tags = ["kotlin", "atomic", "kotlinx"] +} + From f76b76afb07c73d893fc1d5405c0c8e1e79a8a45 Mon Sep 17 00:00:00 2001 From: mvicsokolova Date: Thu, 21 Oct 2021 14:27:13 +0300 Subject: [PATCH 2/2] Publishing configs fixed --- atomicfu-gradle-plugin/build.gradle | 30 ++++++++++------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/atomicfu-gradle-plugin/build.gradle b/atomicfu-gradle-plugin/build.gradle index dd6fe8ea..3f326b35 100644 --- a/atomicfu-gradle-plugin/build.gradle +++ b/atomicfu-gradle-plugin/build.gradle @@ -2,22 +2,13 @@ * Copyright 2017-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license. */ -buildscript { - repositories { - maven { - url "https://plugins.gradle.org/m2/" - } - } - dependencies { - classpath "com.gradle.publish:plugin-publish-plugin:0.16.0" - } +plugins { + id 'kotlin' + id 'java-gradle-plugin' + id 'maven-publish' + id 'com.gradle.plugin-publish' version '0.16.0' } -apply plugin: 'kotlin' -apply plugin: 'java-gradle-plugin' -apply plugin: 'maven-publish' -apply plugin: "com.gradle.plugin-publish" - if (rootProject.ext.jvm_ir_enabled) { kotlin.target.compilations.all { kotlinOptions.useIR = true @@ -89,10 +80,10 @@ dependencies { gradlePlugin { plugins { - create("atomicfu") { - id = "kotlinx-atomicfu" + create("kotlinx-atomicfu") { + id = "org.jetbrains.kotlinx.atomicfu" displayName = "Kotlinx Atomicfu Plugin" - description = "The idiomatic way to use atomic operations in Kotlin " + description = "The idiomatic way to use atomic operations in Kotlin" implementationClass = "kotlinx.atomicfu.plugin.gradle.AtomicFUGradlePlugin" } } @@ -100,7 +91,6 @@ gradlePlugin { pluginBundle { website = "https://github.com/Kotlin/kotlinx.atomicfu" - vcsUrl = "https://github.com/Kotlin/kotlinx.atomicfu" + vcsUrl = "https://github.com/Kotlin/kotlinx.atomicfu.git" tags = ["kotlin", "atomic", "kotlinx"] -} - +} \ No newline at end of file