Populate settings also for buildSrc module.
^KT-45745 In Progress
This commit is contained in:
committed by
TeamCityServer
parent
38849b7be4
commit
208422d2ec
+15
-5
@@ -259,16 +259,27 @@ private fun setupProjectFromTestResources(
|
|||||||
private fun Path.addDefaultBuildFiles() {
|
private fun Path.addDefaultBuildFiles() {
|
||||||
if (Files.exists(resolve("build.gradle"))) {
|
if (Files.exists(resolve("build.gradle"))) {
|
||||||
val settingsFile = resolve("settings.gradle")
|
val settingsFile = resolve("settings.gradle")
|
||||||
if (!Files.exists(settingsFile)) {
|
settingsFile.addPluginManagementToSettings()
|
||||||
settingsFile.toFile().writeText(DEFAULT_GROOVY_SETTINGS_FILE)
|
}
|
||||||
|
|
||||||
|
val buildSrc = resolve("buildSrc")
|
||||||
|
if (Files.exists(buildSrc)) {
|
||||||
|
val settingsFile = buildSrc.resolve("settings.gradle")
|
||||||
|
settingsFile.addPluginManagementToSettings()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun Path.addPluginManagementToSettings() {
|
||||||
|
if (!Files.exists(this)) {
|
||||||
|
toFile().writeText(DEFAULT_GROOVY_SETTINGS_FILE)
|
||||||
} else {
|
} else {
|
||||||
val settingsContent = settingsFile.toFile().readText()
|
val settingsContent = toFile().readText()
|
||||||
if (!settingsContent
|
if (!settingsContent
|
||||||
.lines()
|
.lines()
|
||||||
.first { !it.startsWith("//") }
|
.first { !it.startsWith("//") }
|
||||||
.startsWith("pluginManagement {")
|
.startsWith("pluginManagement {")
|
||||||
) {
|
) {
|
||||||
settingsFile.toFile().writeText(
|
toFile().writeText(
|
||||||
"""
|
"""
|
||||||
$DEFAULT_GROOVY_SETTINGS_FILE
|
$DEFAULT_GROOVY_SETTINGS_FILE
|
||||||
|
|
||||||
@@ -277,7 +288,6 @@ private fun Path.addDefaultBuildFiles() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun TestProject.agreeToBuildScanService() {
|
private fun TestProject.agreeToBuildScanService() {
|
||||||
|
|||||||
Reference in New Issue
Block a user