diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt index ca3663ecdce..94c1f402b04 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt @@ -547,7 +547,7 @@ open class CommonizerIT : KGPBaseTest() { @TempDir tempDir: Path, ) { nativeProject("commonizeCurlInterop", gradleVersion) { - gradleProperties.append("kotlin.persistent.gradle.data.dir=${tempDir.absolutePathString()}") + gradleProperties.append("kotlin.user.home=${tempDir.absolutePathString()}") configureCommonizerTargets() diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt index 8eee1e28e96..10f9366b3ad 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/PropertiesProvider.kt @@ -539,13 +539,11 @@ internal class PropertiesProvider private constructor(private val project: Proje internal fun get(propertyName: String): String? = propertiesBuildService.get(propertyName, project) /** - * The directory where persistent data for Kotlin Gradle Plugin is stored. - * This data is not cleaned by gradle clean task. This dir can be used to store data - * for IDE import i.e. `./gradlew clean` will not break IDE import state. + * The directory where Kotlin global caches, logs, or project persistent data are stored. * * If the property is not set, the plugin will use `/.kotlin` as default. */ - val kotlinPersistentGradleDataDir: String? = get(PropertyNames.KOTLIN_PERSISTENT_GRADLE_DATA_DIR) + val kotlinUserHomeDir: String? = get(PropertyNames.KOTLIN_USER_HOME_DIR) /** * Retrieves a comma-separated list of browsers to use when running karma tests for [target] @@ -637,7 +635,7 @@ internal class PropertiesProvider private constructor(private val project: Proje val KONAN_DATA_DIR = property("konan.data.dir") val KOTLIN_SUPPRESS_BUILD_TOOLS_API_VERSION_CONSISTENCY_CHECKS = property("kotlin.internal.suppress.buildToolsApiVersionConsistencyChecks") - val KOTLIN_PERSISTENT_GRADLE_DATA_DIR = property("kotlin.persistent.gradle.data.dir") + val KOTLIN_USER_HOME_DIR = property("kotlin.user.home") /** * Internal properties: builds get big non-suppressible warning when such properties are used diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/persistentCaches.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/persistentCaches.kt index 4be273ab764..8918222d3a0 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/persistentCaches.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/utils/persistentCaches.kt @@ -18,7 +18,7 @@ private const val SESSIONS_DIR_NAME = "sessions" private const val METADATA_DIR_NAME = "metadata" internal val Project.basePersistentDir - get() = kotlinPropertiesProvider.kotlinPersistentGradleDataDir?.let { File(it) } + get() = kotlinPropertiesProvider.kotlinUserHomeDir?.let { File(it) } ?: File(System.getProperty("user.home")).resolve(".kotlin") internal val Project.kotlinSessionsDir