ci: Adjust to release app and api module respectively (#2675)

Co-authored-by: semantic-release-bot <semantic-release-bot@martynus.net>
Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
Co-authored-by: Pun Butrach <pun.butrach@gmail.com>
Co-authored-by: Ax333l <main@axelen.xyz>

.github/workflows/release.yml

@@ -12,6 +12,7 @@ jobs:
     name: Release
     permissions:
       contents: write
+      packages: write
       id-token: write
       attestations: write
     runs-on: ubuntu-latest
@@ -26,10 +27,11 @@ jobs:
           java-version: '17'
 
       - name: Cache Gradle
-        uses: burrunan/gradle-cache-action@v1
+        uses: burrunan/gradle-cache-action@v3
 
       - name: Build
         env:
+          GITHUB_ACTOR: ${{ github.actor }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: ./gradlew assembleRelease
 
@@ -53,18 +55,26 @@ jobs:
         run: |
           echo "${{ secrets.KEYSTORE }}" | base64 --decode > "app/keystore.jks"
 
-      - name: Semantic Release
-        uses: cycjimmy/semantic-release-action@v4
-        id: semantic
+      - name: Release API
+        run: npx multi-semantic-release --tag-format 'api@${version}' --ignore-packages app
         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.semantic.outputs.new_release_published == 'true'
+        if: steps.release.outputs.NEW_TAG != ''
         uses: actions/attest-build-provenance@v2
         with:
-          subject-name: 'ReVanced Manager ${{ steps.release.outputs.new_release_git_tag }}'
+          subject-name: 'ReVanced Manager ${{ steps.release.outputs.NEW_TAG }}'
           subject-path: app/build/outputs/apk/release/revanced-manager*.apk

api/.releaserc

@@ -0,0 +1,39 @@
+{
+  "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,5 +1,3 @@
-import java.io.IOException
-
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
@@ -19,43 +17,6 @@ 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

api/gradlew

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

api/package.json

@@ -0,0 +1,11 @@
+{
+  "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/.releaserc

@@ -8,7 +8,8 @@
   ],
   "plugins": [
     [
-      "@semantic-release/commit-analyzer", {
+      "@semantic-release/commit-analyzer",
+      {
         "releaseRules": [
           { "type": "build", "scope": "Needs bump", "release": "patch" }
         ]
@@ -22,7 +23,7 @@
       {
         "assets": [
           "CHANGELOG.md",
-          "gradle.properties",
+          "gradle.properties"
         ],
         "message": "chore: Release v${nextRelease.version} [skip ci]\n\n${nextRelease.notes}"
       }
@@ -32,17 +33,17 @@
       {
         "assets": [
           {
-            "path": "app/build/outputs/apk/release/revanced-manager*.apk?(.asc)"
-          },
+            "path": "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
       }
     ]
   ]

app/build.gradle.kts

@@ -1,3 +1,4 @@
+import io.github.z4kn4fein.semver.toVersion
 import kotlin.random.Random
 
 plugins {
@@ -109,6 +110,16 @@ 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
@@ -118,8 +129,15 @@ android {
         applicationId = "app.revanced.manager"
         minSdk = 26
         targetSdk = 35
-        versionCode = 1
-        versionName = "0.0.1"
+
+        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)
+        }
         vectorDrawables.useSupportLibrary = true
     }
 

app/gradlew

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

app/package.json

@@ -0,0 +1,11 @@
+{
+  "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"
+  }
+}

gradle.properties

@@ -1,28 +1,6 @@
-# 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,6 +36,7 @@ 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
@@ -129,6 +130,9 @@ 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,10 +1,11 @@
 {
+  "private": true,
+  "workspaces": [
+    "api",
+    "app"
+  ],
   "devDependencies": {
-    "@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"
+    "@anolilab/multi-semantic-release": "^2.0.3",
+    "semantic-release": "^24.2.7"
   }
 }