[performance] don't override user defined properties with fixed values
This commit is contained in:
committed by
Stanislav Erokhin
parent
be08e29cb3
commit
f87132fff4
@@ -12,7 +12,8 @@ buildscript {
|
||||
def properties = new java.util.Properties()
|
||||
properties.load(new java.io.FileReader(project.file("../../gradle.properties")))
|
||||
properties.each { k, v->
|
||||
set(k as String, v)
|
||||
def key = k as String
|
||||
set(key, project.findProperty(key) ?: v)
|
||||
}
|
||||
}
|
||||
ext["withoutEmbedabble"] = true
|
||||
@@ -47,8 +48,10 @@ def kotlinNativeVersionObject = CompilerVersionKt.parseCompilerVersion(versionSt
|
||||
|
||||
subprojects { proj ->
|
||||
globalProperties.each { k, v->
|
||||
proj.logger.info("${proj.name}<<<[$k] = $v>>>")
|
||||
proj.ext.set(k as String, v)
|
||||
def key = k as String
|
||||
def value = project.findProperty(key) ?: v
|
||||
proj.logger.info("${proj.name}<<<[$key] = $value>>>")
|
||||
proj.ext.set(key, value)
|
||||
}
|
||||
MiscKt.kotlinInit(proj, findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false)
|
||||
proj.ext["bootstrapKotlinRepo"] = BootstrapKt.getBootstrapKotlinRepo(proj)
|
||||
|
||||
@@ -10,8 +10,10 @@ buildscript {
|
||||
java.util.Properties().also {
|
||||
it.load(java.io.FileReader(project.file("../../../gradle.properties")))
|
||||
}.forEach { k, v->
|
||||
println("${project.name}<<<[$k] = $v>>>")
|
||||
extra[k as String] = v
|
||||
val key = k as String
|
||||
val value = project.findProperty(key) ?: v
|
||||
project.logger.info("${project.name}<<<[$key] = $value>>>")
|
||||
extra[key] = value
|
||||
}
|
||||
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false
|
||||
|
||||
|
||||
@@ -5,8 +5,10 @@ buildscript {
|
||||
def properties = new java.util.Properties()
|
||||
properties.load(new java.io.FileReader(project.file("$rootBuildDirectory/../gradle.properties")))
|
||||
properties.each { k, v->
|
||||
project.logger.info("${project.name} $k: $v")
|
||||
set(k as String, v)
|
||||
def key = k as String
|
||||
def value = project.findProperty(key) ?: v
|
||||
project.logger.info("${project.name} $key: $value")
|
||||
set(key, value)
|
||||
}
|
||||
}
|
||||
ext["withoutEmbedabble"] = true
|
||||
|
||||
@@ -10,7 +10,9 @@ buildscript {
|
||||
java.util.Properties().also {
|
||||
it.load(java.io.FileReader(project.file("../../../../gradle.properties")))
|
||||
}.forEach { k, v->
|
||||
extra[k as String] = v
|
||||
val key = k as String
|
||||
val value = project.findProperty(key) ?: v
|
||||
extra[key] = value
|
||||
}
|
||||
|
||||
val cacheRedirectorEnabled = findProperty("cacheRedirectorEnabled")?.toString()?.toBoolean() ?: false
|
||||
|
||||
Reference in New Issue
Block a user