diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 44f02ba476..400df4ccaf 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -6,6 +6,7 @@ rootProject.name = "build-logic" pluginManagement { repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") maven("https://cache-redirector.jetbrains.com/repo.maven.apache.org/maven2") { name = "MavenCentral-JBCache" } @@ -19,6 +20,7 @@ pluginManagement { dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") maven("https://cache-redirector.jetbrains.com/repo.maven.apache.org/maven2") { name = "MavenCentral-JBCache" } diff --git a/dokka-integration-tests/gradle/projects/template.settings.gradle.kts b/dokka-integration-tests/gradle/projects/template.settings.gradle.kts index 663399a7a4..3827fc3553 100644 --- a/dokka-integration-tests/gradle/projects/template.settings.gradle.kts +++ b/dokka-integration-tests/gradle/projects/template.settings.gradle.kts @@ -37,6 +37,7 @@ pluginManagement { } repositories { /* %{DOKKA_IT_MAVEN_REPO}% */ + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() gradlePluginPortal() google() @@ -48,6 +49,7 @@ dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS) repositories { /* %{DOKKA_IT_MAVEN_REPO}% */ + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() google() maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven") { diff --git a/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt b/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt index ff953c1258..98f15d2808 100644 --- a/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt +++ b/dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/TestedVersions.kt @@ -14,7 +14,7 @@ open class AllSupportedTestedVersionsArgumentsProvider : TestedVersionsArguments object TestedVersions { - val LATEST = BuildVersions("8.10.2", "2.1.0-Beta2") + val LATEST = BuildVersions("8.10.2", "2.1.0-RC-330") /** * All supported Gradle/Kotlin versions, including [LATEST] @@ -22,13 +22,13 @@ object TestedVersions { * [Kotlin/Gradle compatibility matrix](https://docs.gradle.org/current/userguide/compatibility.html#kotlin) */ val ALL_SUPPORTED = - BuildVersions.permutations( + listOf(LATEST) + BuildVersions.permutations( gradleVersions = listOf("7.6.2"), kotlinVersions = listOf("2.0.21", "1.9.23", "1.8.20", "1.7.20", "1.6.21", "1.5.31"), ) + BuildVersions.permutations( gradleVersions = listOf(*ifExhaustive("7.0", "6.1.1")), kotlinVersions = listOf(*ifExhaustive("1.8.0", "1.7.0", "1.6.0", "1.5.0")) - ) + LATEST + ) /** * Supported Android/Gradle/Kotlin versions, including [LATEST] @@ -41,7 +41,7 @@ object TestedVersions { val ANDROID = BuildVersions.permutations( gradleVersions = listOf("8.4"), - kotlinVersions = listOf("2.1.0-Beta2", "2.0.21"), + kotlinVersions = listOf("2.1.0-RC-330", "2.0.21"), androidGradlePluginVersions = listOf("8.3.0") ) + BuildVersions.permutations( gradleVersions = listOf("7.4.2", *ifExhaustive("7.0")), @@ -68,7 +68,7 @@ object TestedVersions { "1.9.23" to "18.2.0-pre.682", "2.0.0" to "18.2.0-pre.726", "2.0.21" to "18.3.1-pre.758", - "2.1.0-Beta2" to "18.3.1-pre.818", + "2.1.0-RC-330" to "18.3.1-pre.818", ) } diff --git a/dokka-integration-tests/settings.gradle.kts b/dokka-integration-tests/settings.gradle.kts index bdd4fdeda0..d20c4cf302 100644 --- a/dokka-integration-tests/settings.gradle.kts +++ b/dokka-integration-tests/settings.gradle.kts @@ -9,6 +9,7 @@ pluginManagement { includeBuild("../build-settings-logic") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() gradlePluginPortal() } @@ -21,6 +22,7 @@ plugins { dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide") maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide-plugin-dependencies") diff --git a/dokka-runners/dokka-gradle-plugin/settings.gradle.kts b/dokka-runners/dokka-gradle-plugin/settings.gradle.kts index f368a70b31..f361608415 100644 --- a/dokka-runners/dokka-gradle-plugin/settings.gradle.kts +++ b/dokka-runners/dokka-gradle-plugin/settings.gradle.kts @@ -9,6 +9,7 @@ pluginManagement { includeBuild("../../build-settings-logic") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() gradlePluginPortal() } @@ -21,6 +22,7 @@ plugins { dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() google() } diff --git a/dokka-runners/dokka-gradle-plugin/src/testFixtures/kotlin/GradleTestKitUtils.kt b/dokka-runners/dokka-gradle-plugin/src/testFixtures/kotlin/GradleTestKitUtils.kt index cfdc9b2cf6..b00bbb6178 100644 --- a/dokka-runners/dokka-gradle-plugin/src/testFixtures/kotlin/GradleTestKitUtils.kt +++ b/dokka-runners/dokka-gradle-plugin/src/testFixtures/kotlin/GradleTestKitUtils.kt @@ -205,6 +205,7 @@ class GradleProjectTest( |pluginManagement { | repositories { |${dokkaTestRepo.prependIndent(" ")} + | maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") | mavenCentral() | gradlePluginPortal() | } @@ -214,6 +215,7 @@ class GradleProjectTest( |dependencyResolutionManagement { | repositories { |${dokkaTestRepo.prependIndent(" ")} + | maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") | mavenCentral() | } |} diff --git a/dokka-runners/runner-cli/settings.gradle.kts b/dokka-runners/runner-cli/settings.gradle.kts index 7ea3f28b35..2fe3c806c4 100644 --- a/dokka-runners/runner-cli/settings.gradle.kts +++ b/dokka-runners/runner-cli/settings.gradle.kts @@ -9,6 +9,7 @@ pluginManagement { includeBuild("../../build-settings-logic") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() gradlePluginPortal() } @@ -21,6 +22,7 @@ plugins { dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() google() } diff --git a/dokka-runners/runner-maven-plugin/settings.gradle.kts b/dokka-runners/runner-maven-plugin/settings.gradle.kts index adfc383b03..12e85dff5e 100644 --- a/dokka-runners/runner-maven-plugin/settings.gradle.kts +++ b/dokka-runners/runner-maven-plugin/settings.gradle.kts @@ -9,6 +9,7 @@ pluginManagement { includeBuild("../../build-settings-logic") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() gradlePluginPortal() } @@ -21,6 +22,7 @@ plugins { dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") mavenCentral() } diff --git a/settings.gradle.kts b/settings.gradle.kts index 3ea9144972..c7954c5ee7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,6 +9,7 @@ pluginManagement { includeBuild("build-settings-logic") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") maven("https://cache-redirector.jetbrains.com/repo.maven.apache.org/maven2") { name = "MavenCentral-JBCache" } @@ -21,6 +22,7 @@ pluginManagement { dependencyResolutionManagement { @Suppress("UnstableApiUsage") repositories { + maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/dev") maven("https://cache-redirector.jetbrains.com/maven.pkg.jetbrains.space/kotlin/p/kotlin/kotlin-ide") { name = "KotlinIde-JBCache" }