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 @@ - - - - + 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 @@ - - SPD-Classes - 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 @@ - - - ShatteredPD INDEV - - \ 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 @@ 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 @@ - - - - Shattered Pixel Dungeon - - \ No newline at end of file