feat: prereleases

.github/workflows/pr-build.yml

@@ -17,6 +17,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Get commit hash
+        id: get_commit_hash
+        run: echo "hash=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -27,18 +31,10 @@ jobs:
         uses: gradle/gradle-build-action@v2
 
       - name: Build with Gradle
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease --no-daemon -PnoProguard -PsignAsDebug
-
-      - name: Set env
-        run: echo "COMMIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
-
-      - name: Add hash to APK
-        run: mv app/build/outputs/apk/release/app-release.apk revanced-manager-${{ env.COMMIT_HASH }}.apk
+        run: ./gradlew assembleRelease --no-daemon -PnoProguard -Psuffix=${{ steps.get_commit_hash.outputs.hash }}
 
       - name: Upload build
         uses: actions/upload-artifact@v3
         with:
-          name: revanced-manager
-          path: revanced-manager-${{ env.COMMIT_HASH }}.apk
+          name: revanced-manager-${{ steps.get_commit_hash.outputs.hash }}
+          path: app/build/outputs/apk/release/*.apk

.github/workflows/release-build.yml

@@ -1,25 +1,40 @@
 name: Release Build
 
 on:
+  workflow_dispatch:
   push:
-    tags:
-      - "v*"
+    branches:
+      - main
+      - dev
 
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set env
-        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Set up Node.js 20
+        uses: actions/setup-node@v2
+        with:
+          node-version: '20'
+
+      - name: Cache Node modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            node_modules
+          key: npm-${{ hashFiles('package-lock.json') }}
+
+      - name: Setup semantic-release
+        run: npm install
+
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         with:
@@ -28,24 +43,10 @@ jobs:
       - name: Build with Gradle
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: ./gradlew assembleRelease --no-daemon
-
-      - name: Sign APK
-        id: sign_apk
-        uses: ilharp/sign-android-release@v1
-        with:
-          releaseDir: ./app/build/outputs/apk/release/
-          signingKey: ${{ secrets.SIGNING_KEYSTORE }}
+          signingKey: "keystore.jks"
           keyStorePassword: ${{ secrets.SIGNING_KEYSTORE_PASSWORD }}
           keyAlias: ${{ secrets.SIGNING_KEY_ALIAS }}
           keyPassword: ${{ secrets.SIGNING_KEY_PASSWORD }}
-
-      - name: Add version to APK
-        run: mv ${{ steps.sign_apk.outputs.signedFile }} revanced-manager-${{ env.RELEASE_VERSION }}.apk
-
-      - name: Publish release APK
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          prerelease: false
-          files: revanced-manager-${{ env.RELEASE_VERSION }}.apk
+        run: |
+          echo "${{ secrets.SIGNING_KEYSTORE }}" | base64 --decode > app/keystore.jks
+          npx semantic-release

.gitignore

@@ -8,4 +8,4 @@
 .externalNativeBuild
 .cxx
 local.properties
-
+/node_modules

.releaserc

@@ -0,0 +1,47 @@
+{
+  "branches": [
+    "main",
+    {
+      "name": "dev",
+      "prerelease": true
+    }
+  ],
+  "plugins": [
+    [
+      "@semantic-release/commit-analyzer", {
+        "releaseRules": [
+          { "type": "build", "scope": "Needs bump", "release": "patch" }
+        ]
+      }
+    ],
+    "@semantic-release/changelog",
+    "@semantic-release/release-notes-generator",
+    "gradle-semantic-release-plugin",
+    [
+      "@semantic-release/git",
+      {
+        "assets": [
+          "gradle.properties"
+        ]
+      }
+    ],
+    [
+      "@semantic-release/github",
+      {
+        "assets": [
+          {
+            "path": "app/build/outputs/apk/release/revanced-manager*.apk"
+          }
+        ],
+        "successComment": false
+      }
+    ],
+    [
+      "@saithodev/semantic-release-backmerge",
+      {
+        "backmergeBranches": [{"from": "main", "to": "dev"}],
+        "clearWorkspace": true
+      }
+    ]
+  ]
+}

app/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     kotlin("plugin.serialization") version "1.9.10"
 }
 
+val (majorVersion, minorVersion, patchVersion, devVersion) = "${project.version}.0".replace("-dev","").split(".")
 android {
     namespace = "app.revanced.manager"
     compileSdk = 34
@@ -16,8 +17,8 @@ android {
         applicationId = "app.revanced.manager"
         minSdk = 26
         targetSdk = 34
-        versionCode = 1
-        versionName = "0.0.1"
+        versionName = project.version.toString()
+        versionCode = (majorVersion.toInt() * 100000000) + (minorVersion.toInt() * 100000) + (patchVersion.toInt() * 100) + devVersion.toInt()
         resourceConfigurations.addAll(listOf(
             "en",
         ))
@@ -31,16 +32,36 @@ android {
         }
 
         release {
+            if (System.getenv("signingKey") != null) {
+                signingConfigs {
+                    create("release") {
+                        storeFile = file(System.getenv("signingKey"))
+                        storePassword = System.getenv("keyStorePassword")
+                        keyAlias = System.getenv("keyAlias")
+                        keyPassword = System.getenv("keyPassword")
+                    }
+                }
+                signingConfig = signingConfigs.getByName("release")
+            } else {
+                applicationIdSuffix = ".debug"
+                resValue("string", "app_name", "ReVanced Manager Debug")
+                signingConfig = signingConfigs.getByName("debug")
+            }
             if (!project.hasProperty("noProguard")) {
                 isMinifyEnabled = true
                 isShrinkResources = true
                 proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
             }
-
-            if (project.hasProperty("signAsDebug")) {
-                applicationIdSuffix = ".debug"
-                resValue("string", "app_name", "ReVanced Manager Debug")
-                signingConfig = signingConfigs.getByName("debug")
+            var suffix = "v${project.version}"
+            if (project.hasProperty("suffix")) {
+                suffix = "${project.property("suffix")}"
+            }
+            applicationVariants.all {
+                this.outputs
+                    .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+                    .forEach { output ->
+                        output.outputFileName = "revanced-manager-${suffix}.apk"
+                    }
             }
         }
     }
@@ -89,6 +110,12 @@ kotlin {
     jvmToolchain(17)
 }
 
+tasks.register("publish") {
+    group = "Build"
+    description = "Assemble main outputs for all the variants."
+    dependsOn("assembleRelease")
+}
+
 dependencies {
 
     // AndroidX Core

gradle.properties

@@ -21,4 +21,5 @@ kotlin.code.style=official
 # 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
+android.nonFinalResIds=false
+version=0.0.1