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 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 } ] ] 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/build.gradle.kts b/build.gradle.kts index f457e6d..643c985 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -40,9 +40,8 @@ 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() } // Dummy task to fix the Gradle semantic-release plugin. // Remove this if you forked it to support building only. 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 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 ${