diff --git a/app/build.gradle b/app/build.gradle index 2aaf0ff..38e8069 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,7 +12,7 @@ def getVersionCode() {// 获取版本号 versionProps.load(new FileInputStream(versionFile)) def versionCode = versionProps['VERSION_CODE'].toInteger()// 读取文件里面的版本号 def runTasks = gradle.startParameter.taskNames - if ('assembleRelease' in runTasks) {//仅在assembleRelease任务是增加版本号,其他渠道包在此分别配置 + if ('assemble' in runTasks) {//仅在assembleRelease任务是增加版本号,其他渠道包在此分别配置 // 版本号自增之后再写入文件(此处是关键,版本号自增+1) versionProps['VERSION_CODE'] = (++versionCode).toString() versionProps.store(versionFile.newWriter(), null) @@ -116,7 +116,7 @@ configurations.all { dependencies { implementation project(':basemvplib') - testImplementation 'junit:junit:4.12' + testImplementation 'junit:junit:4.13-beta-3' //support implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.media:media:1.1.0-rc01' diff --git a/basemvplib/build.gradle b/basemvplib/build.gradle index fc3a6c8..a23e9a1 100644 --- a/basemvplib/build.gradle +++ b/basemvplib/build.gradle @@ -27,18 +27,18 @@ android { dependencies { //support - api 'androidx.core:core:1.2.0-alpha01' - api 'androidx.appcompat:appcompat:1.1.0-alpha05' + api 'androidx.core:core:1.2.0-alpha02' + api 'androidx.appcompat:appcompat:1.1.0-beta01' //RxAndroid - api 'io.reactivex.rxjava2:rxandroid:2.1.0' + api 'io.reactivex.rxjava2:rxandroid:2.1.1' api 'io.reactivex.rxjava2:rxjava:2.2.6' //Retrofit - api 'com.squareup.okhttp3:logging-interceptor:3.14.0' - api 'com.squareup.retrofit2:retrofit:2.5.0' - api 'com.squareup.retrofit2:adapter-rxjava2:2.5.0' - api 'com.squareup.retrofit2:converter-scalars:2.5.0' + api 'com.squareup.okhttp3:logging-interceptor:4.0.0' + api 'com.squareup.retrofit2:retrofit:2.6.0' + api 'com.squareup.retrofit2:adapter-rxjava2:2.6.0' + api 'com.squareup.retrofit2:converter-scalars:2.6.0' //RxBus - api('com.hwangjr.rxbus:rxbus:2.0.0') { + api('com.hwangjr.rxbus:rxbus:2.0.1') { exclude group: 'com.jakewharton.timber', module: 'timber' } //J_SOUP