Remove bintray references

5 files changed, 2 insertions, 59 deletions

diff --git a/atomicfu-gradle-plugin/src/test/kotlin/kotlinx/atomicfu/plugin/gradle/Project.kt b/atomicfu-gradle-plugin/src/test/kotlin/kotlinx/atomicfu/plugin/gradle/Project.kt
index f3f49e1..f2e06a9 100644
--- a/atomicfu-gradle-plugin/src/test/kotlin/kotlinx/atomicfu/plugin/gradle/Project.kt
+++ b/atomicfu-gradle-plugin/src/test/kotlin/kotlinx/atomicfu/plugin/gradle/Project.kt
@@ -84,8 +84,6 @@ class Project(val projectDir: File) {
                     jcenter()
                     mavenCentral()
                     maven { url 'https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev' }
-                    maven { url 'https://dl.bintray.com/kotlin/kotlin-eap' }
-                    maven { url 'https://dl.bintray.com/kotlin/kotlin-dev' }
                     maven { url 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev' }
                     maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
                 }
diff --git a/atomicfu-maven-plugin/build.gradle b/atomicfu-maven-plugin/build.gradle
index 8929be9..b48d856 100644
--- a/atomicfu-maven-plugin/build.gradle
+++ b/atomicfu-maven-plugin/build.gradle
@@ -44,25 +44,10 @@ task generatePomFile(dependsOn: [compileKotlin, ':atomicfu-transformer:publishTo
                     }
                     appendNode('repositories').with {
                         appendNode('repository').with {
-                            appendNode('id', 'kotlin-eap')
-                            appendNode('url', 'https://kotlin.bintray.com/kotlin-eap')
-                        }
-
-                        appendNode('repository').with {
-                            appendNode('id', 'kotlin-dev')
-                            appendNode('url', 'https://kotlin.bintray.com/kotlin-dev')
-                        }
-
-                        appendNode('repository').with {
                             appendNode('id', 'dev')
                             appendNode('url', 'https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev')
                         }
 
-                        appendNode('repository').with {
-                            appendNode('id', 'kotlinx')
-                            appendNode('url', 'https://kotlin.bintray.com/kotlinx')
-                        }
-
                         if (buildSnapshots) {
                             appendNode('repository').with {
                                 appendNode('id', 'kotlin-snapshots')
diff --git a/build.gradle b/build.gradle
index 12f531d..09a62fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,15 +34,6 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" }
         // Future replacement for kotlin-dev, with cache redirector
         maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
-        maven {
-            url "https://kotlin.bintray.com/kotlin-dev"
-            credentials {
-                username = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') ?: ""
-                password = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') ?: ""
-            }
-        }
-        maven { url "https://kotlin.bintray.com/kotlin-eap" }
-        maven { url "https://jetbrains.bintray.com/kotlin-native-dependencies" }
         maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
     }
     
@@ -66,17 +57,8 @@ allprojects {
     println "Using Kotlin $kotlin_version for project $it"
     repositories {
         jcenter()
-        maven { url "https://kotlin.bintray.com/kotlin-eap" }
         // Future replacement for kotlin-dev, with cache redirector
         maven { url "https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
-        maven {
-            url "https://kotlin.bintray.com/kotlin-dev"
-            credentials {
-                username = project.hasProperty('bintrayUser') ? project.property('bintrayUser') : System.getenv('BINTRAY_USER') ?: ""
-                password = project.hasProperty('bintrayApiKey') ? project.property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY') ?: ""
-            }
-        }
-        maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/dev" }
     }
 
diff --git a/buildSrc/src/main/kotlin/Publishing.kt b/buildSrc/src/main/kotlin/Publishing.kt
index 6844ad7..3db911f 100644
--- a/buildSrc/src/main/kotlin/Publishing.kt
+++ b/buildSrc/src/main/kotlin/Publishing.kt
@@ -44,20 +44,6 @@ fun MavenPom.configureMavenCentralMetadata(project: Project) {
     }
 }
 
-fun configureBintrayPublication(rh: RepositoryHandler, project: Project) {
-    rh.maven {
-        val user = "kotlin"
-        val repo = "kotlinx"
-        val name = "kotlinx.atomicfu"
-        url = URI("https://api.bintray.com/maven/$user/$repo/$name/;publish=0;override=0")
-
-        credentials {
-            username = project.findProperty("bintrayUser") as? String ?: System.getenv("BINTRAY_USER")
-            password = project.findProperty("bintrayApiKey") as? String ?: System.getenv("BINTRAY_API_KEY")
-        }
-    }
-}
-
 fun mavenRepositoryUri(): URI {
     // TODO -SNAPSHOT detection can be made here as well
     val repositoryId: String? = System.getenv("libs.repository.id")
diff --git a/gradle/publishing.gradle b/gradle/publishing.gradle
index 0ca4788..e9e4372 100644
--- a/gradle/publishing.gradle
+++ b/gradle/publishing.gradle
@@ -27,15 +27,9 @@ task javadocJar(type: Jar) {
     archiveClassifier = 'javadoc'
 }
 
-def bintrayUpload = System.getenv("libs.bintray.upload") != null
-
 publishing {
     repositories { // this: closure
-        if (bintrayUpload) {
-            PublishingKt.configureBintrayPublication(delegate, project)
-        } else {
-            PublishingKt.configureMavenPublication(delegate, project)
-        }
+        PublishingKt.configureMavenPublication(delegate, project)
     }
     
     if (!isMultiplatform) {
@@ -61,9 +55,7 @@ publishing {
 
     publications.all {
         PublishingKt.configureMavenCentralMetadata(pom, project)
-        if (!bintrayUpload) {
-            PublishingKt.signPublicationIfKeyPresent(project, it)
-        }
+        PublishingKt.signPublicationIfKeyPresent(project, it)
 
         // add empty javadocs
         if (it.name != "kotlinMultiplatform") { // The root module gets the JVM's javadoc JAR