From 82f8c15f09fd56dff4c1ef236f35b8d7c80de73d Mon Sep 17 00:00:00 2001
From: gedoor <gekunfei@live.com>
Date: Tue, 1 Sep 2020 15:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=90=8C=E6=B8=A0=E9=81=93=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=B8=8D=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c3568972c..25ecc6c7f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,7 +19,6 @@ def gitCommits = Integer.parseInt('git rev-list --count HEAD'.execute([], projec
 
 android {
     compileSdkVersion 29
-    flavorDimensions("version")
     signingConfigs {
         if (project.hasProperty("RELEASE_STORE_FILE")) {
             myConfig {
@@ -71,17 +70,19 @@ android {
         }
         android.applicationVariants.all { variant ->
             variant.outputs.all {
-                outputFileName = "${name}_${defaultConfig.versionName}.apk"
+                def flavor = variant.productFlavors[0].name
+                outputFileName = "${name}_${flavor}_${defaultConfig.versionName}.apk"
             }
         }
     }
+    flavorDimensions "mode"
     productFlavors {
         app {
-            dimension "version"
+            dimension "mode"
             manifestPlaceholders = [APP_CHANNEL_VALUE: "app"]
         }
         google {
-            dimension "version"
+            dimension "mode"
             applicationId "io.legado.play"
             manifestPlaceholders = [APP_CHANNEL_VALUE: "google"]
         }