From 512152fb6614e6c9a65349618f4d021e089adf6b Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 14 Dec 2022 22:36:22 +0100 Subject: [PATCH 1/6] ci: stash before rebasing --- .releaserc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.releaserc b/.releaserc index 43725b4..35cc324 100644 --- a/.releaserc +++ b/.releaserc @@ -37,7 +37,8 @@ [ "@saithodev/semantic-release-backmerge", { - "branches": [{from: "main", to: "dev"}] + branches: [{from: "main", to: "dev"}], + clearWorkspace: true } ] ] From 2c7eb7274c713dfbcb53c5f3b6a9205c751914fa Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Wed, 14 Dec 2022 22:42:22 +0100 Subject: [PATCH 2/6] feat: improve missing compatibility annotation tracing log --- src/main/kotlin/app/revanced/utils/patcher/Patcher.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt index baef00c..2041aaf 100644 --- a/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt +++ b/src/main/kotlin/app/revanced/utils/patcher/Patcher.kt @@ -31,7 +31,7 @@ fun Patcher.addPatchesFiltered(allPatches: List>>) { return@patchLoop } - if (compatiblePackages == null) logger.trace("$prefix: Missing compatibility annotation. Continuing.") + if (compatiblePackages == null) logger.trace("$prefix: No constraint on packages. Continuing.") else { if (!compatiblePackages.any { it.name == packageName }) { logger.trace("$prefix: Incompatible with $packageName. This patch is only compatible with ${ From 1c5983b8035563bfe70659661b1210daff002332 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 15 Dec 2022 00:15:32 +0100 Subject: [PATCH 3/6] build: minimize shadow jar --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index f457e6d..bd44429 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -43,6 +43,7 @@ tasks { attributes("Implementation-Title" to project.name) attributes("Implementation-Version" to project.version) } + minimize() } // Dummy task to fix the Gradle semantic-release plugin. // Remove this if you forked it to support building only. From 5a7cadd96dffac0b50ea3a7a8f31f990957aafff Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 15 Dec 2022 00:15:46 +0100 Subject: [PATCH 4/6] build: remove manifest attributes --- build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bd44429..643c985 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,8 +40,6 @@ tasks { shadowJar { manifest { attributes("Main-Class" to "app.revanced.cli.main.MainKt") - attributes("Implementation-Title" to project.name) - attributes("Implementation-Version" to project.version) } minimize() } From 8114d1dca08caa51f51c789fb70a755e726dab21 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 15 Dec 2022 00:16:17 +0100 Subject: [PATCH 5/6] build: remove unnecessary step --- .github/workflows/release.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a9becb5..8d936d5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,13 +29,9 @@ jobs: with: node-version: "latest" cache: 'npm' - - name: Build with Gradle - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: ./gradlew build --no-daemon - name: Setup semantic-release run: npm install semantic-release @saithodev/semantic-release-backmerge @semantic-release/git @semantic-release/changelog gradle-semantic-release-plugin -D - - name: Release + - name: Create release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: npx semantic-release From 8a964efd0027668696f2d4fd5c40ac118ec8ab39 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Wed, 14 Dec 2022 23:37:35 +0000 Subject: [PATCH 6/6] chore(release): 2.17.0-dev.3 [skip ci] # [2.17.0-dev.3](https://github.com/revanced/revanced-cli/compare/v2.17.0-dev.2...v2.17.0-dev.3) (2022-12-14) ### Features * improve missing compatibility annotation tracing log ([2c7eb72](https://github.com/revanced/revanced-cli/commit/2c7eb7274c713dfbcb53c5f3b6a9205c751914fa)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf3dc84..6efde8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# [2.17.0-dev.3](https://github.com/revanced/revanced-cli/compare/v2.17.0-dev.2...v2.17.0-dev.3) (2022-12-14) + + +### Features + +* improve missing compatibility annotation tracing log ([2c7eb72](https://github.com/revanced/revanced-cli/commit/2c7eb7274c713dfbcb53c5f3b6a9205c751914fa)) + # [2.17.0-dev.2](https://github.com/revanced/revanced-cli/compare/v2.17.0-dev.1...v2.17.0-dev.2) (2022-12-14) diff --git a/gradle.properties b/gradle.properties index d91b362..e2f9227 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ kotlin.code.style = official -version = 2.17.0-dev.2 +version = 2.17.0-dev.3