From b1d1956323000d9f8fbdf7e845df969d5d311cd9 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 12 Jun 2023 01:47:26 +0200 Subject: [PATCH 1/5] ci: remove unnecessary steps --- .github/workflows/release.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b20eb4..324e0fc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,17 +23,6 @@ jobs: # https://github.com/cycjimmy/semantic-release-action#private-packages persist-credentials: false fetch-depth: 0 - - name: Setup JDK - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'zulu' - cache: gradle - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: "18" - cache: 'npm' - name: Setup semantic-release run: npm install - name: Release From fd738e723bbbcab43323d5ebe798acff23d5fb5b Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 12 Jun 2023 01:47:41 +0200 Subject: [PATCH 2/5] ci: build before running semantic-release --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 324e0fc..8f31416 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,10 @@ jobs: # https://github.com/cycjimmy/semantic-release-action#private-packages persist-credentials: false fetch-depth: 0 + - name: Build with Gradle + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: ./gradlew clean --no-daemon - name: Setup semantic-release run: npm install - name: Release From c95e6fa92f31f4000f4d4c0fbdb3b8963a6a5a4b Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 12 Jun 2023 02:55:09 +0200 Subject: [PATCH 3/5] ci: add cache step --- .github/workflows/release.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8f31416..afb223c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,6 +23,16 @@ jobs: # https://github.com/cycjimmy/semantic-release-action#private-packages persist-credentials: false fetch-depth: 0 + - name: Cache + uses: actions/cache@v3 + with: + path: | + ${{ runner.home }}/.gradle/caches + ${{ runner.home }}/.gradle/wrapper + .gradle + build + node_modules + key: ${{ runner.os }}-gradle-npm-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'package-lock.json') }} - name: Build with Gradle env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From f02a42610b7698fc8cc6bc5183c9ccba2ed96cda Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Mon, 12 Jun 2023 05:31:53 +0200 Subject: [PATCH 4/5] fix: revert using `OutputStream.nullOutputStream` Older Android versions don't support this API --- src/main/kotlin/app/revanced/patcher/Patcher.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/app/revanced/patcher/Patcher.kt b/src/main/kotlin/app/revanced/patcher/Patcher.kt index d61fb11..06836b1 100644 --- a/src/main/kotlin/app/revanced/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/patcher/Patcher.kt @@ -247,7 +247,12 @@ class Patcher(private val options: PatcherOptions) { XmlPullStreamDecoder( axmlParser, AndrolibResources().resXmlSerializer ).decodeManifest( - extInputFile.directory.getFileInput("AndroidManifest.xml"), OutputStream.nullOutputStream() + extInputFile.directory.getFileInput("AndroidManifest.xml"), + object : OutputStream() { + override fun write(b: Int) { + // do nothing + } + } ) } } From 34f08bf2061b07d335a1abb794d5ccb4b0e990dc Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Mon, 12 Jun 2023 03:33:53 +0000 Subject: [PATCH 5/5] chore(release): 11.0.1-dev.1 [skip ci] ## [11.0.1-dev.1](https://github.com/revanced/revanced-patcher/compare/v11.0.0...v11.0.1-dev.1) (2023-06-12) ### Bug Fixes * revert using `OutputStream.nullOutputStream` ([f02a426](https://github.com/revanced/revanced-patcher/commit/f02a42610b7698fc8cc6bc5183c9ccba2ed96cda)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d27cbc8..29077ff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [11.0.1-dev.1](https://github.com/revanced/revanced-patcher/compare/v11.0.0...v11.0.1-dev.1) (2023-06-12) + + +### Bug Fixes + +* revert using `OutputStream.nullOutputStream` ([f02a426](https://github.com/revanced/revanced-patcher/commit/f02a42610b7698fc8cc6bc5183c9ccba2ed96cda)) + # [11.0.0](https://github.com/revanced/revanced-patcher/compare/v10.0.0...v11.0.0) (2023-06-10) diff --git a/gradle.properties b/gradle.properties index 9f0e96b..5f28ccc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 11.0.0 +version = 11.0.1-dev.1