Revert "Merge pull request TeamNewPipe#13590 from TeamNewPipe/misc"

This reverts commit 8dc1315, reversing
changes made to d927f44.

Author: r-i-s-u

.github/workflows/ci.yml

@@ -55,13 +55,13 @@ jobs:
           cache: 'gradle'
 
       - name: Build debug APK and run jvm tests
-        run: ./gradlew assembleContinuous lintContinuous testDebugUnitTest --stacktrace -DskipFormatKtlint
+        run: ./gradlew assembleDebug lintDebug testDebugUnitTest --stacktrace -DskipFormatKtlint
 
       - name: Upload APK
         uses: actions/upload-artifact@v7
         with:
           name: app
-          path: app/build/outputs/apk/continuous/*.apk
+          path: app/build/outputs/apk/debug/*.apk
 
   test-android:
     runs-on: ubuntu-latest

app/build.gradle.kts

@@ -21,11 +21,6 @@ plugins {
 val gitWorkingBranch = providers.exec {
     commandLine("git", "rev-parse", "--abbrev-ref", "HEAD")
 }.standardOutput.asText.map { it.trim() }
-val defaultBranches = listOf("master", "dev")
-val workingBranch = gitWorkingBranch.getOrElse("")
-val normalizedWorkingBranch = workingBranch
-    .replaceFirst("^[^A-Za-z]+".toRegex(), "")
-    .replace("[^0-9A-Za-z]+".toRegex(), "")
 
 kotlin {
     jvmToolchain(21)
@@ -68,7 +63,14 @@ configure<ApplicationExtension> {
             isDebuggable = true
 
             // suffix the app id and the app name with git branch name
+            val defaultBranches = listOf("master", "dev")
+            val workingBranch = gitWorkingBranch.getOrElse("")
+            val normalizedWorkingBranch = workingBranch
+                .replaceFirst("^[^A-Za-z]+".toRegex(), "")
+                .replace("[^0-9A-Za-z]+".toRegex(), "")
+
             if (normalizedWorkingBranch.isEmpty() || workingBranch in defaultBranches) {
+                // default values when branch name could not be determined or is master or dev
                 applicationIdSuffix = ".debug"
                 resValue("string", "app_name", "NewPipe Debug")
             } else {
@@ -89,21 +91,6 @@ configure<ApplicationExtension> {
                 "proguard-rules.pro"
             )
         }
-
-        register("continuous") {
-            initWith(getByName("release"))
-            signingConfig = signingConfigs.getByName("debug")
-            isDefault = true
-
-            // suffix the app id and the app name with git branch name
-            if (normalizedWorkingBranch.isEmpty() || workingBranch in defaultBranches) {
-                applicationIdSuffix = ".continuous"
-                resValue("string", "app_name", "NewPipe Continuous")
-            } else {
-                applicationIdSuffix = ".continuous.$normalizedWorkingBranch"
-                resValue("string", "app_name", "NewPipe $workingBranch")
-            }
-        }
     }
 
     lint {

buildSrc/settings.gradle.kts

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
-rootProject.name = "NewPipe"
 
 pluginManagement {
     repositories {