diff --git a/build.gradle.kts b/build.gradle.kts index 9c94600..5533631 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -import jetbrains.sign.GpgSignSignatoryProvider import org.gradle.jvm.tasks.Jar import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import org.jetbrains.kotlin.gradle.tasks.KotlinCompile @@ -20,33 +19,18 @@ import plugins.publishing.* * limitations under the License. */ -buildscript { - repositories { - maven { url = uri("https://packages.jetbrains.team/maven/p/jcs/maven") } - } - dependencies { - classpath("com.jetbrains:jet-sign:38") - } -} - repositories { mavenCentral() } plugins { kotlin("multiplatform") version "1.9.22" - id("io.github.gradle-nexus.publish-plugin") version "1.1.0" `maven-publish` - signing java } -var projectVersion = project.findProperty("projectVersion") as String -val publishingUser: String? = System.getenv("PUBLISHING_USER") -val publishingPassword: String? = System.getenv("PUBLISHING_PASSWORD") -if (publishingPassword == null) { - projectVersion += "-SNAPSHOT" -} +val projectVersion = project.findProperty("projectVersion") as String + println("##teamcity[setParameter name='java.annotations.version' value='$projectVersion']") // https://github.com/gradle/gradle/issues/847 @@ -200,15 +184,6 @@ tasks { } } -nexusPublishing { - repositories { - sonatype { - username.set(publishingUser) - password.set(publishingPassword) - } - } -} - configurations { create("javaOnlySourcesElements") { copyAttributes(configurations.findByName("jvmSourcesElements")!!.attributes, attributes) @@ -230,6 +205,11 @@ artifacts { } publishing { + repositories { + maven { + setUrl(layout.buildDirectory.dir("maven-central-artifacts")) + } + } val artifactBaseName = base.archivesName.get() configureMultiModuleMavenPublishing { val rootModule = module("rootModule") { @@ -310,12 +290,3 @@ fun MavenPublication.configureKotlinPomAttributes( } } } - -signing { - sign(publishing.publications) - signatories = GpgSignSignatoryProvider() -} - -tasks.register("signAll") { - dependsOn(tasks.withType()) -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 309be6e..6de1f34 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,7 +14,7 @@ # limitations under the License. # -projectVersion=26.0.2 +projectVersion=26.0.2-1 kotlin.code.style=official kotlin.mpp.stability.nowarn=true kotlin.stdlib.default.dependency=false diff --git a/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt b/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt index 6ae5e94..9313743 100644 --- a/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt +++ b/src/commonMain/kotlin/org/jetbrains/annotations/ApiStatus.kt @@ -200,7 +200,7 @@ expect class ApiStatus private constructor() { * * Indicates that the annotated method is part of SPI (Service Provider Interface), which is intended to be * **only implemented or overridden** but not called by clients of the declaring library. - * If a class or interface is marked with this annotation it means that all its methods can be only overridden. + * If a class or interface is marked with this annotation it means that all its instance methods can be only overridden. * * * Although there is a standard mechanism of `protected` methods, it is not applicable to interface's methods. diff --git a/src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java b/src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java index 2f47e29..90f624c 100644 --- a/src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java +++ b/src/jvmMain/java/org/jetbrains/annotations/ApiStatus.java @@ -149,7 +149,7 @@ private ApiStatus() { /** *

Indicates that the annotated method is part of SPI (Service Provider Interface), which is intended to be * only implemented or overridden but not called by clients of the declaring library. - * If a class or interface is marked with this annotation it means that all its methods can be only overridden.

+ * If a class or interface is marked with this annotation it means that all its instance methods can be only overridden.

* *

Although there is a standard mechanism of {@code protected} methods, it is not applicable to interface's methods. * Also, API method may be made {@code public} to allow calls only from different parts of the declaring library but not outside it.

diff --git a/src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt b/src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt index ec33881..13f9308 100644 --- a/src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt +++ b/src/nonJvmMain/kotlin/org/jetbrains/annotations/ApiStatus.kt @@ -200,7 +200,7 @@ actual class ApiStatus private actual constructor() { * * Indicates that the annotated method is part of SPI (Service Provider Interface), which is intended to be * **only implemented or overridden** but not called by clients of the declaring library. - * If a class or interface is marked with this annotation it means that all its methods can be only overridden. + * If a class or interface is marked with this annotation it means that all its instance methods can be only overridden. * * * Although there is a standard mechanism of `protected` methods, it is not applicable to interface's methods.