fix: Specify Build tools for API

Co-authored-by: Ax333l <main@axelen.xyz>

.github/workflows/build_pull_request.yml

@@ -13,6 +13,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Cache Gradle
         uses: burrunan/gradle-cache-action@v1

.github/workflows/release.yml

@@ -12,13 +12,14 @@ jobs:
     name: Release
     permissions:
       contents: write
-      packages: write
       id-token: write
       attestations: write
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup Java
         uses: actions/setup-java@v4
@@ -27,11 +28,10 @@ jobs:
           java-version: '17'
 
       - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v3
+        uses: burrunan/gradle-cache-action@v1
 
       - name: Build
         env:
-          GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew assembleRelease
 
@@ -55,26 +55,18 @@ jobs:
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
 
-      - name: Release API
-        run: npx multi-semantic-release --tag-format 'api@${version}' --ignore-packages app
+      - name: Semantic Release
+        uses: cycjimmy/semantic-release-action@v4
+        id: semantic
         env:
-          GITHUB_ACTOR: ${{ github.actor }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Release
-        id: release
-        run: |
-          echo "NEW_TAG=$(npx multi-semantic-release --tag-format 'v${version}' --ignore-packages api | tee | grep 'Created tag ' | sed -E 's/.*Created tag ([^ ]+).*/\1/')" >> $GITHUB_OUTPUT
-        env:
-          GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEYSTORE_ENTRY_ALIAS: ${{ secrets.KEYSTORE_ENTRY_ALIAS }}
           KEYSTORE_ENTRY_PASSWORD: ${{ secrets.KEYSTORE_ENTRY_PASSWORD }}
 
       - name: Attest
-        if: steps.release.outputs.NEW_TAG != ''
+        if: steps.semantic.outputs.new_release_published == 'true'
         uses: actions/attest-build-provenance@v2
         with:
-          subject-name: 'ReVanced Manager ${{ steps.release.outputs.NEW_TAG }}'
+          subject-name: 'ReVanced Manager ${{ steps.release.outputs.new_release_git_tag }}'
           subject-path: app/build/outputs/apk/release/revanced-manager*.apk

.releaserc

@@ -8,8 +8,7 @@
   ],
   "plugins": [
     [
-      "@semantic-release/commit-analyzer",
-      {
+      "@semantic-release/commit-analyzer", {
         "releaseRules": [
           { "type": "build", "scope": "Needs bump", "release": "patch" }
         ]
@@ -23,7 +22,7 @@
       {
         "assets": [
           "CHANGELOG.md",
-          "gradle.properties"
+          "gradle.properties",
         ],
         "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
@@ -33,17 +32,17 @@
       {
         "assets": [
           {
-            "path": "build/outputs/apk/release/revanced-manager*.apk?(.asc)"
-          }
+            "path": "app/build/outputs/apk/release/revanced-manager*.apk?(.asc)"
+          },
         ],
-        "successComment": false
+        successComment: false
       }
     ],
     [
       "@saithodev/semantic-release-backmerge",
       {
-        "backmergeBranches": [{"from": "main", "to": "dev"}],
-        "clearWorkspace": true
+        backmergeBranches: [{"from": "main", "to": "dev"}],
+        clearWorkspace: true
       }
     ]
   ]

adsfund.json

@@ -1,8 +0,0 @@
-{
-  "info": "This is verification file for ads.fund project",
-  "project": {
-    "name": "ReVanced Manager",
-    "walletAddress": "0x7ab4091e00363654bf84B34151225742cd92FCE5",
-    "tokenAddress": "0xadf954bc6f509b3a32fb5e97ed4ba6c000e37155"
-  }
-}

api/.releaserc

@@ -1,39 +0,0 @@
-{
-  "branches": [
-    "main",
-    {
-      "name": "dev",
-      "prerelease": true
-    }
-  ],
-  "plugins": [
-    [
-      "@semantic-release/commit-analyzer",
-      {
-        "releaseRules": [
-          { "type": "build", "scope": "Needs bump", "release": "patch" }
-        ]
-      }
-    ],
-    "@semantic-release/release-notes-generator",
-    "@semantic-release/changelog",
-    "gradle-semantic-release-plugin",
-    [
-      "@semantic-release/git",
-      {
-        "assets": [
-          "CHANGELOG.md",
-          "gradle.properties"
-        ],
-        "message": "chore: Release API v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
-      }
-    ],
-    [
-      "@saithodev/semantic-release-backmerge",
-      {
-        "backmergeBranches": [{"from": "main", "to": "dev"}],
-        "clearWorkspace": true
-      }
-    ]
-  ]
-}

api/build.gradle.kts

@@ -1,3 +1,5 @@
+import java.io.IOException
+
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -17,9 +19,47 @@ dependencies {
     implementation(libs.appcompat)
 }
 
+fun String.runCommand(): String {
+    val process = ProcessBuilder(split("\\s".toRegex()))
+        .redirectErrorStream(true)
+        .directory(rootDir)
+        .start()
+
+    val output = StringBuilder()
+    val reader = process.inputStream.bufferedReader()
+
+    val thread = Thread {
+        reader.forEachLine {
+            output.appendLine(it)
+        }
+    }
+    thread.start()
+
+    if (!process.waitFor(10, TimeUnit.SECONDS)) {
+        process.destroy()
+        throw IOException("Command timed out: $this")
+    }
+
+    thread.join()
+    return output.toString().trim()
+}
+
+val projectPath: String = projectDir.relativeTo(rootDir).path
+val lastTag = "git describe --tags --abbrev=0".runCommand()
+val hasChangesInThisModule = "git diff --name-only $lastTag..HEAD".runCommand().lineSequence().any {
+    it.startsWith(projectPath)
+}
+
+tasks.matching { it.name.startsWith("publish") }.configureEach {
+    onlyIf {
+        hasChangesInThisModule
+    }
+}
+
 android {
     namespace = "app.revanced.manager.plugin.downloader"
     compileSdk = 35
+    buildToolsVersion = "35.0.1"
 
     defaultConfig {
         minSdk = 26
@@ -108,4 +148,4 @@ publishing {
 signing {
     useGpgCmd()
     sign(publishing.publications["Api"])
-}
+}

api/gradlew

@@ -1 +0,0 @@
-../gradlew

api/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "api",
-  "private": false,
-  "devDependencies": {
-    "@anolilab/multi-semantic-release": "^1.1.10",
-    "@saithodev/semantic-release-backmerge": "^4.0.1",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.10.1"
-  }
-}

app/build.gradle.kts

@@ -1,4 +1,3 @@
-import io.github.z4kn4fein.semver.toVersion
 import kotlin.random.Random
 
 plugins {
@@ -110,16 +109,6 @@ dependencies {
     implementation(libs.compose.icons.fontawesome)
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        // Semantic versioning string parser
-        classpath(libs.semver.parser)
-    }
-}
-
 android {
     namespace = "app.revanced.manager"
     compileSdk = 35
@@ -129,15 +118,8 @@ android {
         applicationId = "app.revanced.manager"
         minSdk = 26
         targetSdk = 35
-
-        val versionStr = if (version == "unspecified") "1.0.0" else version.toString()
-        versionName = versionStr
-        versionCode = with(versionStr.toVersion()) {
-            major * 10_000_000 +
-                    minor * 10_000 +
-                    patch * 100 +
-                    (preRelease?.substringAfterLast('.')?.toInt() ?: 99)
-        }
+        versionCode = 1
+        versionName = "0.0.1"
         vectorDrawables.useSupportLibrary = true
     }
 

app/gradlew

@@ -1 +0,0 @@
-../gradlew

app/package.json

@@ -1,11 +0,0 @@
-{
-  "name": "app",
-  "private": false,
-  "devDependencies": {
-    "@anolilab/multi-semantic-release": "^1.1.10",
-    "@saithodev/semantic-release-backmerge": "^4.0.1",
-    "@semantic-release/changelog": "^6.0.3",
-    "@semantic-release/git": "^10.0.1",
-    "gradle-semantic-release-plugin": "^1.10.1"
-  }
-}

app/proguard-rules.pro

@@ -1,14 +1,63 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.kts.kts.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
 -dontobfuscate
 
--keep class app.revanced.manager.patcher.runtime.process.* { *; }
--keep class app.revanced.manager.plugin.** { *; }
--keep class app.revanced.patcher.** { *; }
--keep class com.android.tools.smali.** { *; }
--keep class kotlin.** { *; }
--keepnames class com.android.apksig.internal.** { *; }
--keepnames class org.xmlpull.** { *; }
+# Required for serialization to work properly
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
 
--dontwarn com.google.j2objc.annotations.*
+# This required for the process runtime.
+-keep class app.revanced.manager.patcher.runtime.process.* {
+  *;
+}
+# Required for the patcher to function correctly
+-keep class app.revanced.patcher.** {
+  *;
+}
+-keep class brut.** {
+  *;
+}
+-keep class org.xmlpull.** {
+  *;
+}
+-keep class kotlin.** {
+  *;
+}
+-keep class org.jf.** {
+  *;
+}
+-keep class com.android.** {
+  *;
+}
+-keep class app.revanced.manager.plugin.** {
+  *;
+}
+
+-dontwarn com.google.auto.value.**
 -dontwarn java.awt.**
 -dontwarn javax.**
--dontwarn org.slf4j.**
+-dontwarn org.slf4j.**
+-dontwarn it.skrape.fetcher.*
+-dontwarn com.google.j2objc.annotations.*
+
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault

docs/2_3_managing_patches.md

@@ -16,7 +16,7 @@ Learn how to add new, manage existing or remove patches.
 
 ## ⏭️ What's next
 
-The next page will explain how to manage downloaders.
+The next page will explain how to update ReVanced Manager.
 
-Continue: [🔄 Updating ReVanced Manager](2_4_managing_downloaders.md)
+Continue: [🔄 Updating ReVanced Manager](2_4_updating.md)
 

docs/2_4_managing_downloaders.md

@@ -1,15 +0,0 @@
-# 🧩 Managing downloaders
-
-Learn how to manage downloaders.
-Refer to the [template](https://github.com/ReVanced/revanced-manager-downloader-template) if you are developer who wants to create a plugin.
-
-Downloaders are Apk files and are installed, updated and uninstalled just like regular Android apps.
-Downloaders can execute arbitrary code inside ReVanced Manager and must be marked as trusted before use. Manager will show a notification in the dashboard when a new downloader is discovered.
-Trust can also be granted and revoked under `Settings` > `Downloads`.
-
-## ⏭️ What's next
-
-The next page will explain how to update ReVanced Manager.
-
-Continue: [🔄 Updating ReVanced Manager](2_5_updating.md)
-

docs/2_4_updating.md

@@ -15,4 +15,4 @@ and let you when an update is available.
 
 The next page will explain how to configure ReVanced Manager.
 
-Continue: [⚙️ Configuring ReVanced Manager](2_6_settings.md)
+Continue: [⚙️ Configuring ReVanced Manager](2_5_settings.md)

gradle.properties

@@ -1,6 +1,28 @@
+# Project-wide Gradle settings.
+# IDE (e.g. Android Studio) users:
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
+# When configured, Gradle will run in incubating parallel mode.
+# This option should only be used with decoupled projects. More details, visit
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
+# org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
+# Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.nonFinalResIds=false
+# Task :app:assembleReleaseSignApk fails if this is set to true.
+org.gradle.configuration-cache=false
 org.gradle.caching=true
+version=1.25.0-dev.1

gradle/libs.versions.toml

@@ -36,7 +36,6 @@ compose-icons = "1.2.4"
 kotlin-process = "1.5.1"
 hidden-api-stub = "4.3.3"
 binary-compatibility-validator = "0.17.0"
-semver-parser = "3.0.0"
 
 [libraries]
 # AndroidX Core
@@ -130,9 +129,6 @@ reorderable = { module = "sh.calvin.reorderable:reorderable", version.ref = "reo
 # switch to br.com.devsrsouza.compose.icons after DevSrSouza/compose-icons#30 is merged
 compose-icons-fontawesome = { group = "com.github.BenjaminHalko.compose-icons", name = "font-awesome", version.ref = "compose-icons" }
 
-# Semantic versioning parser
-semver-parser = { module = "io.github.z4kn4fein:semver", version.ref = "semver-parser" }
-
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
 android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }

package.json

@@ -1,11 +1,10 @@
 {
-  "private": true,
-  "workspaces": [
-    "api",
-    "app"
-  ],
   "devDependencies": {
-    "@anolilab/multi-semantic-release": "^2.0.3",
-    "semantic-release": "^24.2.7"
+    "@anolilab/multi-semantic-release": "^1.1.10",
+    "gradle-semantic-release-plugin": "^1.10.1",
+    "@saithodev/semantic-release-backmerge": "^4.0.1",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/exec": "^6.0.3",
+    "@semantic-release/git": "^10.0.1"
   }
 }