diff --git a/kotlin-native/performance/build.gradle b/kotlin-native/performance/build.gradle index 9cf495c6ba6..dd76c3c86f5 100644 --- a/kotlin-native/performance/build.gradle +++ b/kotlin-native/performance/build.gradle @@ -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) diff --git a/kotlin-native/performance/buildSrc/build.gradle.kts b/kotlin-native/performance/buildSrc/build.gradle.kts index 60b17905426..dcd94b6839b 100644 --- a/kotlin-native/performance/buildSrc/build.gradle.kts +++ b/kotlin-native/performance/buildSrc/build.gradle.kts @@ -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 diff --git a/kotlin-native/tools/benchmarksAnalyzer/build.gradle b/kotlin-native/tools/benchmarksAnalyzer/build.gradle index dce779498dd..1078f107ec1 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/build.gradle +++ b/kotlin-native/tools/benchmarksAnalyzer/build.gradle @@ -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 diff --git a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts index fb44b59ed41..fd099abb2a2 100644 --- a/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts +++ b/kotlin-native/tools/benchmarksAnalyzer/buildSrc/build.gradle.kts @@ -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