From 47f5d71a81a528aff225805d28bf181ce4d6f55d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 15 Nov 2018 13:14:43 +0800
Subject: [PATCH] [*]1.0.3.2版本
---
app/build.gradle | 78 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 1460c65..087181f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,23 +1,27 @@
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_sp3"
+ 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
}
+
+
signingConfigs {
key {
- keyAlias 'qxpc'
- keyPassword '123456'
- storeFile file('../pregnancy_guard_android/qixingpiaochong')
- storePassword '123456'
+ keyAlias 'moral'
+ keyPassword 'moral123456'
+ storeFile file('../pregnancy_guard_android/key.jks')
+ storePassword 'moral123456'
}
}
sourceSets {
@@ -25,12 +29,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"
}
}
@@ -54,22 +64,36 @@
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
- compile 'com.android.support:appcompat-v7:25.3.1'
- compile 'com.android.support.constraint:constraint-layout:1.0.2'
- compile 'com.android.support:cardview-v7:25.3.1'
- testCompile 'junit:junit:4.12'
- compile project(':andbrickslib')
- compile project(':FastBleLib')
+ implementation 'com.android.support:appcompat-v7:25.3.1'
+ implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+ implementation 'com.android.support:cardview-v7:25.3.1'
+ testImplementation 'junit:junit:4.12'
+ implementation project(':andbrickslib')
+ implementation project(':FastBleLib')
//������������
- compile 'in.srain.cube:ultra-ptr:1.0.11'
+ implementation 'in.srain.cube:ultra-ptr:1.0.11'
//������������
- compile 'com.github.bumptech.glide:glide:3.7.0'
+ implementation 'com.github.bumptech.glide:glide:3.7.0'
//������������
- compile 'com.lzy.net:okgo:2.1.4'
- compile files('libs/BaiduLBS_Android.jar')
- compile 'pub.devrel:easypermissions:0.4.0'
- compile 'com.daimajia.numberprogressbar:library:1.4@aar'
- compile 'org.greenrobot:eventbus:3.0.0'
- compile 'com.github.lecho:hellocharts-library:1.5.8@aar'
- compile 'com.contrarywind:Android-PickerView:3.1.2'
+ implementation 'com.lzy.net:okgo:2.1.4'
+ implementation files('libs/BaiduLBS_Android.jar')
+ implementation 'pub.devrel:easypermissions:0.4.0'
+ implementation 'com.daimajia.numberprogressbar:library:1.4@aar'
+ 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"
+}
+repositories {
+ mavenCentral()
}
--
Gitblit v1.8.0