From 8f16e46aae461b2a0732db8c495f8532052de69a Mon Sep 17 00:00:00 2001
From: Jienan Zhang <zjn0505@hotmail.com>
Date: Mon, 7 Jan 2019 14:14:47 +0800
Subject: [PATCH] Bump version to 2.3.6

---
 xkcd/build.gradle                 | 15 +++++++--------
 xkcd/proguard-rules.pro           |  4 +++-
 xkcd/resource_mapping.txt         |  3 +++
 xkcd/src/main/AndroidManifest.xml |  6 +++++-
 4 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 xkcd/resource_mapping.txt

diff --git a/xkcd/build.gradle b/xkcd/build.gradle
index f737d384..c06fb831 100644
--- a/xkcd/build.gradle
+++ b/xkcd/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'com.android.application'
 apply plugin: 'io.fabric'
 
 andResGuard {
-    mappingFile = null
+    mappingFile = file("./resource_mapping.txt")
     useSign = true
     keepRoot = false
 
     whiteList = [
             // for icon
-            "R.ic_launcher.png",
-            "R.ic_launcher_round.png",
+            "R.mipmap.ic_launcher",
+            "R.mipmap.ic_launcher_round",
             // for fabric
             "R.string.com.crashlytics.*",
             // for google-services
@@ -25,8 +25,7 @@ andResGuard {
 
             "R.string.arrow_1",
             "R.string.arrow_10",
-            "R.string.arrow_30",
-            "R.font.xkcd_script"
+            "R.string.arrow_30"
     ]
     compressFilePattern = [
             "*.png",
@@ -48,8 +47,8 @@ android {
         applicationId "xyz.jienan.xkcd"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 28
-        versionName "2.3.5"
+        versionCode 29
+        versionName "2.3.6"
         vectorDrawables.useSupportLibrary = true
         resConfigs "zh-rCN"
     }
@@ -83,7 +82,7 @@ android {
             minifyEnabled true
             zipAlignEnabled true
             shrinkResources true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig signingConfigs.releaseConfig
         }
     }
diff --git a/xkcd/proguard-rules.pro b/xkcd/proguard-rules.pro
index 4bf28dc8..755a9b21 100644
--- a/xkcd/proguard-rules.pro
+++ b/xkcd/proguard-rules.pro
@@ -85,4 +85,6 @@
 -dontwarn javax.annotation.**
 -dontwarn org.conscrypt.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
--keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
\ No newline at end of file
+-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+
+-optimizations !method/removal/parameter
\ No newline at end of file
diff --git a/xkcd/resource_mapping.txt b/xkcd/resource_mapping.txt
new file mode 100644
index 00000000..e5ade1b1
--- /dev/null
+++ b/xkcd/resource_mapping.txt
@@ -0,0 +1,3 @@
+res path mapping:
+    res/font -> res/font
+    res/font-v22 -> res/font-v22
\ No newline at end of file
diff --git a/xkcd/src/main/AndroidManifest.xml b/xkcd/src/main/AndroidManifest.xml
index f861993f..bab541a7 100644
--- a/xkcd/src/main/AndroidManifest.xml
+++ b/xkcd/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="xyz.jienan.xkcd">
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -12,7 +13,10 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppNoBarFontTheme">
+        android:extractNativeLibs="true"
+        tools:replace="android:extractNativeLibs"
+        android:theme="@style/AppNoBarFontTheme"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
         <activity
             android:name="xyz.jienan.xkcd.home.MainActivity"
             android:configChanges="screenSize|keyboardHidden"