From ada5a033de3cf94e7255ec2d522520f86431f001 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 2 Jul 2022 04:21:20 +0200 Subject: [PATCH 1/7] feat: remove deprecated functions --- .../kotlin/app/revanced/patcher/data/impl/ResourceData.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt index 3b9c52f..1bc05a7 100644 --- a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt +++ b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt @@ -17,12 +17,6 @@ class ResourceData(private val resourceCacheDirectory: File) : Data, Iterable Date: Sat, 2 Jul 2022 02:23:32 +0000 Subject: [PATCH 2/7] chore(release): 2.2.0-dev.1 [skip ci] # [2.2.0-dev.1](https://github.com/revanced/revanced-patcher/compare/v2.1.2...v2.2.0-dev.1) (2022-07-02) ### Features * remove deprecated functions ([ada5a03](https://github.com/revanced/revanced-patcher/commit/ada5a033de3cf94e7255ec2d522520f86431f001)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0160a90..b85812f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.2.0-dev.1](https://github.com/revanced/revanced-patcher/compare/v2.1.2...v2.2.0-dev.1) (2022-07-02) + + +### Features + +* remove deprecated functions ([ada5a03](https://github.com/revanced/revanced-patcher/commit/ada5a033de3cf94e7255ec2d522520f86431f001)) + ## [2.1.2](https://github.com/revanced/revanced-patcher/compare/v2.1.1...v2.1.2) (2022-06-29) diff --git a/gradle.properties b/gradle.properties index 1e97a0d..ddc43d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 2.1.2 +version = 2.2.0-dev.1 From c8eedac4d98aa5f4eaaebaf3491fcd0e1266029f Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 2 Jul 2022 16:21:45 +0200 Subject: [PATCH 3/7] refactor: members of `ResourceData` --- .../kotlin/app/revanced/patcher/data/impl/ResourceData.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt index 1bc05a7..b4f2620 100644 --- a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt +++ b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt @@ -10,8 +10,10 @@ import javax.xml.transform.dom.DOMSource import javax.xml.transform.stream.StreamResult class ResourceData(private val resourceCacheDirectory: File) : Data, Iterable { - operator fun get(path: String) = resourceCacheDirectory.resolve(path) val xmlEditor = XmlFileHolder() + + operator fun get(path: String) = resourceCacheDirectory.resolve(path) + override fun iterator() = resourceCacheDirectory.walkTopDown().iterator() inner class XmlFileHolder { From 6f72c4c4c051e48c8d03d2a7b2cfc1c53028ed86 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 2 Jul 2022 17:44:08 +0200 Subject: [PATCH 4/7] feat: streams overload for `XmlFileHolder` --- .../revanced/patcher/data/impl/ResourceData.kt | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt index b4f2620..fddabde 100644 --- a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt +++ b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt @@ -4,6 +4,8 @@ import app.revanced.patcher.data.Data import org.w3c.dom.Document import java.io.Closeable import java.io.File +import java.io.InputStream +import java.io.OutputStream import javax.xml.parsers.DocumentBuilderFactory import javax.xml.transform.TransformerFactory import javax.xml.transform.dom.DOMSource @@ -17,14 +19,20 @@ class ResourceData(private val resourceCacheDirectory: File) : Data, Iterable Date: Sat, 2 Jul 2022 15:46:16 +0000 Subject: [PATCH 5/7] chore(release): 2.2.0-dev.2 [skip ci] # [2.2.0-dev.2](https://github.com/revanced/revanced-patcher/compare/v2.2.0-dev.1...v2.2.0-dev.2) (2022-07-02) ### Features * streams overload for `XmlFileHolder` ([6f72c4c](https://github.com/revanced/revanced-patcher/commit/6f72c4c4c051e48c8d03d2a7b2cfc1c53028ed86)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b85812f..72f89a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.2.0-dev.2](https://github.com/revanced/revanced-patcher/compare/v2.2.0-dev.1...v2.2.0-dev.2) (2022-07-02) + + +### Features + +* streams overload for `XmlFileHolder` ([6f72c4c](https://github.com/revanced/revanced-patcher/commit/6f72c4c4c051e48c8d03d2a7b2cfc1c53028ed86)) + # [2.2.0-dev.1](https://github.com/revanced/revanced-patcher/compare/v2.1.2...v2.2.0-dev.1) (2022-07-02) diff --git a/gradle.properties b/gradle.properties index ddc43d1..3e1cdc1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 2.2.0-dev.1 +version = 2.2.0-dev.2 From 83187c9edd7b088bc18960c5eb9a2042ca536b5f Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sun, 3 Jul 2022 00:19:39 +0200 Subject: [PATCH 6/7] fix: DomFileEditor opening in- and output streams on the same file --- .../app/revanced/patcher/data/impl/ResourceData.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt index fddabde..573cd0a 100644 --- a/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt +++ b/src/main/kotlin/app/revanced/patcher/data/impl/ResourceData.kt @@ -20,19 +20,23 @@ class ResourceData(private val resourceCacheDirectory: File) : Data, Iterable) : Closeable { + + // lazily open an output stream + // this is required because when constructing a DomFileEditor the output stream is created along with the input stream, which is not allowed + // the workaround is to lazily create the output stream. This way it would be used after the input stream is closed, which happens in the constructor + constructor(file: File) : this(file.inputStream(), lazy { file.outputStream() }) val file: Document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(inputStream).also(Document::normalize) override fun close() = - TransformerFactory.newInstance().newTransformer().transform(DOMSource(file), StreamResult(outputStream)) + TransformerFactory.newInstance().newTransformer().transform(DOMSource(file), StreamResult(outputStream.value)) } From 0f00d33f4e9c0609ac68967a3cdd2aef725a2b1d Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 2 Jul 2022 22:21:19 +0000 Subject: [PATCH 7/7] chore(release): 2.2.0-dev.3 [skip ci] # [2.2.0-dev.3](https://github.com/revanced/revanced-patcher/compare/v2.2.0-dev.2...v2.2.0-dev.3) (2022-07-02) ### Bug Fixes * DomFileEditor opening in- and output streams on the same file ([83187c9](https://github.com/revanced/revanced-patcher/commit/83187c9edd7b088bc18960c5eb9a2042ca536b5f)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72f89a5..f216604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.2.0-dev.3](https://github.com/revanced/revanced-patcher/compare/v2.2.0-dev.2...v2.2.0-dev.3) (2022-07-02) + + +### Bug Fixes + +* DomFileEditor opening in- and output streams on the same file ([83187c9](https://github.com/revanced/revanced-patcher/commit/83187c9edd7b088bc18960c5eb9a2042ca536b5f)) + # [2.2.0-dev.2](https://github.com/revanced/revanced-patcher/compare/v2.2.0-dev.1...v2.2.0-dev.2) (2022-07-02) diff --git a/gradle.properties b/gradle.properties index 3e1cdc1..2a13e8c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 2.2.0-dev.2 +version = 2.2.0-dev.3