Skip to content

Commit

Permalink
更新依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
jixiaoyong committed Jan 19, 2019
1 parent ba5fa10 commit 8099857
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
36 changes: 17 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ if (hasLocalProp) {
}


def releaseTime() {
static def releaseTime() {
return new Date(System.currentTimeMillis()).format("yyyyMMdd")
}

android {
compileSdkVersion 26
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "cf.android666.wanandroid"
minSdkVersion 21
targetSdkVersion 26
targetSdkVersion 28
versionCode Integer.parseInt(releaseTime())
versionName "1.1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand Down Expand Up @@ -72,17 +72,17 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support:cardview-v7:26.1.0'
implementation 'com.android.support:preference-v7:26.1.0'
implementation 'com.android.support:preference-v14:26.1.0'
implementation 'com.google.code.gson:gson:2.8.0'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:cardview-v7:28.0.0'
implementation 'com.android.support:preference-v7:28.0.0'
implementation 'com.android.support:preference-v14:28.0.0'
implementation 'com.google.code.gson:gson:2.8.2'
//高版本对fragment有影响
implementation 'com.github.bumptech.glide:glide:4.0.0'
//打印日志
Expand All @@ -99,15 +99,13 @@ dependencies {
//事件处理
implementation 'org.greenrobot:eventbus:3.1.1'
//友盟sdk
implementation 'com.umeng.sdk:common:latest.integration'
implementation 'com.umeng.sdk:analytics:latest.integration'
implementation 'com.umeng.sdk:common:1.5.3'
implementation 'com.umeng.sdk:analytics:7.5.3'
implementation project(':mylibrary')

//腾讯bugly
// implementation 'com.tencent.bugly:crashreport:latest.release'
implementation 'com.tencent.bugly:crashreport_upgrade:latest.release'
//其中latest.release指代最新版本号,也可以指定明确的版本号,例如1.2.0
implementation 'com.tencent.bugly:nativecrashreport:latest.release'
implementation 'com.tencent.bugly:crashreport_upgrade:1.3.6'
implementation 'com.tencent.bugly:nativecrashreport:3.6.0.1'

//内存泄漏分析
debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4'
Expand Down
6 changes: 4 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,17 @@

buildscript {
ext.kotlin_version = '1.2.51'
ext.kotlin_version_plugin = '1.3.11'

repositories {
maven {url'http://maven.aliyun.com/nexus/content/groups/public/'}
google()
jcenter()
maven { url 'https://jitpack.io' }//for MZBannerView,PersistentCookieJar
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.android.tools.build:gradle:3.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version_plugin"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sun Dec 23 22:21:14 CST 2018
#Sat Jan 19 16:27:42 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

0 comments on commit 8099857

Please sign in to comment.