Remove dependency on bintray repos and jcenter where possible

LouisCAD · LouisCAD · commit 006e2fc9ab00 · 2021-05-04T21:59:30.000+02:00
The words bintray and jcenter still appear in the project sources,
but it's either part of test data with no actual dependency, or
it's jcenter for experiments, which is not a problem since it will
stay available for the foreseeable future, contrary to the initial
announcement.
diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts
@@ -1,6 +1,5 @@
 allprojects {
     repositories {
         mavenCentral()
-        jcenter()
     }
 }
diff --git a/plugins/buildSrc/build.gradle.kts b/plugins/buildSrc/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
diff --git a/plugins/core/src/test/kotlin/de/fayard/refreshVersions/core/MavenDependencyVersionsFetchingTest.kt b/plugins/core/src/test/kotlin/de/fayard/refreshVersions/core/MavenDependencyVersionsFetchingTest.kt
@@ -36,8 +36,8 @@ class MavenDependencyVersionsFetchingTest {
                 ),
                 currentVersion = Version("1.3.50"),
                 repoUrls = listOf(
-                    "https://dl.bintray.com/kotlin/kotlin-eap/",
-                    "https://jcenter.bintray.com/"
+                    "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/",
+                    "https://repo1.maven.org/maven2/"
                 )
             ).joinToString(separator = "\n") { it.value }
             println(versions)
diff --git a/plugins/core/src/test/kotlin/de/fayard/refreshVersions/core/PomUrlTest.kt b/plugins/core/src/test/kotlin/de/fayard/refreshVersions/core/PomUrlTest.kt
@@ -49,7 +49,7 @@ class PomUrlTest {
                 group = "org.jetbrains.kotlin",
                 name = "kotlin-stdlib"
             ),
-            mavenRepoUrl = "https://dl.bintray.com/kotlin/kotlin-eap"
+            mavenRepoUrl = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/"
         )
         println(xml)
     }
diff --git a/plugins/dependencies/src/test/kotlin/de/fayard/refreshVersions/rules/BundledDependenciesTest.kt b/plugins/dependencies/src/test/kotlin/de/fayard/refreshVersions/rules/BundledDependenciesTest.kt
@@ -39,8 +39,7 @@ class BundledDependenciesTest {
                 "https://repo.maven.apache.org/maven2/",
                 "https://dl.google.com/dl/android/maven2/",
                 "https://jcenter.bintray.com/",
-                "https://plugins.gradle.org/m2/",
-                "https://dl.bintray.com/louiscad/splitties-dev/"
+                "https://plugins.gradle.org/m2/"
             )
             getArtifactNameToConstantMapping().map { dependencyMapping ->
                 async {
diff --git a/plugins/settings.gradle.kts b/plugins/settings.gradle.kts
@@ -2,7 +2,6 @@ import de.fayard.refreshVersions.bootstrapRefreshVersions
 
 buildscript {
     repositories {
-        maven(url = "https://dl.bintray.com/jmfayard/maven")
         gradlePluginPortal()
     }
     dependencies.classpath("de.fayard.refreshVersions:refreshVersions:0.9.7")
diff --git a/sample-groovy/buildSrc/settings.gradle b/sample-groovy/buildSrc/settings.gradle
@@ -2,7 +2,6 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven { url = "https://dl.bintray.com/jmfayard/maven" }
     }
 
     final File versionFile = new File(rootDir.parentFile.parentFile, "plugins/version.txt")
diff --git a/sample-groovy/settings.gradle b/sample-groovy/settings.gradle
@@ -3,7 +3,6 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven { url = "https://dl.bintray.com/jmfayard/maven" }
     }
 
     final File versionFile = new File(rootDir.parentFile, "plugins/version.txt")
diff --git a/sample-kotlin/build.gradle.kts b/sample-kotlin/build.gradle.kts
@@ -21,8 +21,6 @@ repositories {
     mavenLocal()
     mavenCentral()
     google()
-    jcenter()
-    maven(url = "https://dl.bintray.com/kotlin/kotlin-eap/")
 }
 
 fun DependencyHandler.implementations(deps: List<String>) =
diff --git a/sample-kotlin/settings.gradle.kts b/sample-kotlin/settings.gradle.kts
@@ -4,8 +4,6 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
-        maven(url = "https://dl.bintray.com/jmfayard/maven")
     }
 
     val versionFile = rootDir.parentFile.resolve("plugins/version.txt")
diff --git a/sample-kotlin/src/main/kotlin/de/fayard/DependenciesUrls.ws.kts b/sample-kotlin/src/main/kotlin/de/fayard/DependenciesUrls.ws.kts
@@ -33,7 +33,7 @@ arrayOf(
 ).forEach { mavenCoordinates ->
     println(
         urlOfDependency(
-            repoUrl = "jcenter.bintray.com/",
+            repoUrl = "https://repo1.maven.org/maven2/",
             mavenCoordinates = mavenCoordinates
         )
     )
diff --git a/sample-multi-modules/buildSrc/build.gradle.kts b/sample-multi-modules/buildSrc/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 
 repositories {
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
diff --git a/sample-multi-modules/buildSrc/settings.gradle.kts b/sample-multi-modules/buildSrc/settings.gradle.kts
@@ -2,8 +2,6 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
-        maven(url = "https://dl.bintray.com/jmfayard/maven")
     }
 
     val versionFile = rootDir.parentFile.parentFile.resolve("plugins/version.txt")
diff --git a/sample-multi-modules/module1/build.gradle.kts b/sample-multi-modules/module1/build.gradle.kts
@@ -7,7 +7,6 @@ plugins {
 version = "unspecified"
 
 repositories {
-    maven("https://dl.bintray.com/kotlin/kotlin-eap")
     mavenCentral()
 }
 
diff --git a/sample-multi-modules/module2/build.gradle.kts b/sample-multi-modules/module2/build.gradle.kts
@@ -14,9 +14,7 @@ repositories {
             password = TODO()
         }
     }*/
-    maven("https://dl.bintray.com/kotlin/kotlin-eap")
     mavenCentral()
-    jcenter()
 }
 
 dependencies {
diff --git a/sample-multi-modules/settings.gradle.kts b/sample-multi-modules/settings.gradle.kts
@@ -2,8 +2,6 @@ pluginManagement {
     repositories {
         mavenLocal()
         gradlePluginPortal()
-        maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
-        maven(url = "https://dl.bintray.com/jmfayard/maven")
     }
 
     val versionFile = rootDir.parentFile.resolve("plugins/version.txt")

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`allprojects {`
`2`	`2`	`repositories {`
`3`	`3`	`mavenCentral()`
`4`		`- jcenter()`
`5`	`4`	`}`
`6`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,6 @@ plugins {`
`4`	`4`
`5`	`5`	`repositories {`
`6`	`6`	`mavenCentral()`
`7`		`- jcenter()`
`8`	`7`	`}`
`9`	`8`
`10`	`9`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class PomUrlTest {`
`49`	`49`	`group = "org.jetbrains.kotlin",`
`50`	`50`	`name = "kotlin-stdlib"`
`51`	`51`	`),`
`52`		`- mavenRepoUrl = "https://dl.bintray.com/kotlin/kotlin-eap"`
	`52`	`+ mavenRepoUrl = "https://maven.pkg.jetbrains.space/kotlin/p/kotlin/bootstrap/"`
`53`	`53`	`)`
`54`	`54`	`println(xml)`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ import de.fayard.refreshVersions.bootstrapRefreshVersions`
`2`	`2`
`3`	`3`	`buildscript {`
`4`	`4`	`repositories {`
`5`		`- maven(url = "https://dl.bintray.com/jmfayard/maven")`
`6`	`5`	`gradlePluginPortal()`
`7`	`6`	`}`
`8`	`7`	`dependencies.classpath("de.fayard.refreshVersions:refreshVersions:0.9.7")`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ pluginManagement {`
`2`	`2`	`repositories {`
`3`	`3`	`mavenLocal()`
`4`	`4`	`gradlePluginPortal()`
`5`		`- maven { url = "https://dl.bintray.com/jmfayard/maven" }`
`6`	`5`	`}`
`7`	`6`
`8`	`7`	`final File versionFile = new File(rootDir.parentFile.parentFile, "plugins/version.txt")`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ pluginManagement {`
`3`	`3`	`repositories {`
`4`	`4`	`mavenLocal()`
`5`	`5`	`gradlePluginPortal()`
`6`		`- maven { url = "https://dl.bintray.com/jmfayard/maven" }`
`7`	`6`	`}`
`8`	`7`
`9`	`8`	`final File versionFile = new File(rootDir.parentFile, "plugins/version.txt")`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,6 @@ repositories {`
`21`	`21`	`mavenLocal()`
`22`	`22`	`mavenCentral()`
`23`	`23`	`google()`
`24`		`- jcenter()`
`25`		`- maven(url = "https://dl.bintray.com/kotlin/kotlin-eap/")`
`26`	`24`	`}`
`27`	`25`
`28`	`26`	`fun DependencyHandler.implementations(deps: List<String>) =`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ pluginManagement {`
`4`	`4`	`repositories {`
`5`	`5`	`mavenLocal()`
`6`	`6`	`gradlePluginPortal()`
`7`		`- maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")`
`8`		`- maven(url = "https://dl.bintray.com/jmfayard/maven")`
`9`	`7`	`}`
`10`	`8`
`11`	`9`	`val versionFile = rootDir.parentFile.resolve("plugins/version.txt")`