Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix publish #502

Merged
merged 12 commits into from
Aug 7, 2023
Merged

Fix publish #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ef8169f
change uc query retry host order
Jul 19, 2023
bc3f3dc
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-reg…
Jul 20, 2023
112ff06
change test case
Jul 21, 2023
8193846
change test case
Jul 24, 2023
a052eb6
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into remove-reg…
Jul 27, 2023
027d9ba
change mvn_push
Jul 31, 2023
47f87a6
update test token
Jul 31, 2023
21fff24
change gradle.properties: config jvm
Aug 1, 2023
5f060f7
change test case
Aug 2, 2023
4600249
Merge branch 'master' of YangSen-qn:qiniu/android-sdk into fix-publish
Aug 2, 2023
13ba1e5
update mvn_push.gradle
Aug 2, 2023
8608aa2
update test case
Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.1.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down
8 changes: 4 additions & 4 deletions library/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ String version = versionName()
int code = versionNameToCode(version)

android {
compileSdkVersion 30
buildToolsVersion '29.0.3'
compileSdkVersion 33
// buildToolsVersion '29.0.3'
defaultConfig {
//applicationId "com.qiniu.android"
minSdkVersion 14
targetSdkVersion 30
targetSdkVersion 33
versionCode code
versionName version

Expand Down Expand Up @@ -82,7 +82,7 @@ dependencies {

task releaseJar(type: Jar, dependsOn: 'build') {
//指定生成的jar名
baseName 'qiniu-android-sdk-' + version
baseName('qiniu-android-sdk-' + version)
//从哪里打包class文件
// from('build/intermediates/classes/release/com/qiniu/android/dns/')
//打包到jar后的目录结构
Expand Down
3 changes: 2 additions & 1 deletion library/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ POM_NAME=qiniu-android-sdk-library
POM_ARTIFACT_ID=qiniu-android-sdk
POM_PACKAGING=aar
android.debug.obsoleteApi=true
android.enableAapt2=false
android.enableAapt2=false
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
16 changes: 8 additions & 8 deletions library/src/androidTest/java/com/qiniu/android/TestConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ public final class TestConfig {
// TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
// 华东上传凭证
public static final String bucket_z0 = "kodo-phone-zone0-space";
public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:tDBTUFicqlZuIh5_Qp0LJeVir7k=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:c_5jTva3_WOScZi9vMK9biAV7os=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
// 华北上传凭证
public static final String bucket_z1 = "kodo-phone-zone1-space";
public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:2dMDOhb4sL3CArNCGDJ_0qCKBMM=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:ydDfsf5x2jWb8eX165DuAMfHH4A=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
// 华南上传凭证
public static final String bucket_z2 = "kodo-phone-zone2-space";
public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:HPoYQEVZai_Cylt4SmPH8i8sDG0=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:R2JsVQBaOh7pREK453aIH5hmOo8=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
// 北美上传凭证
public static final String bucket_na0 = "kodo-phone-zone-na0-space";
public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:BIfK7vFJcfokzbCYzJd6tTjbALs=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:oxJPDRhheBnMHbXxIZwOn0nEH0U=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
// 东南亚上传凭证
public static final String bucket_as0 = "kodo-phone-zone-as0-space";
public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:bqaQECyt5IqXEHm54cv_lZl0U-A=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTY5MDc3MzI0NywgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:tApkgqOaYzs2WWaJKfJIsDhv_CE=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTY5NTk4MDM2MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
// 华北浙江2上传凭证
public static final String bucket_cn_east_2 = "kodo-phone-cn-east-2";
public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:a_z-7Ik-iwr9EOErAFmYzevmlfw=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE2OTA3NzMyNDcsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:h9Ws_jPrgYhFGgz9LmIai8FB4-c=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNjkwNzczMjQ3LCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:7DoLnAmoeZQZw0NnF7221j_ro-s=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE2OTU5ODAzNjIsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:GmHSNf0RubeaWvjc4P7fTHWzBmI=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNjk1OTgwMzYyLCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";

// -----------
public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";

Expand Down
8 changes: 4 additions & 4 deletions library/src/androidTest/java/com/qiniu/android/storage/ComplexUploadSceneTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public class ComplexUploadSceneTest extends UploadBaseTest {
@Test
public void testMutiUploadV1() {

final int maxCount = 40;
final int maxCount = 8;

final TestParam param = new TestParam();
param.completeCount = 0;
param.successCount = 0;

final int start = 37;
final int start = 1;
for (int i = start; i < maxCount; i++) {
Configuration config = new Configuration.Builder()
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
Expand Down Expand Up @@ -78,13 +78,13 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
@Test
public void testMutiUploadV2() {

final int maxCount = 40;
final int maxCount = 8;

final TestParam param = new TestParam();
param.completeCount = 0;
param.successCount = 0;

final int start = 37;
final int start = 1;
for (int i = start; i < maxCount; i++) {
Configuration config = new Configuration.Builder()
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
Expand Down
12 changes: 6 additions & 6 deletions library/src/androidTest/java/com/qiniu/android/storage/ConcurrentResumeUploadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public void testHttpV1() {
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
.useConcurrentResumeUpload(true)
.build();
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
int[] sizeArray = {500, 4000, 8000, 20000};
for (int size : sizeArray) {
String key = "android_concurrent_resume_http_v1_new_" + size + "k";
try {
Expand All @@ -86,7 +86,7 @@ public void testHttpsV1() {
.useConcurrentResumeUpload(true)
.useHttps(true)
.build();
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
int[] sizeArray = {10000};
for (int size : sizeArray) {
String key = "android_concurrent_resume_https_v1_new_" + size + "k";
try {
Expand All @@ -107,7 +107,7 @@ public void testReuploadV1() {
.useHttps(true)
.chunkSize(1024 * 1024)
.build();
int[] sizeArray = {30000};
int[] sizeArray = {20000};
for (int size : sizeArray) {
String key = "android_concurrent_resume_reupload_v1_" + size + "k";
try {
Expand Down Expand Up @@ -182,7 +182,7 @@ public void testSwitchRegionV2() {
.chunkSize(4 * 1024 * 1024)
.useHttps(true)
.build();
int[] sizeArray = {5000, 8000, 10000, 20000};
int[] sizeArray = {20000};
for (int size : sizeArray) {
String key = "android_concurrent_resume_switch_region_v2_" + size + "k";
try {
Expand Down Expand Up @@ -224,7 +224,7 @@ public void testHttpV2() {
.useConcurrentResumeUpload(true)
.chunkSize(4 * 1024 * 1024)
.build();
int[] sizeArray = {500, 2000, 4000, 5000, 8000, 20000};
int[] sizeArray = {20000};
long timestamp = new Date().getTime();
for (int size : sizeArray) {
String key = "android_concurrent_resume_http_v2_" + timestamp + "_" + size + "k";
Expand All @@ -246,7 +246,7 @@ public void testHttpsV2() {
.useHttps(true)
.chunkSize(4 * 1024 * 1024)
.build();
int[] sizeArray = {500, 2000, 4000, 5000, 8000, 20000};
int[] sizeArray = {20000};
for (int size : sizeArray) {
String key = "android_concurrent_resume_https_v2_" + size + "k";
try {
Expand Down
8 changes: 4 additions & 4 deletions library/src/androidTest/java/com/qiniu/android/storage/FormUploadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void testSwitchRegion() {
.useConcurrentResumeUpload(false)
.useHttps(true)
.build();
int[] sizeArray = {5, 50, 200, 500, 800, 1000, 2000, 3000, 4000};
int[] sizeArray = {5, 50, 200, 800, 2000, 4000};
for (int size : sizeArray) {
String key = "android_Form_switch_region_" + size + "k";
File file = null;
Expand All @@ -51,7 +51,7 @@ public void testCancel() {
.useConcurrentResumeUpload(false)
.useHttps(true)
.build();
int[] sizeArray = {2000, 3000, 4000};
int[] sizeArray = {2000, 4000};
for (int size : sizeArray) {
String key = "android_form_cancel_" + size + "k";
File file = null;
Expand All @@ -70,7 +70,7 @@ public void testHttp() {
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
.useConcurrentResumeUpload(true)
.build();
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
int[] sizeArray = {500, 3000, 4000};
for (int size : sizeArray) {
String key = "android_form_http" + size + "k";
File file = null;
Expand All @@ -90,7 +90,7 @@ public void testHttps() {
.useConcurrentResumeUpload(true)
.useHttps(true)
.build();
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
int[] sizeArray = {500, 1000, 3000, 4000};
for (int size : sizeArray) {
String key = "android_form_https" + size + "k";
File file = null;
Expand Down
18 changes: 9 additions & 9 deletions library/src/androidTest/java/com/qiniu/android/storage/ResumeUploadTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void testCancelV1() {
.useConcurrentResumeUpload(false)
.useHttps(true)
.build();
int[] sizeArray = {10000, 20000};
int[] sizeArray = {10000};
for (int size : sizeArray) {
String key = "android_resume_cancel_v1_" + size + "k";
try {
Expand All @@ -63,7 +63,7 @@ public void testHttpV1() {
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
.useConcurrentResumeUpload(false)
.build();
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
int[] sizeArray = {10000};
for (int size : sizeArray) {
String key = "android_resume_http_v1_" + size + "k";
try {
Expand All @@ -83,7 +83,7 @@ public void testHttpsV1() {
.useConcurrentResumeUpload(false)
.useHttps(true)
.build();
int[] sizeArray = {500, 3000, 4000, 7000, 10000, 20000};
int[] sizeArray = {20000};
for (int size : sizeArray) {
String key = "android_resume_https_v1_" + size + "k";
try {
Expand All @@ -103,7 +103,7 @@ public void testReuploadV1() {
.useConcurrentResumeUpload(false)
.chunkSize(1024 * 1024)
.build();
int[] sizeArray = {30000};
int[] sizeArray = {20000};
for (int size : sizeArray) {
String key = "android_resume_reupload_v1_" + size + "k";
try {
Expand Down Expand Up @@ -209,7 +209,7 @@ public void testSwitchRegionV2() {
.chunkSize(4 * 1024 * 1024)
.useHttps(true)
.build();
int[] sizeArray = {5000, 8000, 10000, 20000};
int[] sizeArray = {10000};
for (int size : sizeArray) {
String key = "android_resume_switch_region_v2_" + size + "k";
try {
Expand All @@ -231,7 +231,7 @@ public void testCancelV2() {
.chunkSize(4 * 1024 * 1024)
.useHttps(true)
.build();
int[] sizeArray = {10000, 20000};
int[] sizeArray = {10000};
for (int size : sizeArray) {
String key = "android_resume_cancel_v2_" + size + "k";
try {
Expand All @@ -251,7 +251,7 @@ public void testHttpV2() {
.useConcurrentResumeUpload(false)
.chunkSize(4 * 1024 * 1024)
.build();
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
int[] sizeArray = {10000};
for (int size : sizeArray) {
String key = "android_resume_http_v2_" + size + "k";
try {
Expand All @@ -272,7 +272,7 @@ public void testHttpsV2() {
.chunkSize(4 * 1024 * 1024)
.useHttps(true)
.build();
int[] sizeArray = {500, 3000, 4000, 7000, 10000, 20000};
int[] sizeArray = {10000};
for (int size : sizeArray) {
String key = "android_resume_https_v2_" + size + "k";
try {
Expand All @@ -292,7 +292,7 @@ public void testReuploadV2() {
.useConcurrentResumeUpload(false)
.chunkSize(4 * 1024 * 1024)
.build();
int[] sizeArray = {30000};
int[] sizeArray = {20000};
for (int size : sizeArray) {
String key = "android_resume_reupload_v2_" + size + "k";
try {
Expand Down
4 changes: 2 additions & 2 deletions library/src/androidTest/java/com/qiniu/android/storage/UploadBaseTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,10 @@ public boolean shouldWait() {
}
}, 10 * 60);

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

// 成功验证 etag
if (statusCode == ResponseInfo.RequestSuccess) {
Expand Down
21 changes: 8 additions & 13 deletions mvn_push.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,34 +48,29 @@ task androidJavadocs(type: Javadoc) {
}

task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
classifier = 'javadoc'
archiveClassifier.set('javadoc')
from androidJavadocs.destinationDir
}

task androidSourcesJar(type: Jar) {
classifier = 'sources'
from android.sourceSets.main.java.sourceFiles
archiveClassifier.set('sources')
from android.sourceSets.main.java.srcDirs
}

publishing {
publications{
mavenJava(MavenPublication){
publications {
mavenJava(MavenPublication) {
groupId = GROUP
artifactId = POM_ARTIFACT_ID
version = VERSION_NAME

artifact androidSourcesJar {
classifier = 'sources'
}

artifact androidJavadocsJar {
classifier "javadoc"
}

afterEvaluate {
from components.release
}

artifact(androidSourcesJar)
artifact(androidJavadocsJar)

pom {
name = POM_NAME
description = POM_DESCRIPTION
Expand Down