From 8900c6802c3cecdf7e991794969405e0fda573f7 Mon Sep 17 00:00:00 2001 From: Vladimir Sitnikov Date: Wed, 19 Nov 2025 19:47:04 +0300 Subject: [PATCH] chore: remove use of deprecated API --- .../main/kotlin/com/github/vlsi/gradle/crlf/CrLfSpec.kt | 4 +++- .../main/kotlin/com/github/vlsi/gradle/crlf/buildDsl.kt | 4 +++- .../main/kotlin/com/github/vlsi/gradle/git/CrLfFilters.kt | 8 +++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/CrLfSpec.kt b/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/CrLfSpec.kt index 641259fb..4b3595fd 100644 --- a/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/CrLfSpec.kt +++ b/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/CrLfSpec.kt @@ -112,7 +112,9 @@ private fun CopySpec.filterBinary(action: FileCopyDetails.() -> Unit) { private fun FileCopyDetails.filterEol(props: GitProperties, textEol: LineEndings) { val attributes = props.attrs.compute(this) if (attributes.isSet("executable")) { - mode = "755".toInt(8) + permissions { + unix("755") + } } val streamType = textEol.toStreamType(attributes) filterEol(streamType) diff --git a/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/buildDsl.kt b/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/buildDsl.kt index b49c05e6..7aeff94e 100644 --- a/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/buildDsl.kt +++ b/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/crlf/buildDsl.kt @@ -54,7 +54,9 @@ fun CopySpec.includeShell( } from(src) { filter(LineEndings.LF) - fileMode = "755".toInt(8) + filePermissions { + unix("755") + } include(*scriptName) include(scriptName.map { "$it.sh" }) action?.invoke(this) diff --git a/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/git/CrLfFilters.kt b/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/git/CrLfFilters.kt index 086e3552..a4d72b7c 100644 --- a/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/git/CrLfFilters.kt +++ b/plugins/crlf-plugin/src/main/kotlin/com/github/vlsi/gradle/git/CrLfFilters.kt @@ -47,7 +47,13 @@ private fun filterCrLf(reader: Reader, detectBinary: Boolean) = AutoCRLFInputStream(reader.decode(), detectBinary).encode() private fun filterLf(reader: Reader, detectBinary: Boolean) = - AutoLFInputStream(reader.decode(), detectBinary).encode() + AutoLFInputStream.create( + reader.decode(), + *when (detectBinary) { + true -> arrayOf(AutoLFInputStream.StreamFlag.DETECT_BINARY) + else -> arrayOf() + } + ).encode() class FilterAutoCrlf(reader: Reader) : FilterReader(filterCrLf(reader, detectBinary = true)) class FilterAutoLf(reader: Reader) : FilterReader(filterLf(reader, detectBinary = true))