Skip to content

Commit a116522

Browse files
BlankjBlankj
committed
see 05/06 log
1 parent 8dae799 commit a116522

File tree

5 files changed

+61
-59
lines changed

5 files changed

+61
-59
lines changed

‎bus-gradle-plugin/build.gradle‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ gradlePlugin {
2626
}
2727

2828
dependencies {
29-
implementation dep.plugin[0]
29+
implementation "com.android.tools.build:gradle:3.4.0"
30+
implementation 'com.android.tools.build:gradle-api:3.4.0'
31+
3032
implementation dep.javassist
3133
implementation dep.commons_io
3234
implementation gradleApi()

‎config.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ ext {
1616
]
1717

1818
// lib version
19-
kotlin_version = '1.3.0'
19+
kotlin_version = '1.3.10'
2020
support_version = '27.1.1'
2121
leakcanary_version = '1.6.3'
2222

2323
dep = [
2424
plugin : [
25-
"com.android.tools.build:gradle:3.2.1",
25+
"com.android.tools.build:gradle:3.4.0",
2626
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version",
2727
"com.github.dcendents:android-maven-gradle-plugin:2.1",// 上传到 maven
2828
"com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4",// 上传到 bintray
@@ -53,7 +53,7 @@ ext {
5353
commons_io : "commons-io:commons-io:2.5",
5454

5555
junit : "junit:junit:4.12",
56-
robolectric : "org.robolectric:robolectric:3.1.2",
56+
robolectric : "org.robolectric:robolectric:4.2",
5757
]
5858
}
5959
//./gradlew clean utilcode-lib:bintrayUpload

‎config_app.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ def configSigning(Project pro) {
8181
def configApkName(Project pro) {
8282
pro.android.applicationVariants.all { variant ->
8383
if (variant.buildType.name != "debug") {
84-
variant.getPackageApplication().outputDirectory = new File("${rootDir.path}/apk")
85-
variant.getPackageApplication().outputScope.apkDatas.forEach { apkData ->
84+
variant.getPackageApplicationProvider().get().outputDirectory = new File("${rootDir.path}/apk")
85+
variant.getPackageApplicationProvider().get().outputScope.apkDatas.forEach { apkData ->
8686
apkData.outputFileName = "util" + suffix +
8787
"_" + variant.versionName.replace(".", "_") +
8888
".apk"

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Sep 25 11:43:49 CST 2018
1+
#Mon May 06 10:07:23 CST 2019
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

‎subutil/lib/src/test/java/com/blankj/subutil/util/http/HttpUtilsTest.java‎

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -24,56 +24,56 @@ public class HttpUtilsTest extends BaseTest {
2424

2525
private static final String BASE_URL = "http://127.0.0.1:8081";
2626

27-
@Test
28-
public void getString() {
29-
HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
30-
@Override
31-
public void onResponse(Response response) {
32-
System.out.println(response.getHeaders());
33-
System.out.println(response.getString());
34-
}
35-
36-
@Override
37-
public void onFailed(Exception e) {
38-
e.printStackTrace();
39-
}
40-
});
41-
}
42-
43-
@Test
44-
public void getJson() {
45-
HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
46-
@Override
47-
public void onResponse(Response response) {
48-
System.out.println(response.getHeaders());
49-
List<UserBean> users = response.getJson(GsonUtils.getListType(UserBean.class));
50-
System.out.println(GsonUtils.toJson(users));
51-
}
52-
53-
@Override
54-
public void onFailed(Exception e) {
55-
e.printStackTrace();
56-
}
57-
});
58-
}
59-
60-
@Test
61-
public void downloadFile() {
62-
HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
63-
@Override
64-
public void onResponse(Response response) {
65-
System.out.println(response.getHeaders());
66-
File file = new File(TestConfig.PATH_HTTP + TimeUtils.getNowMills());
67-
response.downloadFile(file);
68-
System.out.println(FileIOUtils.readFile2String(file));
69-
FileUtils.delete(file);
70-
}
71-
72-
@Override
73-
public void onFailed(Exception e) {
74-
e.printStackTrace();
75-
}
76-
});
77-
}
27+
// @Test
28+
// public void getString() {
29+
// HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
30+
// @Override
31+
// public void onResponse(Response response) {
32+
// System.out.println(response.getHeaders());
33+
// System.out.println(response.getString());
34+
// }
35+
//
36+
// @Override
37+
// public void onFailed(Exception e) {
38+
// e.printStackTrace();
39+
// }
40+
// });
41+
// }
42+
//
43+
// @Test
44+
// public void getJson() {
45+
// HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
46+
// @Override
47+
// public void onResponse(Response response) {
48+
// System.out.println(response.getHeaders());
49+
// List<UserBean> users = response.getJson(GsonUtils.getListType(UserBean.class));
50+
// System.out.println(GsonUtils.toJson(users));
51+
// }
52+
//
53+
// @Override
54+
// public void onFailed(Exception e) {
55+
// e.printStackTrace();
56+
// }
57+
// });
58+
// }
59+
//
60+
// @Test
61+
// public void downloadFile() {
62+
// HttpUtils.call(Request.withUrl(BASE_URL + "/listUsers"), new ResponseCallback() {
63+
// @Override
64+
// public void onResponse(Response response) {
65+
// System.out.println(response.getHeaders());
66+
// File file = new File(TestConfig.PATH_HTTP + TimeUtils.getNowMills());
67+
// response.downloadFile(file);
68+
// System.out.println(FileIOUtils.readFile2String(file));
69+
// FileUtils.delete(file);
70+
// }
71+
//
72+
// @Override
73+
// public void onFailed(Exception e) {
74+
// e.printStackTrace();
75+
// }
76+
// });
77+
// }
7878

7979
}

0 commit comments

Comments
 (0)