Skip to content

Commit 20ff2b3

Browse files
authored
Merge pull request #130 from DmPanov/dmpanov/allworknoplay
IJI-2871 the legacy Sonatype publication mechanism is dropped
2 parents 2a28eab + 21116cc commit 20ff2b3

File tree

2 files changed

+8
-37
lines changed

2 files changed

+8
-37
lines changed

build.gradle.kts

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import jetbrains.sign.GpgSignSignatoryProvider
21
import org.gradle.jvm.tasks.Jar
32
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
43
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
@@ -20,33 +19,18 @@ import plugins.publishing.*
2019
* limitations under the License.
2120
*/
2221

23-
buildscript {
24-
repositories {
25-
maven { url = uri("https://packages.jetbrains.team/maven/p/jcs/maven") }
26-
}
27-
dependencies {
28-
classpath("com.jetbrains:jet-sign:38")
29-
}
30-
}
31-
3222
repositories {
3323
mavenCentral()
3424
}
3525

3626
plugins {
3727
kotlin("multiplatform") version "1.9.22"
38-
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
3928
`maven-publish`
40-
signing
4129
java
4230
}
4331

44-
var projectVersion = project.findProperty("projectVersion") as String
45-
val publishingUser: String? = System.getenv("PUBLISHING_USER")
46-
val publishingPassword: String? = System.getenv("PUBLISHING_PASSWORD")
47-
if (publishingPassword == null) {
48-
projectVersion += "-SNAPSHOT"
49-
}
32+
val projectVersion = project.findProperty("projectVersion") as String
33+
5034
println("##teamcity[setParameter name='java.annotations.version' value='$projectVersion']")
5135

5236
// https://github.com/gradle/gradle/issues/847
@@ -200,15 +184,6 @@ tasks {
200184
}
201185
}
202186

203-
nexusPublishing {
204-
repositories {
205-
sonatype {
206-
username.set(publishingUser)
207-
password.set(publishingPassword)
208-
}
209-
}
210-
}
211-
212187
configurations {
213188
create("javaOnlySourcesElements") {
214189
copyAttributes(configurations.findByName("jvmSourcesElements")!!.attributes, attributes)
@@ -230,6 +205,11 @@ artifacts {
230205
}
231206

232207
publishing {
208+
repositories {
209+
maven {
210+
setUrl(layout.buildDirectory.dir("maven-central-artifacts"))
211+
}
212+
}
233213
val artifactBaseName = base.archivesName.get()
234214
configureMultiModuleMavenPublishing {
235215
val rootModule = module("rootModule") {
@@ -310,12 +290,3 @@ fun MavenPublication.configureKotlinPomAttributes(
310290
}
311291
}
312292
}
313-
314-
signing {
315-
sign(publishing.publications)
316-
signatories = GpgSignSignatoryProvider()
317-
}
318-
319-
tasks.register("signAll") {
320-
dependsOn(tasks.withType<Sign>())
321-
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#
1616

17-
projectVersion=26.0.2
17+
projectVersion=26.0.2-1
1818
kotlin.code.style=official
1919
kotlin.mpp.stability.nowarn=true
2020
kotlin.stdlib.default.dependency=false

0 commit comments

Comments
 (0)