Lazily apply cache redirector to all project modules.

Mainly move it from 'afterEvaluate { .. }' block.

^KT-47185 In Progress
This commit is contained in:
Yahor Berdnikau
2021-06-08 15:51:40 +02:00
committed by Space
parent 3c0709cf4f
commit 5d0abf0e33
2 changed files with 11 additions and 14 deletions
+2 -1
View File
@@ -572,6 +572,8 @@ allprojects {
register("checkBuild")
}
apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
afterEvaluate {
if (javaHome != defaultJavaHome || jvmTarget != defaultJvmTarget) {
logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome")
@@ -606,7 +608,6 @@ allprojects {
?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
}
apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
apply(from = "$rootDir/gradle/testRetry.gradle.kts")
}
}
+9 -13
View File
@@ -127,13 +127,11 @@ fun URI.maybeRedirect(): URI {
}
}
fun RepositoryHandler.redirect() {
for (repository in this) {
when (repository) {
is MavenArtifactRepository -> repository.url = repository.url.maybeRedirect()
is IvyArtifactRepository -> if (repository.url != null) {
repository.url = repository.url.maybeRedirect()
}
fun RepositoryHandler.redirect() = configureEach {
when (this) {
is MavenArtifactRepository -> url = url.maybeRedirect()
is IvyArtifactRepository -> if (url != null) {
url = url.maybeRedirect()
}
}
}
@@ -225,9 +223,7 @@ tasks.named("checkBuild").configure {
dependsOn(checkRepositories)
}
afterEvaluate {
if (cacheRedirectorEnabled()) {
logger.info("Redirecting repositories for $displayName")
repositories.redirect()
}
}
if (cacheRedirectorEnabled()) {
logger.info("Redirecting repositories for $displayName")
repositories.redirect()
}