Skip to content

Commit c280515

Browse files
Upgrade okio-extras to 1.1.2 (#50)
1 parent f3d5c45 commit c280515

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

fixpatches/src/commonMain/kotlin/com/saveourtool/sarifutils/adapter/SarifFixAdapter.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import com.saveourtool.okio.Uri
88
import com.saveourtool.okio.absolute
99
import com.saveourtool.okio.createDirectories
1010
import com.saveourtool.okio.isDirectory
11-
import com.saveourtool.okio.isSameFileAsSafe
1211
import com.saveourtool.okio.pathString
13-
import com.saveourtool.okio.relativeToSafe
12+
import com.saveourtool.okio.safeIsSameFileAs
13+
import com.saveourtool.okio.safeRelativeTo
1414
import com.saveourtool.sarifutils.config.FileReplacements
1515
import com.saveourtool.sarifutils.config.RuleReplacements
1616
import com.saveourtool.sarifutils.files.createTempDir
@@ -306,7 +306,7 @@ class SarifFixAdapter(
306306
}
307307

308308
val matchingFile = targetFiles.find { targetFile ->
309-
targetFile.isSameFileAsSafe(absoluteLocalPath)
309+
targetFile.safeIsSameFileAs(absoluteLocalPath)
310310
}
311311
if (matchingFile == null) {
312312
val targetFileCount = targetFiles.size
@@ -340,7 +340,7 @@ class SarifFixAdapter(
340340
// additionally create parent directories, before copy of content
341341
targetFileCopy.parent?.createDirectories()
342342

343-
check(!targetFile.isSameFileAsSafe(targetFileCopy)) {
343+
check(!targetFile.safeIsSameFileAs(targetFileCopy)) {
344344
"Refusing to copy $targetFile onto itself."
345345
}
346346

@@ -503,7 +503,7 @@ class SarifFixAdapter(
503503
private fun Path.relativeToTestRoot(): Path =
504504
when (testRoot) {
505505
null -> this
506-
else -> relativeToSafe(testRoot)
506+
else -> safeRelativeTo(testRoot)
507507
}
508508

509509
private fun Path.relativeToFileSystemRoot(): Path =

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
kotlin = "1.8.10"
33
okio = "3.3.0"
4-
okio-extras = "1.1.1"
4+
okio-extras = "1.1.2"
55
serialization = "1.5.0"
66
diktat = "1.2.4.1"
77
kotlinx-cli = "0.3.5"

0 commit comments

Comments
 (0)