Skip to content

Commit 4f46446

Browse files
committed
Store shared repositories in the form of list
1 parent 8c55481 commit 4f46446

File tree

6 files changed

+25
-18
lines changed

6 files changed

+25
-18
lines changed

build-plugin/plugin-versions-plugin/settings.gradle.kts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ pluginManagement {
99
repositories {
1010
mavenCentral()
1111
gradlePluginPortal()
12-
// Artifacts here are guaranteed to not be removed, unlike https://packages.jetbrains.team/maven/p/kt/dev.
13-
// But note that /kt/dev is updated faster.
14-
maven(sharedProps.getProperty("kotlin.repository"))
12+
sharedProps.getProperty("shared.repositories").split(',').forEach {
13+
maven(it)
14+
}
1515
if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
1616
mavenLocal()
1717
}
@@ -34,7 +34,9 @@ dependencyResolutionManagement {
3434
repositories {
3535
mavenCentral()
3636
gradlePluginPortal()
37-
maven(sharedProps.getProperty("kotlin.repository"))
37+
sharedProps.getProperty("shared.repositories").split(',').forEach {
38+
maven(it)
39+
}
3840
if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
3941
mavenLocal()
4042
}

build-plugin/settings.gradle.kts

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ rootProject.name = "build"
66

77
pluginManagement {
88
repositories {
9+
mavenCentral()
10+
gradlePluginPortal()
911
val sharedProps = java.util.Properties().apply {
1012
load(File(rootDir.parent, "shared.properties").inputStream())
1113
}
12-
mavenCentral()
13-
gradlePluginPortal()
14-
maven(sharedProps.getProperty("kotlin.repository"))
15-
maven(sharedProps.getProperty("kotlin.ds.repository"))
14+
sharedProps.getProperty("shared.repositories").split(',').forEach {
15+
maven(it)
16+
}
1617
if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
1718
mavenLocal()
1819
}
@@ -35,8 +36,9 @@ dependencyResolutionManagement {
3536
repositories {
3637
mavenCentral()
3738
gradlePluginPortal()
38-
maven(sharedProps.getProperty("kotlin.repository"))
39-
maven(sharedProps.getProperty("kotlin.ds.repository"))
39+
sharedProps.getProperty("shared.repositories").split(',').forEach {
40+
maven(it)
41+
}
4042
if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
4143
mavenLocal()
4244
}

build-plugin/src/build/util/repositories.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ fun Project.addAllBuildRepositories() {
2828
repositories {
2929
mavenCentral()
3030
gradlePluginPortal()
31-
maven(sharedProps.getProperty("kotlin.repository"))
31+
sharedProps.getProperty("shared.repositories").split(',').forEach {
32+
maven(it)
33+
}
3234

3335
for (teamcity in listOf(INTERNAL_KOTLIN_TEAMCITY, PUBLIC_KOTLIN_TEAMCITY)) {
3436
val locator = "buildType:(id:${teamcity.projectId}),number:$kotlinVersion,branch:default:any/artifacts/content/maven"

build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ val sharedProps =
4545

4646
repositories {
4747
mavenCentral()
48-
maven(sharedProps.getProperty("kotlin.repository"))
49-
maven(sharedProps.getProperty("kotlin.ds.repository"))
48+
sharedProps.getProperty("shared.repositories").split(',').forEach {
49+
maven(it)
50+
}
5051
maven {
5152
name = "intellij-deps"
5253
url = uri("https://www.jetbrains.com/intellij-repository/releases/")

settings.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ pluginManagement {
99
load(File(rootDir, "shared.properties").inputStream())
1010
}
1111
gradlePluginPortal()
12-
maven(sharedProps.getProperty("kotlin.repository"))
13-
maven(sharedProps.getProperty("kotlin.ds.repository"))
12+
sharedProps.getProperty("shared.repositories").split(',').forEach {
13+
maven(it)
14+
}
1415
if (System.getenv("KOTLIN_JUPYTER_USE_MAVEN_LOCAL") != null) {
1516
mavenLocal()
1617
}

shared.properties

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
# Artifacts here are guaranteed to not be removed, unlike https://packages.jetbrains.team/maven/p/kt/dev.
55
# But note that /kt/dev is updated faster.
6-
kotlin.repository=https://redirector.kotlinlang.org/maven/bootstrap
7-
86
# Developer releases for Kotlin for Data Science libraries
9-
kotlin.ds.repository=https://packages.jetbrains.team/maven/p/kds/kotlin-ds-maven
7+
shared.repositories=https://redirector.kotlinlang.org/maven/bootstrap,\
8+
https://packages.jetbrains.team/maven/p/kds/kotlin-ds-maven

0 commit comments

Comments
 (0)