Commit 7ead93777fcb96473cd5cb0f46666c05cb5f5ae3

Authored by 李攀
1 parent 722ca600

gradle update

Showing 1 changed file with 5 additions and 25 deletions
... ... @@ -16,13 +16,9 @@ ext {
16 16 }
17 17
18 18 android {
19   -
20   -// compileSdkVersion ANDROID_BUILD_COMPILE_SDK_VERSION as int
21   -// buildToolsVersion ANDROID_BUILD_TOOLS_VERSION
22 19 compileSdkVersion 25
23 20 buildToolsVersion '25.0.2'
24 21
25   -
26 22 lintOptions {
27 23 abortOnError false
28 24 }
... ... @@ -55,7 +51,6 @@ android {
55 51 }
56 52
57 53 defaultConfig {
58   -// applicationId "com.qnbar.fangtang.cinema"
59 54 minSdkVersion ANDROID_MIN_SDK_VERSION as int
60 55 targetSdkVersion ANDROID_TARGET_SDK_VERSION as int
61 56 versionCode APP_VERSION_CODE
... ... @@ -108,14 +103,7 @@ android {
108 103 output.outputFile = new File(output.outputFile.parent, fileName)
109 104 // release to test folder
110 105 println fileName
111   -// copyTask()
112 106 }
113   -// if (variant.buildType.name.equals('debug')) {
114   -// def fileName = output.outputFile.name.replace(output.outputFile.name,
115   -// "debug" + variant.productFlavors[0].name + "-${variant.versionCode}-${releaseTime()}.apk")
116   -// output.outputFile = new File(output.outputFile.parent, fileName)
117   -// println fileName
118   -// }
119 107 }
120 108 }
121 109 return false
... ... @@ -127,7 +115,6 @@ dependencies {
127 115 compile files('libs/glide-3.7.0.jar')
128 116 compile files('libs/greenbluetoothlelib.jar')
129 117
130   -// compile project(':transitionhelper')
131 118 compile project(':uil')
132 119 compile project(':volley')
133 120 compile project(':pinying')
... ... @@ -135,20 +122,14 @@ dependencies {
135 122 compile project(':BluetoothLightLib')
136 123 compile project(':switchcontrollib')
137 124
138   -// compile group: 'com.android.support', name: 'support-v4', version: '25.2.0'
139   -// compile group: 'com.android.support', name: 'support-compat', version: '25.2.0'
140   -// compile group: 'com.android.support', name: 'recyclerview-v7', version: '25.2.0'
141 125 compile group: 'com.squareup.okhttp', name: 'okhttp', version: '2.7.5'
142 126 compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
143 127 compile group: 'com.google.zxing', name: 'core', version: '3.3.0'
144   -// compile group: 'com.umeng.analytics', name: 'umeng-analytics', version: '5.4.1'
145 128 compile group: 'com.nineoldandroids', name: 'library', version: '2.4.0'
146 129 compile group: 'com.squareup.retrofit2', name: 'retrofit', version: '2.0.2'
147 130 compile group: 'com.squareup.retrofit2', name: 'converter-gson', version: '2.0.2'
148   - // compile 'com.android.support:support-v4:25.2.0'
149 131 compile 'com.umeng.analytics:analytics:latest.integration'
150 132 compile 'org.greenrobot:eventbus:3.0.0'
151   -// compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha4'
152 133 }
153 134
154 135 def getPwd(modifyPwd) {
... ... @@ -166,7 +147,7 @@ task releaseToTesting(type: Copy) {
166 147 from 'build/outputs/apk'
167 148 // into 'E:/py'
168 149 if (isWindows())
169   - into '//192.168.4.241/root/apks'
  150 + into '//192.168.200.241/root/apks'
170 151 else
171 152 into '/Volumes/root/apks'
172 153 include '*.apk'
... ... @@ -182,9 +163,10 @@ releaseToTesting {}.shouldRunAfter build
182 163
183 164 task tests(type: Copy) {
184 165 from 'build/outputs/apk'
185   -// into 'E:/py'
186   - into '/Volumes/root/apks'
187   -// into '\\\\192.168.4.214\\root'
  166 + if (isWindows())
  167 + into '//192.168.200.241/root/apks'
  168 + else
  169 + into '/Volumes/root/apks'
188 170 include '*.apk'
189 171 exclude { details ->
190 172 details.file.name.contains('debug') ||
... ... @@ -197,8 +179,6 @@ task getType() {
197 179 def windows = isWindows();
198 180 def pwd = System.getProperty('os.name').toLowerCase().contains('windows') ? "windows" : "linux"
199 181 def pwd2 = System.getProperty('os.name').toLowerCase().contains('windows')
200   -
201   -
202 182 println pwd + " fuck " + windows + " seek " + pwd1 + " seek " + pwd2
203 183 }
204 184
... ...
Please register or login to post a comment