Commit dd835253be91c0af6e14c9bc6c27910c4f769664

Authored by 王琳
1 parent 6e69c11b

解决冲突

Showing 1 changed file with 7 additions and 1 deletions
app/build.gradle
... ... @@ -55,6 +55,13 @@ android {
55 55  
56 56  
57 57 useLibrary 'org.apache.http.legacy'
  58 +
  59 + applicationVariants.all { variant ->
  60 + def file = variant.outputs[0].outputFile
  61 + def name = "CNliveApp_" + defaultConfig.versionName + "_" + variant.buildType.name + ".apk";
  62 + variant.outputs[0].outputFile = new File(file.parent, name)
  63 + }
  64 +
58 65 }
59 66  
60 67 dependencies {
... ... @@ -78,6 +85,5 @@ dependencies {
78 85 compile 'com.squareup.okhttp3:okhttp:3.2.0'
79 86 compile 'com.squareup.okhttp3:okhttp-ws:3.2.0'
80 87 compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
81   - compile 'com.android.support:support-v4:26.+'
82 88 compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4'
83 89 }
... ...