Skip to content

Commit b7303b5

Browse files
authored
Merge pull request #347 from JemyCheung/master
add some method
2 parents be1936d + 4660c85 commit b7303b5

File tree

13 files changed

+206
-85
lines changed

13 files changed

+206
-85
lines changed

.idea/caches/gradle_models.ser

51.8 KB
Binary file not shown.

.idea/codeStyles/Project.xml

Lines changed: 109 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 13 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jdk:
88

99
android:
1010
components:
11-
- tools
12-
- platform-tools
13-
- tools
11+
#- tools
12+
#- platform-tools
13+
#- tools
1414

1515
# The BuildTools version used by your project
16-
- build-tools-26.0.0
16+
- build-tools-29.0.2
1717

1818
# The SDK version used to compile your project
19-
- android-26
19+
- android-29
2020
- android-22
2121

2222
# Specify at least one system image

build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,14 @@ allprojects {
2222
google()
2323
}
2424
}
25+
subprojects {
26+
afterEvaluate {
27+
project ->
28+
if (project.hasProperty("android-sdk")) {
29+
android {
30+
compileSdkVersion = rootProject.compileSdkVersion
31+
buildToolsVersion = rootProject.buildToolsVersion
32+
}
33+
}
34+
}
35+
}

library/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ android {
3535
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3636
}
3737
debug {
38-
testCoverageEnabled true
38+
testCoverageEnabled = true
3939
}
4040

4141
}

library/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
POM_NAME=qiniu-android-sdk library
22
POM_ARTIFACT_ID=qiniu-android-sdk
33
POM_PACKAGING=aar
4+
android.debug.obsoleteApi=true
5+
android.enableAapt2=false

0 commit comments

Comments
 (0)