Lazily apply cache redirector to all project modules.
Mainly move it from 'afterEvaluate { .. }' block.
^KT-47185 In Progress
This commit is contained in:
+2
-1
@@ -572,6 +572,8 @@ allprojects {
|
|||||||
register("checkBuild")
|
register("checkBuild")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
|
||||||
|
|
||||||
afterEvaluate {
|
afterEvaluate {
|
||||||
if (javaHome != defaultJavaHome || jvmTarget != defaultJvmTarget) {
|
if (javaHome != defaultJavaHome || jvmTarget != defaultJvmTarget) {
|
||||||
logger.info("configuring project $name to compile to the target jvm version $jvmTarget using jdk: $javaHome")
|
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")
|
?.exclude("org.jetbrains.kotlin", "kotlin-scripting-compiler-embeddable")
|
||||||
}
|
}
|
||||||
|
|
||||||
apply(from = "$rootDir/gradle/cacheRedirector.gradle.kts")
|
|
||||||
apply(from = "$rootDir/gradle/testRetry.gradle.kts")
|
apply(from = "$rootDir/gradle/testRetry.gradle.kts")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -127,13 +127,11 @@ fun URI.maybeRedirect(): URI {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun RepositoryHandler.redirect() {
|
fun RepositoryHandler.redirect() = configureEach {
|
||||||
for (repository in this) {
|
when (this) {
|
||||||
when (repository) {
|
is MavenArtifactRepository -> url = url.maybeRedirect()
|
||||||
is MavenArtifactRepository -> repository.url = repository.url.maybeRedirect()
|
is IvyArtifactRepository -> if (url != null) {
|
||||||
is IvyArtifactRepository -> if (repository.url != null) {
|
url = url.maybeRedirect()
|
||||||
repository.url = repository.url.maybeRedirect()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -225,9 +223,7 @@ tasks.named("checkBuild").configure {
|
|||||||
dependsOn(checkRepositories)
|
dependsOn(checkRepositories)
|
||||||
}
|
}
|
||||||
|
|
||||||
afterEvaluate {
|
if (cacheRedirectorEnabled()) {
|
||||||
if (cacheRedirectorEnabled()) {
|
logger.info("Redirecting repositories for $displayName")
|
||||||
logger.info("Redirecting repositories for $displayName")
|
repositories.redirect()
|
||||||
repositories.redirect()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user