Skip to content

Commit 5595d0c

Browse files
TommyLemonTommyLemon
committed
升级sdk,gradle,app的版本；替换已失效的图片URL
1 parent b8bd931 commit 5595d0c

11 files changed

Lines changed: 141 additions & 93 deletions

File tree

‎QRCodeLibrary/QRCodeLibrary.iml‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,35 @@
2828
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3334
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3739
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3941
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4042
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4244
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4346
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4447
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4548
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4649
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4750
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4851
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
4952
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
57+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
58+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
59+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5060
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
5161
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
5262
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
@@ -75,27 +85,33 @@
7585
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7686
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7787
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
7989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
8595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
87101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
88102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
89103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
90105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
91107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
92108
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
93109
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
94110
</content>
95-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
111+
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
96112
<orderEntry type="sourceFolder" forTests="false" />
97-
<orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
98-
<orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
99-
<orderEntry type="library" exported="" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
113+
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
114+
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
115+
<orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
100116
</component>
101117
</module>

‎QRCodeLibrary/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '25.0.1'
4+
compileSdkVersion 27
5+
buildToolsVersion '27.0.3'
66
defaultConfig {
77
minSdkVersion 15
88
targetSdkVersion 22

‎ZBLibrary/ZBLibrary.iml‎

Lines changed: 48 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -28,18 +28,21 @@
2828
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3334
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
3739
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3941
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4042
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4143
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
4244
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
4346
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4447
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4548
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -54,6 +57,13 @@
5457
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
5558
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5659
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
60+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
61+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
5767
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5868
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5969
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -75,45 +85,55 @@
7585
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7686
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7787
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
7989
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
8191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
8392
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
8595
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
87101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
88102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
89103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
90107
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
91108
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
92109
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
93110
</content>
94-
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
111+
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
95112
<orderEntry type="sourceFolder" forTests="false" />
96-
<orderEntry type="library" exported="" name="com.squareup.okio:okio:1.14.0@jar" level="project" />
97-
<orderEntry type="library" exported="" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/fastjson-1.2.24.jar:unspecified@jar" level="project" />
98-
<orderEntry type="library" exported="" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
99-
<orderEntry type="library" exported="" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
100-
<orderEntry type="library" exported="" scope="TEST" name="junit:junit:4.12@jar" level="project" />
101-
<orderEntry type="library" exported="" name="com.android.support:transition-25.3.1" level="project" />
102-
<orderEntry type="library" exported="" name="com.android.support:design-25.3.1" level="project" />
103-
<orderEntry type="library" exported="" name="com.android.support:support-core-ui-25.3.1" level="project" />
104-
<orderEntry type="library" exported="" name="com.android.support:appcompat-v7-25.3.1" level="project" />
105-
<orderEntry type="library" exported="" name="com.android.support:support-compat-25.3.1" level="project" />
106-
<orderEntry type="library" exported="" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/glide-full-4.1.1.jar:unspecified@jar" level="project" />
107-
<orderEntry type="library" exported="" name="com.scwang.smartrefresh:SmartRefreshLayout-1.0.4-4" level="project" />
108-
<orderEntry type="library" exported="" name="com.android.support:support-core-utils-25.3.1" level="project" />
109-
<orderEntry type="library" exported="" name="com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
110-
<orderEntry type="library" exported="" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
111-
<orderEntry type="library" exported="" name="com.android.support:support-v4-25.3.1" level="project" />
112-
<orderEntry type="library" exported="" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/universal-image-loader-1.9.4.jar:unspecified@jar" level="project" />
113-
<orderEntry type="library" exported="" name="com.android.support:support-fragment-25.3.1" level="project" />
114-
<orderEntry type="library" exported="" name="com.android.support:recyclerview-v7-25.3.1" level="project" />
115-
<orderEntry type="library" exported="" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
116-
<orderEntry type="library" exported="" name="com.android.support:support-media-compat-25.3.1" level="project" />
117-
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-25" level="project" />
113+
<orderEntry type="library" name="com.android.support:animated-vector-drawable-27.0.1" level="project" />
114+
<orderEntry type="library" name="com.android.support:appcompat-v7-27.0.1" level="project" />
115+
<orderEntry type="library" name="com.squareup.okio:okio:1.14.0@jar" level="project" />
116+
<orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/fastjson-1.2.24.jar:unspecified@jar" level="project" />
117+
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
118+
<orderEntry type="library" name="com.android.support:design-27.0.1" level="project" />
119+
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
120+
<orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
121+
<orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
122+
<orderEntry type="library" name="com.android.support:support-compat-27.0.1" level="project" />
123+
<orderEntry type="library" name="com.android.support:transition-27.0.1" level="project" />
124+
<orderEntry type="library" name="com.android.support:support-core-utils-27.0.1" level="project" />
125+
<orderEntry type="library" name="com.android.support:support-core-ui-27.0.1" level="project" />
126+
<orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
127+
<orderEntry type="library" name="com.android.support:recyclerview-v7-27.0.1" level="project" />
128+
<orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/glide-full-4.1.1.jar:unspecified@jar" level="project" />
129+
<orderEntry type="library" name="com.scwang.smartrefresh:SmartRefreshLayout-1.0.4-4" level="project" />
130+
<orderEntry type="library" name="com.android.support:support-media-compat-27.0.1" level="project" />
131+
<orderEntry type="library" name="com.android.support:support-annotations:27.0.1@jar" level="project" />
132+
<orderEntry type="library" name="com.android.support:support-fragment-27.0.1" level="project" />
133+
<orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
134+
<orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/universal-image-loader-1.9.4.jar:unspecified@jar" level="project" />
135+
<orderEntry type="library" name="com.android.support:support-v4-27.0.1" level="project" />
136+
<orderEntry type="library" name="com.android.support:support-vector-drawable-27.0.1" level="project" />
137+
<orderEntry type="library" name="org.apache.http.legacy-android-27" level="project" />
118138
</component>
119139
</module>

‎ZBLibrary/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 25
5-
buildToolsVersion '25.0.1'
4+
compileSdkVersion 27
5+
buildToolsVersion '27.0.3'
66
defaultConfig {
77
minSdkVersion 15
88
targetSdkVersion 22
@@ -28,8 +28,8 @@ dependencies { //TODO 如果这些依赖和你项目中的依赖有冲突，则
2828
compile files('libs/universal-image-loader-1.9.4.jar') //TODO 只为兼容老用户的项目，建议删除这行，对应的jar包和ImageLoaderUtil.java
2929

3030
compile 'com.squareup.okhttp3:okhttp:3.11.0'
31-
compile 'com.android.support:appcompat-v7:25.0.1'//版本随意（必须）
32-
compile 'com.android.support:design:25.3.1'//版本随意（非必须，引用可以解决无法预览问题）
31+
compile 'com.android.support:appcompat-v7:27.0.1'//版本随意（必须）
32+
compile 'com.android.support:design:27.0.1'//版本随意（非必须，引用可以解决无法预览问题）
3333
compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.4-4'
3434

3535
}

0 commit comments

Comments
 (0)