Skip to content

Workaround for expanded lock on Windows #189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 21, 2023
Merged

Workaround for expanded lock on Windows #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bceba05
Workaround for locked cache directory on Windows
fzhinkin Jul 20, 2023
bd24d30
Avoid lock file removal on all platforms
fzhinkin Jul 20, 2023
348ae56
Cleaned up the code
fzhinkin Jul 21, 2023
8324ee4
Apply base plugin and reuse the clean task defined in it
fzhinkin Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions benchmarks/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.konan.target.KonanTarget
plugins {
kotlin("multiplatform")
alias(libs.plugins.kotlinx.benchmark.plugin)
id("kotlinx-io-clean")
}

kotlin {
Expand Down
17 changes: 17 additions & 0 deletions build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-clean.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file.
*/

plugins {
base
}

tasks.clean {
// Workaround for https://youtrack.jetbrains.com/issue/KT-58303:
// the `clean` task can't delete the expanded.lock file on Windows as it's still held by Gradle, failing the build
setDelete(layout.buildDirectory.asFileTree.matching {
exclude("tmp/.cache/expanded/expanded.lock")
})
}

2 changes: 1 addition & 1 deletion build-logic/src/main/kotlin/kotlinx/io/conventions/kotlinx-io-multiplatform.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the LICENCE file.
*/

import org.gradle.kotlin.dsl.kotlin
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSet
import kotlin.jvm.optionals.getOrNull

plugins {
kotlin("multiplatform")
id("kotlinx-io-clean")
}

kotlin {
Expand Down