azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cache PropertiesProvider, read the local.properties file lazily

Browse Source 
Issue #KT-33980 Fixed
This commit is contained in:
Sergey Igushkin
2019-10-02 19:40:20 +03:00
parent d0604ffde8
commit c13f55f0ad
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinProperties.kt
+19 -8
View File
@@ -42,14 +42,14 @@ internal fun PropertiesProvider.mapKotlinTaskProperties(task: AbstractKotlinComp
} }
} }
internal class PropertiesProvider(private val project: Project) { internal class PropertiesProvider private constructor(private val project: Project) {
private val localProperties = Properties() private val localProperties: Properties by lazy {
Properties().apply {
init { val localPropertiesFile = project.rootProject.file("local.properties")
val localPropertiesFile = project.rootProject.file("local.properties") if (localPropertiesFile.isFile) {
if (localPropertiesFile.isFile) { localPropertiesFile.inputStream().use {
localPropertiesFile.inputStream().use { load(it)
localProperties.load(it) }
} }
} }
} }
@@ -172,5 +172,16 @@ internal class PropertiesProvider(private val project: Project) {
companion object { companion object {
internal const val KOTLIN_NATIVE_HOME = "kotlin.native.home" internal const val KOTLIN_NATIVE_HOME = "kotlin.native.home"
private const val CACHED_PROVIDER_EXT_NAME = "kotlin.properties.provider"
operator fun invoke(project: Project): PropertiesProvider =
with(project.extensions.extraProperties) {
if (!has(CACHED_PROVIDER_EXT_NAME)) {
set(CACHED_PROVIDER_EXT_NAME, PropertiesProvider(project))
}
return get(CACHED_PROVIDER_EXT_NAME) as? PropertiesProvider
?: PropertiesProvider(project) // Fallback if multiple class loaders are involved
}
} }
} }