Skip to content

Commit 24728ae

Browse files
author
YangSen-qn
committed
Merge branch 'releases/7.x' into refactor
# Conflicts: # CHANGELOG.md # README.md # library/src/androidTest/java/com/qiniu/android/TestConfig.java # library/src/main/java/com/qiniu/android/collect/UploadInfoCollector.java # library/src/main/java/com/qiniu/android/common/AutoZone.java # library/src/main/java/com/qiniu/android/common/Config.java # library/src/main/java/com/qiniu/android/common/Constants.java # library/src/main/java/com/qiniu/android/common/ZoneInfo.java # library/src/main/java/com/qiniu/android/http/DnsPrefetcher.java # library/src/main/java/com/qiniu/android/storage/ResumeUploaderFast.java
2 parents 732b81c + d2d9c4d commit 24728ae

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#Changelog
2+
23
## 8.0.0 (2020-08-06)
34
## 重构
45
8.0.0版本相对于7.x版本的改进:
@@ -17,6 +18,15 @@
1718

1819
详细情况请参考:[Android_Changes_from_7.x_to_8.0.0.md](./doc/Android_Changes_from_7.x_to_8.0.0.md)
1920

21+
# 7.7.0
22+
* 压缩上报的日志内容
23+
* 获取AutoZone信息接口升级至v4
24+
25+
# 7.6.7
26+
* 修复创建dns缓存文件失败问题
27+
28+
# 7.6.6
29+
* 修复部分空指针异常
2030

2131
# 7.6.5
2232
* 优化Dns local cache

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ https://github.com/qiniudemo/qiniu-lab-android
1616
| Qiniu SDK 版本 | 最低 Android版本 | 依赖库版本 |
1717
|------------ |-----------------|------------------------|
1818
| 8.0.x | Android 5.0+ | okhttp 4+ |
19+
| 7.7.x | Android 5.0+ | okhttp 4+ |
1920
| 7.6.x | Android 5.0+ | okhttp 4+ |
2021
| 7.5.x | Android 5.0+ | okhttp 4+ |
2122
| 7.4.6 | Android 4.0+ | okhttp 3.12.6 |

library/library.iml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
3232
<exclude-output />
3333
<content url="file://$MODULE_DIR$">
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
3734
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
35+
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4342
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43+
<sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
4444
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
4545
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
4646
<sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />

0 commit comments

Comments
 (0)