From d37b1957085984923e7b62c753ebf15aff32fa97 Mon Sep 17 00:00:00 2001
From: TobiGr <tobigr@users.noreply.github.com>
Date: Sat, 11 Apr 2020 22:17:39 +0200
Subject: [PATCH] Fix F-Droid build

Fixes the behaviour described in https://github.com/TeamNewPipe/NewPipe/pull/3265#issuecomment-612102349
---
 app/build.gradle | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6db015b7b..016b2faf2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -27,12 +27,6 @@ android {
     }
 
     buildTypes {
-        release {
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-
         debug {
             multiDexEnabled true
             debuggable true
@@ -50,6 +44,16 @@ android {
                 archivesBaseName = 'NewPipe_' + normalizedWorkingBranch
             }
         }
+
+        // Keep the release build type at the end of the list to override 'archivesBaseName' of
+        // debug build. This seems to be a Gradle bug, therefore
+        // TODO: update Gradle version
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            archivesBaseName = 'app'
+        }
     }
 
     lintOptions {