From cdc3d9e7546adceb934f6092c41dcf32591eb000 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Sun, 16 Apr 2023 03:30:14 +0900
Subject: [PATCH] =?UTF-8?q?build.gradle=E3=81=A7APK=E5=87=BA=E5=8A=9B?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=80=E3=82=92=E5=A4=89=E6=9B=B4?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA=E3=81=A3=E3=81=9F?=
 =?UTF-8?q?=E3=81=AE=E3=81=A7=E3=80=81apkGen.pl=E3=81=A7=E5=87=A6=E7=90=86?=
 =?UTF-8?q?=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore       | 1 +
 apkGen.pl        | 6 ++++--
 app/build.gradle | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5fbcf79c..bbde68a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -139,3 +139,4 @@ keystore.properties
 
 
 app/fcm/release/output-metadata.json
+/_apk/
diff --git a/apkGen.pl b/apkGen.pl
index abf66e4c..e0e254fd 100644
--- a/apkGen.pl
+++ b/apkGen.pl
@@ -21,5 +21,7 @@ cmd "./gradlew clean";
 cmd "./gradlew assembleNoFcmRelease";
 cmd "./gradlew assembleFcmRelease";
 cmd "./gradlew --stop";
-cmd "mv app/build/outputs/apk/SubwayTooter*.apk app/";
-cmd " ls -1t app/SubwayTooter*.apk |head -n 5";
+
+cmd "mkdir -p _apk";
+cmd "mv `find app/build/outputs/apk/ -path '*.apk'` _apk/";
+cmd "ls -1t _apk/SubwayTooter*.apk |head -n 5";
diff --git a/app/build.gradle b/app/build.gradle
index b57fa821..2d8d82e7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -128,7 +128,7 @@ android {
                 // def abi = output.getFilter("ABI") ?: "all"
                 def date = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date())
                 def branch = gitBranch()
-                outputFileName = "../../SubwayTooter-${branch}-${flavor}-${versionCode}-${versionName}-${date}.apk"
+                outputFileName = "SubwayTooter-${branch}-${flavor}-${versionCode}-${versionName}-${date}.apk"
             }
         }
     }