From fb34d976e85098fa24c4c5a365795c95302de169 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Sun, 14 Jul 2019 21:01:40 -0400
Subject: [PATCH] v0.7.4: centralized even more build properties, including
 moving some things out of app manifest

---
 SPD-classes/src/main/AndroidManifest.xml    |  8 +-------
 SPD-classes/src/main/res/values/strings.xml |  3 ---
 build.gradle                                |  7 +++++--
 core/build.gradle                           | 13 +++++++++----
 core/src/debug/res/values/strings.xml       |  5 -----
 core/src/main/AndroidManifest.xml           |  6 ++----
 core/src/main/res/values/strings.xml        |  6 ------
 7 files changed, 17 insertions(+), 31 deletions(-)
 delete mode 100644 SPD-classes/src/main/res/values/strings.xml
 delete mode 100644 core/src/debug/res/values/strings.xml
 delete mode 100644 core/src/main/res/values/strings.xml

diff --git a/SPD-classes/src/main/AndroidManifest.xml b/SPD-classes/src/main/AndroidManifest.xml
index 99264321d..4595a71eb 100644
--- a/SPD-classes/src/main/AndroidManifest.xml
+++ b/SPD-classes/src/main/AndroidManifest.xml
@@ -3,12 +3,6 @@
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 
-    <uses-feature
-        android:glEsVersion="0x00020000"/>
-
-    <application
-        android:label="@string/app_name"
-        >
-    </application>
+    <uses-feature android:glEsVersion="0x00020000"/>
 
 </manifest>
diff --git a/SPD-classes/src/main/res/values/strings.xml b/SPD-classes/src/main/res/values/strings.xml
deleted file mode 100644
index 34db9ec1c..000000000
--- a/SPD-classes/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">SPD-Classes</string>
-</resources>
diff --git a/build.gradle b/build.gradle
index 7a9aa013c..8ec376f1d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,8 +11,11 @@ buildscript {
 allprojects {
 
     ext {
-        appVersionCode = 353
-        appVersionName = '0.7.4-BETA-4'
+        appName = 'Shattered Pixel Dungeon'
+        appPackageName = 'com.shatteredpixel.shatteredpixeldungeon'
+
+        appVersionCode = 349
+        appVersionName = '0.7.3b'
 
         appAndroidCompileSDK = 28
         appAndroidMinSDK = 9
diff --git a/core/build.gradle b/core/build.gradle
index f469910ef..93b81da5b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -4,13 +4,18 @@ android {
     compileSdkVersion appAndroidCompileSDK
 
     defaultConfig {
-        resConfigs "en_US", "cs", "tr", "ca", "ko", "pl", "it",
-                "eo", "ru", "zh_CN", "de", "fr", "es", "pt", "fi", "hu", "in"
+        manifestPlaceholders = [appName:appName]
+        applicationId appPackageName
+
+        versionCode appVersionCode
+        versionName appVersionName
+
         //noinspection MinSdkTooLow
         minSdkVersion appAndroidMinSDK
         targetSdkVersion appAndroidTargetSDK
-        versionCode appVersionCode
-        versionName appVersionName
+
+        resConfigs "en_US", "cs", "tr", "ca", "ko", "pl", "it",
+                "eo", "ru", "zh_CN", "de", "fr", "es", "pt", "fi", "hu", "in"
     }
 
     buildTypes {
diff --git a/core/src/debug/res/values/strings.xml b/core/src/debug/res/values/strings.xml
deleted file mode 100644
index b201e23cf..000000000
--- a/core/src/debug/res/values/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<resources>
-
-    <string name="app_name">ShatteredPD INDEV</string>
-
-</resources>
\ No newline at end of file
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index 378922ae5..e3c072529 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 	package="com.shatteredpixel.shatteredpixeldungeon"
-	android:versionCode="349"
-	android:versionName="0.7.3b"
 	android:installLocation="auto">
 	
 	<uses-feature
@@ -18,14 +16,14 @@
 
 	<application
 		android:icon="@mipmap/ic_launcher"
-		android:label="@string/app_name"
+		android:label="${appName}"
 		android:theme="@android:style/Theme.Black.NoTitleBar"
 		android:resizeableActivity="true"
 		android:allowBackup="true"
 		android:fullBackupOnly="true"
 		android:backupAgent="com.shatteredpixel.shatteredpixeldungeon.BackupHandler">
 		<activity
-			android:label="@string/app_name"
+			android:label="${appName}"
 			android:name="com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon"
 			android:screenOrientation="nosensor">
 			<intent-filter >
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
deleted file mode 100644
index 1949e953e..000000000
--- a/core/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-	<string name="app_name">Shattered Pixel Dungeon</string>
-
-</resources>
\ No newline at end of file