Skip to content

Commit 3527e75

Browse files
YangSen-qnYangSen-qn
authored
Fix publish (#502)
1 parent d880d93 commit 3527e75

10 files changed

+47
-52
lines changed

‎build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ buildscript {
1010
}
1111
dependencies {
1212
classpath 'com.android.tools.build:gradle:7.1.3'
13-
1413
// NOTE: Do not place your application dependencies here; they belong
1514
// in the individual module build.gradle files
1615
}

‎library/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ String version = versionName()
2020
int code = versionNameToCode(version)
2121

2222
android {
23-
compileSdkVersion 30
24-
buildToolsVersion '29.0.3'
23+
compileSdkVersion 33
24+
// buildToolsVersion '29.0.3'
2525
defaultConfig {
2626
//applicationId "com.qiniu.android"
2727
minSdkVersion 14
28-
targetSdkVersion 30
28+
targetSdkVersion 33
2929
versionCode code
3030
versionName version
3131

@@ -82,7 +82,7 @@ dependencies {
8282

8383
task releaseJar(type: Jar, dependsOn: 'build') {
8484
//指定生成的jar名
85-
baseName 'qiniu-android-sdk-' + version
85+
baseName('qiniu-android-sdk-' + version)
8686
//从哪里打包class文件
8787
// from('build/intermediates/classes/release/com/qiniu/android/dns/')
8888
//打包到jar后的目录结构

‎library/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ POM_NAME=qiniu-android-sdk-library
22
POM_ARTIFACT_ID=qiniu-android-sdk
33
POM_PACKAGING=aar
44
android.debug.obsoleteApi=true
5-
android.enableAapt2=false
5+
android.enableAapt2=false
6+
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

‎library/src/androidTest/java/com/qiniu/android/TestConfig.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@ public final class TestConfig {
1010
// TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
1111
// 华东上传凭证
1212
public static final String bucket_z0 = "kodo-phone-zone0-space";
13-
public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:tDBTUFicqlZuIh5_Qp0LJeVir7k=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
13+
public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:c_5jTva3_WOScZi9vMK9biAV7os=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
1414
// 华北上传凭证
1515
public static final String bucket_z1 = "kodo-phone-zone1-space";
16-
public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:2dMDOhb4sL3CArNCGDJ_0qCKBMM=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
16+
public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:ydDfsf5x2jWb8eX165DuAMfHH4A=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
1717
// 华南上传凭证
1818
public static final String bucket_z2 = "kodo-phone-zone2-space";
19-
public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:HPoYQEVZai_Cylt4SmPH8i8sDG0=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
19+
public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:R2JsVQBaOh7pREK453aIH5hmOo8=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
2020
// 北美上传凭证
2121
public static final String bucket_na0 = "kodo-phone-zone-na0-space";
22-
public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:BIfK7vFJcfokzbCYzJd6tTjbALs=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
22+
public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:oxJPDRhheBnMHbXxIZwOn0nEH0U=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
2323
// 东南亚上传凭证
2424
public static final String bucket_as0 = "kodo-phone-zone-as0-space";
25-
public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:bqaQECyt5IqXEHm54cv_lZl0U-A=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
25+
public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:tApkgqOaYzs2WWaJKfJIsDhv_CE=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
2626
// 华北浙江2上传凭证
2727
public static final String bucket_cn_east_2 = "kodo-phone-cn-east-2";
28-
public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:a_z-7Ik-iwr9EOErAFmYzevmlfw=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE2OTA3NzMyNDcsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
29-
public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:h9Ws_jPrgYhFGgz9LmIai8FB4-c=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNjkwNzczMjQ3LCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
30-
28+
public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:7DoLnAmoeZQZw0NnF7221j_ro-s=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE2OTU5ODAzNjIsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
29+
public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:GmHSNf0RubeaWvjc4P7fTHWzBmI=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNjk1OTgwMzYyLCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
30+
3131
// -----------
3232
public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
3333

‎library/src/androidTest/java/com/qiniu/android/storage/ComplexUploadSceneTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ public class ComplexUploadSceneTest extends UploadBaseTest {
2323
@Test
2424
public void testMutiUploadV1() {
2525

26-
final int maxCount = 40;
26+
final int maxCount = 8;
2727

2828
final TestParam param = new TestParam();
2929
param.completeCount = 0;
3030
param.successCount = 0;
3131

32-
final int start = 37;
32+
final int start = 1;
3333
for (int i = start; i < maxCount; i++) {
3434
Configuration config = new Configuration.Builder()
3535
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
@@ -78,13 +78,13 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
7878
@Test
7979
public void testMutiUploadV2() {
8080

81-
final int maxCount = 40;
81+
final int maxCount = 8;
8282

8383
final TestParam param = new TestParam();
8484
param.completeCount = 0;
8585
param.successCount = 0;
8686

87-
final int start = 37;
87+
final int start = 1;
8888
for (int i = start; i < maxCount; i++) {
8989
Configuration config = new Configuration.Builder()
9090
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)

‎library/src/androidTest/java/com/qiniu/android/storage/ConcurrentResumeUploadTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void testHttpV1() {
6666
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
6767
.useConcurrentResumeUpload(true)
6868
.build();
69-
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
69+
int[] sizeArray = {500, 4000, 8000, 20000};
7070
for (int size : sizeArray) {
7171
String key = "android_concurrent_resume_http_v1_new_" + size + "k";
7272
try {
@@ -86,7 +86,7 @@ public void testHttpsV1() {
8686
.useConcurrentResumeUpload(true)
8787
.useHttps(true)
8888
.build();
89-
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
89+
int[] sizeArray = {10000};
9090
for (int size : sizeArray) {
9191
String key = "android_concurrent_resume_https_v1_new_" + size + "k";
9292
try {
@@ -107,7 +107,7 @@ public void testReuploadV1() {
107107
.useHttps(true)
108108
.chunkSize(1024 * 1024)
109109
.build();
110-
int[] sizeArray = {30000};
110+
int[] sizeArray = {20000};
111111
for (int size : sizeArray) {
112112
String key = "android_concurrent_resume_reupload_v1_" + size + "k";
113113
try {
@@ -182,7 +182,7 @@ public void testSwitchRegionV2() {
182182
.chunkSize(4 * 1024 * 1024)
183183
.useHttps(true)
184184
.build();
185-
int[] sizeArray = {5000, 8000, 10000, 20000};
185+
int[] sizeArray = {20000};
186186
for (int size : sizeArray) {
187187
String key = "android_concurrent_resume_switch_region_v2_" + size + "k";
188188
try {
@@ -224,7 +224,7 @@ public void testHttpV2() {
224224
.useConcurrentResumeUpload(true)
225225
.chunkSize(4 * 1024 * 1024)
226226
.build();
227-
int[] sizeArray = {500, 2000, 4000, 5000, 8000, 20000};
227+
int[] sizeArray = {20000};
228228
long timestamp = new Date().getTime();
229229
for (int size : sizeArray) {
230230
String key = "android_concurrent_resume_http_v2_" + timestamp + "_" + size + "k";
@@ -246,7 +246,7 @@ public void testHttpsV2() {
246246
.useHttps(true)
247247
.chunkSize(4 * 1024 * 1024)
248248
.build();
249-
int[] sizeArray = {500, 2000, 4000, 5000, 8000, 20000};
249+
int[] sizeArray = {20000};
250250
for (int size : sizeArray) {
251251
String key = "android_concurrent_resume_https_v2_" + size + "k";
252252
try {

‎library/src/androidTest/java/com/qiniu/android/storage/FormUploadTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void testSwitchRegion() {
2626
.useConcurrentResumeUpload(false)
2727
.useHttps(true)
2828
.build();
29-
int[] sizeArray = {5, 50, 200, 500, 800, 1000, 2000, 3000, 4000};
29+
int[] sizeArray = {5, 50, 200, 800, 2000, 4000};
3030
for (int size : sizeArray) {
3131
String key = "android_Form_switch_region_" + size + "k";
3232
File file = null;
@@ -51,7 +51,7 @@ public void testCancel() {
5151
.useConcurrentResumeUpload(false)
5252
.useHttps(true)
5353
.build();
54-
int[] sizeArray = {2000, 3000, 4000};
54+
int[] sizeArray = {2000, 4000};
5555
for (int size : sizeArray) {
5656
String key = "android_form_cancel_" + size + "k";
5757
File file = null;
@@ -70,7 +70,7 @@ public void testHttp() {
7070
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
7171
.useConcurrentResumeUpload(true)
7272
.build();
73-
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
73+
int[] sizeArray = {500, 3000, 4000};
7474
for (int size : sizeArray) {
7575
String key = "android_form_http" + size + "k";
7676
File file = null;
@@ -90,7 +90,7 @@ public void testHttps() {
9090
.useConcurrentResumeUpload(true)
9191
.useHttps(true)
9292
.build();
93-
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
93+
int[] sizeArray = {500, 1000, 3000, 4000};
9494
for (int size : sizeArray) {
9595
String key = "android_form_https" + size + "k";
9696
File file = null;

‎library/src/androidTest/java/com/qiniu/android/storage/ResumeUploadTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void testCancelV1() {
4444
.useConcurrentResumeUpload(false)
4545
.useHttps(true)
4646
.build();
47-
int[] sizeArray = {10000, 20000};
47+
int[] sizeArray = {10000};
4848
for (int size : sizeArray) {
4949
String key = "android_resume_cancel_v1_" + size + "k";
5050
try {
@@ -63,7 +63,7 @@ public void testHttpV1() {
6363
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
6464
.useConcurrentResumeUpload(false)
6565
.build();
66-
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
66+
int[] sizeArray = {10000};
6767
for (int size : sizeArray) {
6868
String key = "android_resume_http_v1_" + size + "k";
6969
try {
@@ -83,7 +83,7 @@ public void testHttpsV1() {
8383
.useConcurrentResumeUpload(false)
8484
.useHttps(true)
8585
.build();
86-
int[] sizeArray = {500, 3000, 4000, 7000, 10000, 20000};
86+
int[] sizeArray = {20000};
8787
for (int size : sizeArray) {
8888
String key = "android_resume_https_v1_" + size + "k";
8989
try {
@@ -103,7 +103,7 @@ public void testReuploadV1() {
103103
.useConcurrentResumeUpload(false)
104104
.chunkSize(1024 * 1024)
105105
.build();
106-
int[] sizeArray = {30000};
106+
int[] sizeArray = {20000};
107107
for (int size : sizeArray) {
108108
String key = "android_resume_reupload_v1_" + size + "k";
109109
try {
@@ -209,7 +209,7 @@ public void testSwitchRegionV2() {
209209
.chunkSize(4 * 1024 * 1024)
210210
.useHttps(true)
211211
.build();
212-
int[] sizeArray = {5000, 8000, 10000, 20000};
212+
int[] sizeArray = {10000};
213213
for (int size : sizeArray) {
214214
String key = "android_resume_switch_region_v2_" + size + "k";
215215
try {
@@ -231,7 +231,7 @@ public void testCancelV2() {
231231
.chunkSize(4 * 1024 * 1024)
232232
.useHttps(true)
233233
.build();
234-
int[] sizeArray = {10000, 20000};
234+
int[] sizeArray = {10000};
235235
for (int size : sizeArray) {
236236
String key = "android_resume_cancel_v2_" + size + "k";
237237
try {
@@ -251,7 +251,7 @@ public void testHttpV2() {
251251
.useConcurrentResumeUpload(false)
252252
.chunkSize(4 * 1024 * 1024)
253253
.build();
254-
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
254+
int[] sizeArray = {10000};
255255
for (int size : sizeArray) {
256256
String key = "android_resume_http_v2_" + size + "k";
257257
try {
@@ -272,7 +272,7 @@ public void testHttpsV2() {
272272
.chunkSize(4 * 1024 * 1024)
273273
.useHttps(true)
274274
.build();
275-
int[] sizeArray = {500, 3000, 4000, 7000, 10000, 20000};
275+
int[] sizeArray = {10000};
276276
for (int size : sizeArray) {
277277
String key = "android_resume_https_v2_" + size + "k";
278278
try {
@@ -292,7 +292,7 @@ public void testReuploadV2() {
292292
.useConcurrentResumeUpload(false)
293293
.chunkSize(4 * 1024 * 1024)
294294
.build();
295-
int[] sizeArray = {30000};
295+
int[] sizeArray = {20000};
296296
for (int size : sizeArray) {
297297
String key = "android_resume_reupload_v2_" + size + "k";
298298
try {

‎library/src/androidTest/java/com/qiniu/android/storage/UploadBaseTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ public boolean shouldWait() {
168168
}
169169
}, 10 * 60);
170170

171-
LogUtil.d("=== upload file type:" + file.type() + " response key:" + (key != null ? key : "") + " response:" + completeInfo.responseInfo);
171+
LogUtil.i("=== upload file type:" + file.type() + " response key:" + (key != null ? key : "") + " response:" + completeInfo.responseInfo);
172172
assertTrue(completeInfo.responseInfo.toString(), completeInfo.responseInfo != null);
173173
assertTrue(completeInfo.responseInfo.toString(), completeInfo.responseInfo.statusCode == statusCode);
174-
assertTrue(completeInfo.responseInfo.toString(), verifyUploadKey(key, completeInfo.key));
174+
assertEquals(completeInfo.responseInfo.toString(), key, completeInfo.key);
175175

176176
// 成功验证 etag
177177
if (statusCode == ResponseInfo.RequestSuccess) {

‎mvn_push.gradle

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,34 +48,29 @@ task androidJavadocs(type: Javadoc) {
4848
}
4949

5050
task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
51-
classifier = 'javadoc'
51+
archiveClassifier.set('javadoc')
5252
from androidJavadocs.destinationDir
5353
}
5454

5555
task androidSourcesJar(type: Jar) {
56-
classifier = 'sources'
57-
from android.sourceSets.main.java.sourceFiles
56+
archiveClassifier.set('sources')
57+
from android.sourceSets.main.java.srcDirs
5858
}
5959

6060
publishing {
61-
publications{
62-
mavenJava(MavenPublication){
61+
publications {
62+
mavenJava(MavenPublication) {
6363
groupId = GROUP
6464
artifactId = POM_ARTIFACT_ID
6565
version = VERSION_NAME
6666

67-
artifact androidSourcesJar {
68-
classifier = 'sources'
69-
}
70-
71-
artifact androidJavadocsJar {
72-
classifier "javadoc"
73-
}
74-
7567
afterEvaluate {
7668
from components.release
7769
}
7870

71+
artifact(androidSourcesJar)
72+
artifact(androidJavadocsJar)
73+
7974
pom {
8075
name = POM_NAME
8176
description = POM_DESCRIPTION

0 commit comments

Comments
 (0)