From 4c1c9746056c50316792ededb10093eadf9feec3 Mon Sep 17 00:00:00 2001
From: mwang <8205347@qq.com>
Date: Sun, 30 Jun 2019 00:49:02 +0800
Subject: [PATCH] remove R8 option, due to
app:transformClassesAndResourcesWithR8ForRelease when release apk
---
gradle.properties | 1 +
zhuike/build.gradle | 16 +++--
zhuike/src/main/AndroidManifest.xml | 4 +-
zhuike/zhuike.iml | 99 +++++++++++++++++++----------
4 files changed, 80 insertions(+), 40 deletions(-)
create mode 100644 gradle.properties
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..ae73c9b
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+android.enableR8=false
diff --git a/zhuike/build.gradle b/zhuike/build.gradle
index 9f495d7..0c2240e 100644
--- a/zhuike/build.gradle
+++ b/zhuike/build.gradle
@@ -17,8 +17,8 @@ android {
// applicationId "com.zhushou.yueshu"
minSdkVersion 19 //target 19 Android 4.4 以下版本仅占比4.1%
targetSdkVersion 28
- versionCode 6
- versionName "v6.0"
+ versionCode 1
+ versionName "v1.0"
// testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -62,7 +62,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
// versionCode 1
// versionName "v1.0"
- /*applicationVariants.all { variant ->
+ applicationVariants.all { variant ->
variant.outputs.all { output ->
def outFile = output.outputFile
if (outFile != null && outFile.name.endsWith(".apk")) {
@@ -71,12 +71,12 @@ android {
outputFileName = fileName;
}
}
- }*/
+ }
signingConfig signingConfigs.releaseConfig
}
}
//渠道
- /*productFlavors {
+ productFlavors {
// googleplay {}
g {
applicationId "com.zhushou.yueshu"
@@ -98,7 +98,7 @@ android {
flavor.manifestPlaceholders = [UMENG_CHANNEL_VALUE: name]
}
- }*/
+ }
android {
lintOptions {
abortOnError false
@@ -114,6 +114,10 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
+ dexOptions {
+ javaMaxHeapSize "4g"
+ }
+
}
def releaseTime() {
diff --git a/zhuike/src/main/AndroidManifest.xml b/zhuike/src/main/AndroidManifest.xml
index 4356517..916445c 100644
--- a/zhuike/src/main/AndroidManifest.xml
+++ b/zhuike/src/main/AndroidManifest.xml
@@ -197,8 +197,8 @@
-
-
+
+
-
-
-
+
+
+
- generateDebugSources
+ generateGDebugSources
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -88,26 +130,18 @@
-
-
-
-
-
-
-
-
-
+
@@ -115,17 +149,18 @@
-
+
+
-
+
-
+