Commit dd835253be91c0af6e14c9bc6c27910c4f769664
1 parent
6e69c11b
解决冲突
Showing
1 changed file
with
7 additions
and
1 deletions
app/build.gradle
| @@ -55,6 +55,13 @@ android { | @@ -55,6 +55,13 @@ android { | ||
| 55 | 55 | ||
| 56 | 56 | ||
| 57 | useLibrary 'org.apache.http.legacy' | 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 | dependencies { | 67 | dependencies { |
| @@ -78,6 +85,5 @@ dependencies { | @@ -78,6 +85,5 @@ dependencies { | ||
| 78 | compile 'com.squareup.okhttp3:okhttp:3.2.0' | 85 | compile 'com.squareup.okhttp3:okhttp:3.2.0' |
| 79 | compile 'com.squareup.okhttp3:okhttp-ws:3.2.0' | 86 | compile 'com.squareup.okhttp3:okhttp-ws:3.2.0' |
| 80 | compile 'com.squareup.okhttp3:logging-interceptor:3.2.0' | 87 | compile 'com.squareup.okhttp3:logging-interceptor:3.2.0' |
| 81 | - compile 'com.android.support:support-v4:26.+' | ||
| 82 | compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4' | 88 | compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.4' |
| 83 | } | 89 | } |