feat: rip-lib and unsigned

.github/workflows/release.yml

@@ -41,5 +41,5 @@ jobs:
  run: npm install
  - name: Release
  env:
- GITHUB_TOKEN: ${{ secrets.REPOSITORY_PUSH_ACCESS }}
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  run: npm exec semantic-release

.github/workflows/sync_upstream.yml

@@ -0,0 +1,45 @@
+on:
+ workflow_call:
+ workflow_dispatch:
+ schedule:
+ - cron: "0 16 * * *"
+
+jobs:
+ check:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+ token: ${{ secrets.WF_TOKEN }}
+
+ - name: sync
+ id: sync
+ shell: bash
+ run: |
+ git config --global user.name 'j-hc'
+ git config --global user.email 'j-hc@users.noreply.github.com'
+ if [[ $(git log | grep Author | head -1) == *"semantic"* ]]; then
+ git reset --hard HEAD~1
+ fi
+ T=$(git tag -l)
+ git remote add upstream https://github.com/revanced/revanced-cli
+ git tag -d $T
+ git fetch upstream --tags -f
+
+ C=$(git rev-list --left-right --count origin/main...remotes/upstream/main | awk '{print$2}')
+ echo "ahead $C commits"
+ if [ "$C" -gt 0 ]; then
+ echo "rebasing"
+ git push origin -d $T
+ if ! git rebase -X ours upstream/main; then
+ git diff --name-only --diff-filter=U | xargs git rm
+ GIT_EDITOR=true git rebase --continue
+ fi
+ git push --tags -f
+ git push -f
+ else
+ echo "in sync"
+ fi
+

.releaserc

@@ -36,13 +36,6 @@
  ],
  successComment: false
  }
- ],
- [
- "@saithodev/semantic-release-backmerge",
- {
- backmergeBranches: [{"from": "main", "to": "dev"}],
- clearWorkspace: true
- }
  ]
  ]
 }

src/main/kotlin/app/revanced/cli/aligning/Aligning.kt

@@ -8,7 +8,7 @@ import app.revanced.utils.signing.align.zip.structures.ZipEntry
 import java.io.File
 
 object Aligning {
- fun align(result: PatcherResult, inputFile: File, outputFile: File) {
+ fun align(result: PatcherResult, inputFile: File, outputFile: File, exclude: Array<String>) {
  logger.info("Aligning ${inputFile.name} to ${outputFile.name}")
 
  if (outputFile.exists()) outputFile.delete()
@@ -28,8 +28,10 @@ object Aligning {
  )
  }
 
+ val inputZipFile = ZipFile(inputFile)
+ inputZipFile.entries.removeIf { entry -> exclude.any { entry.fileName.startsWith("lib/$it") } }
  file.copyEntriesFromFileAligned(
- ZipFile(inputFile),
+ inputZipFile,
  ZipAligner::getEntryAlignment
  )
  }

src/main/kotlin/app/revanced/cli/command/MainCommand.kt

@@ -129,6 +129,12 @@ internal object MainCommand : Runnable {
 
  @Option(names = ["--custom-aapt2-binary"], description = ["Path to custom aapt2 binary"])
  var aaptPath: String = ""
+
+ @Option(names = ["--unsigned"], description = ["Disable signing of the final apk"])
+ var unsigned: Boolean = false
+
+ @Option(names = ["--rip-lib"], description = ["Rip the libs (arm64-v8a etc.) from APK"])
+ var ripLibs = arrayOf<String>()
  }
 
  override fun run() {
@@ -169,10 +175,10 @@ internal object MainCommand : Runnable {
 
  // align the file
  val alignedFile = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_aligned.apk")
- Aligning.align(result, args.inputFile, alignedFile)
+ Aligning.align(result, args.inputFile, alignedFile, pArgs.ripLibs)
 
  // sign the file
- val finalFile = if (!pArgs.mount) {
+ val finalFile = if (!pArgs.mount && !pArgs.unsigned) {
  val signedOutput = cacheDirectory.resolve("${outputFile.nameWithoutExtension}_signed.apk")
  Signing.sign(
  alignedFile,