Skip to content

Commit fb2a88f

Browse files
committed
Remove bintray references
1 parent c925ee6 commit fb2a88f

File tree

5 files changed

+2
-59
lines changed

5 files changed

+2
-59
lines changed

atomicfu-gradle-plugin/src/test/kotlin/kotlinx/atomicfu/plugin/gradle/Project.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@ class Project(val projectDir: File) {
8484
jcenter()
8585
mavenCentral()
8686
maven { url 'https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev' }
87-
maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
88-
maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
8987
maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev' }
9088
maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
9189
}

atomicfu-maven-plugin/build.gradle

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,26 +43,11 @@ task generatePomFile(dependsOn: [compileKotlin, ':atomicfu-transformer:publishTo
4343
appendNode('project.build.sourceEncoding', 'UTF-8')
4444
}
4545
appendNode('repositories').with {
46-
appendNode('repository').with {
47-
appendNode('id', 'kotlin-eap')
48-
appendNode('url', 'https://kotlin.bintray.com/kotlin-eap')
49-
}
50-
51-
appendNode('repository').with {
52-
appendNode('id', 'kotlin-dev')
53-
appendNode('url', 'https://kotlin.bintray.com/kotlin-dev')
54-
}
55-
5646
appendNode('repository').with {
5747
appendNode('id', 'dev')
5848
appendNode('url', 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev')
5949
}
6050

61-
appendNode('repository').with {
62-
appendNode('id', 'kotlinx')
63-
appendNode('url', 'https://kotlin.bintray.com/kotlinx')
64-
}
65-
6651
if (buildSnapshots) {
6752
appendNode('repository').with {
6853
appendNode('id', 'kotlin-snapshots')

build.gradle

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,6 @@ buildscript {
3434
maven { url "https://plugins.gradle.org/m2/" }
3535
// Future replacement for kotlin-dev, with cache redirector
3636
maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
37-
maven {
38-
url "https://kotlin.bintray.com/kotlin-dev"
39-
credentials {
40-
username = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') ?: ""
41-
password = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') ?: ""
42-
}
43-
}
44-
maven { url "https://kotlin.bintray.com/kotlin-eap" }
45-
maven { url "https://jetbrains.bintray.com/kotlin-native-dependencies" }
4637
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
4738
}
4839

@@ -66,17 +57,8 @@ allprojects {
6657
println "Using Kotlin $kotlin_version for project $it"
6758
repositories {
6859
jcenter()
69-
maven { url "https://kotlin.bintray.com/kotlin-eap" }
7060
// Future replacement for kotlin-dev, with cache redirector
7161
maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
72-
maven {
73-
url "https://kotlin.bintray.com/kotlin-dev"
74-
credentials {
75-
username = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') ?: ""
76-
password = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') ?: ""
77-
}
78-
}
79-
maven { url "https://kotlin.bintray.com/kotlinx" }
8062
maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
8163
}
8264

buildSrc/src/main/kotlin/Publishing.kt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,6 @@ fun MavenPom.configureMavenCentralMetadata(project: Project) {
4444
}
4545
}
4646

47-
fun configureBintrayPublication(rh: RepositoryHandler, project: Project) {
48-
rh.maven {
49-
val user = "kotlin"
50-
val repo = "kotlinx"
51-
val name = "kotlinx.atomicfu"
52-
url = URI("https://api.bintray.com/maven/$user/$repo/$name/;publish=0;override=0")
53-
54-
credentials {
55-
username = project.findProperty("bintrayUser") as? String ?: System.getenv("BINTRAY_USER")
56-
password = project.findProperty("bintrayApiKey") as? String ?: System.getenv("BINTRAY_API_KEY")
57-
}
58-
}
59-
}
60-
6147
fun mavenRepositoryUri(): URI {
6248
// TODO -SNAPSHOT detection can be made here as well
6349
val repositoryId: String? = System.getenv("libs.repository.id")

gradle/publishing.gradle

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,9 @@ task javadocJar(type: Jar) {
2727
archiveClassifier = 'javadoc'
2828
}
2929

30-
def bintrayUpload = System.getenv("libs.bintray.upload") != null
31-
3230
publishing {
3331
repositories { // this: closure
34-
if (bintrayUpload) {
35-
PublishingKt.configureBintrayPublication(delegate, project)
36-
} else {
37-
PublishingKt.configureMavenPublication(delegate, project)
38-
}
32+
PublishingKt.configureMavenPublication(delegate, project)
3933
}
4034

4135
if (!isMultiplatform) {
@@ -61,9 +55,7 @@ publishing {
6155

6256
publications.all {
6357
PublishingKt.configureMavenCentralMetadata(pom, project)
64-
if (!bintrayUpload) {
65-
PublishingKt.signPublicationIfKeyPresent(project, it)
66-
}
58+
PublishingKt.signPublicationIfKeyPresent(project, it)
6759

6860
// add empty javadocs
6961
if (it.name != "kotlinMultiplatform") { // The root module gets the JVM's javadoc JAR

0 commit comments

Comments
 (0)