Skip to content

Commit 1f453bd

Browse files
committed
Android:升级 Gradle 7.3.3
1 parent be7d551 commit 1f453bd

File tree

9 files changed

+1135
-1141
lines changed

9 files changed

+1135
-1141
lines changed

APIJSON-Android/APIJSONApp/QRCodeLibrary/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
testCompile 'junit:junit:4.12'
23+
api fileTree(dir: 'libs', include: ['*.jar'])
24+
testImplementation 'junit:junit:4.12'
2525
}

APIJSON-Android/APIJSONApp/ZBLibrary/build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ android {
2121
}
2222

2323
dependencies {
24-
compile fileTree(dir: 'libs', include: ['*.jar'])
25-
testCompile 'junit:junit:4.12'
26-
compile files('libs/android-support-v4.jar')
27-
compile files('libs/okhttp-2.1.0.jar')
28-
compile files('libs/okio-1.0.0.jar')
29-
compile files('libs/universal-image-loader-1.9.4.jar')
30-
compile 'com.github.APIJSON:apijson-orm:3.9.0' // compile project(':APIJSONLibrary')
24+
api fileTree(dir: 'libs', include: ['*.jar'])
25+
testImplementation 'junit:junit:4.12'
26+
api files('libs/android-support-v4.jar')
27+
api files('libs/okhttp-2.1.0.jar')
28+
api files('libs/okio-1.0.0.jar')
29+
api files('libs/universal-image-loader-1.9.4.jar')
30+
api 'com.github.APIJSON:apijson-orm:3.9.0' // compile project(':APIJSONLibrary')
3131
}

APIJSON-Android/APIJSONApp/app/build.gradle

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apply plugin: 'com.android.application'
22

3-
apply plugin: 'kotlin-android'
4-
5-
apply plugin: 'kotlin-android-extensions'
3+
//apply plugin: 'kotlin-android'
4+
//apply plugin: 'kotlin-android-extensions'
65

76
android {
87
compileSdkVersion 29
@@ -25,9 +24,9 @@ android {
2524
}
2625

2726
dependencies {
28-
compile fileTree(dir: 'libs', include: ['*.jar'])
29-
testCompile 'junit:junit:4.12'
30-
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
31-
compile project(':QRCodeLibrary')
32-
compile project(':ZBLibrary')
27+
api fileTree(dir: 'libs', include: ['*.jar'])
28+
testImplementation 'junit:junit:4.12'
29+
// api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
30+
api project(':QRCodeLibrary')
31+
api project(':ZBLibrary')
3332
}

APIJSON-Android/APIJSONApp/app/src/main/java/apijson/demo/client/activity_fragment/MainTabActivity.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import apijson.demo.client.util.ActionUtil;
3333
import apijson.demo.client.util.HttpRequest;
3434
import apijson.demo.client.util.TestRequestAndResponseJava;
35-
import apijson.demo.client.util.TestRequestAndResponseKt;
35+
//import apijson.demo.client.util.TestRequestAndResponseKt;
3636
import zuo.biao.apijson.JSON;
3737
import zuo.biao.apijson.JSONResponse;
3838
import zuo.biao.library.base.BaseBroadcastReceiver;
@@ -109,25 +109,25 @@ public void onHttpResponse(int requestCode, String resultJson, Exception e) {
109109
});
110110

111111

112-
HttpRequest.get(JSON.parseObject(JSON.toJSONString(TestRequestAndResponseKt.request()), zuo.biao.apijson.JSONObject.class), 0, new OnHttpResponseListener() {
113-
@Override
114-
public void onHttpResponse(int requestCode, String resultJson, Exception e) {
115-
TestRequestAndResponseKt.response(resultJson);
116-
if (e != null) {
117-
e.printStackTrace();
118-
}
119-
}
120-
});
121-
122-
HttpRequest.get(JSON.parseObject(JSON.toJSONString(TestRequestAndResponseKt.smartRequest()), zuo.biao.apijson.JSONObject.class), 0, new OnHttpResponseListener() {
123-
@Override
124-
public void onHttpResponse(int requestCode, String resultJson, Exception e) {
125-
TestRequestAndResponseKt.smartResponse(resultJson);
126-
if (e != null) {
127-
e.printStackTrace();
128-
}
129-
}
130-
});
112+
// HttpRequest.get(JSON.parseObject(JSON.toJSONString(TestRequestAndResponseKt.request()), zuo.biao.apijson.JSONObject.class), 0, new OnHttpResponseListener() {
113+
// @Override
114+
// public void onHttpResponse(int requestCode, String resultJson, Exception e) {
115+
// TestRequestAndResponseKt.response(resultJson);
116+
// if (e != null) {
117+
// e.printStackTrace();
118+
// }
119+
// }
120+
// });
121+
//
122+
// HttpRequest.get(JSON.parseObject(JSON.toJSONString(TestRequestAndResponseKt.smartRequest()), zuo.biao.apijson.JSONObject.class), 0, new OnHttpResponseListener() {
123+
// @Override
124+
// public void onHttpResponse(int requestCode, String resultJson, Exception e) {
125+
// TestRequestAndResponseKt.smartResponse(resultJson);
126+
// if (e != null) {
127+
// e.printStackTrace();
128+
// }
129+
// }
130+
// });
131131
// }
132132

133133
}

0 commit comments

Comments
 (0)