Skip to content

Commit 4f881c2

Browse files
authored
Merge pull request #173 from ktorio/vgoncharova/ktor-train
refactor Ktor EAP trigger settings: simplify project and configuration handling, streamline logging messages
2 parents 8f4ccba + e4e1b3c commit 4f881c2

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

.teamcity/src/subprojects/train/TriggerProjectSamplesOnEAP.kt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ fun BuildSteps.createEAPGradleInitScript() {
8282
}
8383
}
8484
85-
gradle.allprojects { project ->
86-
project.repositories {
85+
gradle.allprojects {
86+
repositories {
8787
maven {
8888
name = "KtorEAP"
8989
url = uri("https://maven.pkg.jetbrains.space/public/p/ktor/eap")
@@ -93,30 +93,30 @@ fun BuildSteps.createEAPGradleInitScript() {
9393
}
9494
}
9595
96-
project.configurations.all { configuration ->
97-
configuration.resolutionStrategy {
98-
eachDependency { details ->
99-
if (details.requested.group == "io.ktor") {
96+
configurations.all {
97+
resolutionStrategy {
98+
eachDependency {
99+
if (requested.group == "io.ktor") {
100100
val ktorVersion = System.getenv("KTOR_VERSION")
101101
if (ktorVersion.isNullOrBlank()) {
102102
throw GradleException("KTOR_VERSION environment variable is not set or is blank. Cannot resolve Ktor EAP dependencies.")
103103
}
104-
details.useVersion(ktorVersion)
105-
logger.lifecycle("Forcing Ktor dependency " + details.requested.name + " to use EAP version: " + ktorVersion)
104+
useVersion(ktorVersion)
105+
logger.lifecycle("Forcing Ktor dependency " + requested.name + " to use EAP version: " + ktorVersion)
106106
}
107107
}
108108
cacheDynamicVersionsFor(0, "seconds")
109109
cacheChangingModulesFor(0, "seconds")
110110
}
111111
}
112112
113-
project.afterEvaluate {
114-
if (project == project.rootProject) {
115-
logger.lifecycle("Project " + project.name + ": Using Ktor EAP version " + System.getenv("KTOR_VERSION"))
116-
logger.lifecycle("Project " + project.name + ": EAP repository: https://maven.pkg.jetbrains.space/public/p/ktor/eap")
113+
afterEvaluate {
114+
if (this == rootProject) {
115+
logger.lifecycle("Project " + name + ": Using Ktor EAP version " + System.getenv("KTOR_VERSION"))
116+
logger.lifecycle("Project " + name + ": EAP repository: https://maven.pkg.jetbrains.space/public/p/ktor/eap")
117117
val pluginVersion = System.getenv("KTOR_GRADLE_PLUGIN_VERSION")
118118
if (pluginVersion != null && pluginVersion.isNotEmpty()) {
119-
logger.lifecycle("Project " + project.name + ": Using latest Ktor Gradle plugin version " + pluginVersion)
119+
logger.lifecycle("Project " + name + ": Using latest Ktor Gradle plugin version " + pluginVersion)
120120
}
121121
}
122122
}

0 commit comments

Comments
 (0)