From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能
---
app/build.gradle | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 6afc232..ed1b44c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,16 @@
apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply from: 'tinker-support.gradle'
android {
- compileSdkVersion 25
- buildToolsVersion '26.0.2'
+ compileSdkVersion rootProject.ext.android.compileSdkVersion
+ buildToolsVersion rootProject.ext.android.buildToolsVersion
defaultConfig {
applicationId "com.moral.yunfushao"
- minSdkVersion 21
- targetSdkVersion 25
- versionCode 2
- versionName "1.0.2_sp10"
+ minSdkVersion rootProject.ext.android.minSdkVersion
+ targetSdkVersion rootProject.ext.android.targetSdkVersion
+ versionCode rootProject.ext.android.versionCode
+ versionName rootProject.ext.android.versionName
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
signingConfig signingConfigs.debug
}
@@ -18,7 +20,8 @@
key {
keyAlias 'moral'
keyPassword 'moral123456'
- storeFile file('../pregnancy_guard_android/key.jks')
+ storeFile file('../key.jks')
+ //md5 6B:AD:23:76:61:03:1D:9A:B8:E2:05:90:3E:4D:9F:00
storePassword 'moral123456'
}
}
@@ -27,12 +30,18 @@
jniLibs.srcDirs = ['libs']
}
}
+
+ repositories {
+ flatDir {
+ dirs 'libs'
+ }
+ }
//���������������
- //3.0������
+ //6.0������
android.applicationVariants.all { variant ->
variant.outputs.all {
if (buildType.name == "debug")
- outputFileName = "Dev_yfs_v.${variant.versionName}.apk"
+ outputFileName = "Dev_yfs_v.${variant.versionName}${rootProject.ext.android.debugVersion}.apk"
else outputFileName = "yfs_v.${variant.versionName}.apk"
}
}
@@ -43,10 +52,12 @@
zipAlignEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
manifestPlaceholders = [app_name: "@string/app_name"]//������������
+ signingConfig signingConfigs.key
}
debug {
minifyEnabled false
manifestPlaceholders = [app_name: "@string/app_name_text"]
+ signingConfig signingConfigs.key
}
}
}
@@ -74,4 +85,21 @@
implementation 'org.greenrobot:eventbus:3.0.0'
implementation 'com.github.lecho:hellocharts-library:1.5.8@aar'
implementation 'com.contrarywind:Android-PickerView:3.1.2'
+ //bugly
+ implementation 'com.android.support:multidex:1.0.1'
+ // ���dex������
+ //���������������bugly���������
+ //compile 'com.tencent.bugly:crashreport:latest.release'//������latest.release������������������������������������������������������������������1.3.4
+ implementation 'com.tencent.bugly:crashreport_upgrade:1.3.6'
+ // ������tinker���������������������������������1.3.5������������������������tinker���
+ implementation 'com.tencent.tinker:tinker-android-lib:1.9.9'
+ implementation 'com.tencent.bugly:nativecrashreport:latest.release'
+ compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+ implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+'
+ // implementation 'com.tencent.mm.opensdk:wechat-sdk-android-with-mta:+'
+ implementation 'com.google.code.gson:gson:2.8.5'
+ implementation 'com.android.support:support-v4:25.3.1'
+}
+repositories {
+ mavenCentral()
}
--
Gitblit v1.8.0