Skip to content

Commit d35a26f

Browse files
TommyLemonTommyLemon
committed
优化配置
1 parent b591f32 commit d35a26f

11 files changed

Lines changed: 74 additions & 78 deletions

File tree

‎QRCodeLibrary/QRCodeLibrary.iml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
</facet>
2525
</component>
2626
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
27-
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
27+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -71,34 +71,34 @@
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7272
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7373
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
80-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8578
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8679
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8780
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
9089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
9899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
102102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
103103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
104104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
@@ -107,6 +107,6 @@
107107
</content>
108108
<orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
109109
<orderEntry type="sourceFolder" forTests="false" />
110-
<orderEntry type="library" name="Gradle: __local_aars__:/Users/Jason/SourceCode/PersonProjects/weij/android/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
110+
<orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
111111
</component>
112112
</module>

‎QRCodeLibrary/build.gradle‎

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

33
android {
44
compileSdkVersion 27
5-
buildToolsVersion '28.0.3'
5+
buildToolsVersion '27.0.3'
66
defaultConfig {
77
minSdkVersion 15
8-
targetSdkVersion 27
8+
targetSdkVersion 22
99
versionCode 1
1010
versionName "1.0"
1111
}

‎ZBLibrary/ZBLibrary.iml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,19 @@
2424
</facet>
2525
</component>
2626
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
27-
<output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
28-
<output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
27+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
3131
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/generateDebugRFile/out" isTestSource="false" generated="true" />
32+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3333
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3434
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3535
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3636
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39-
<sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
4040
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4141
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4242
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -71,34 +71,34 @@
7171
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
7272
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
7373
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
78-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
79-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
80-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8174
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
8275
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8376
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
8477
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
8578
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
8679
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8780
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/aapt_friendly_merged_manifests" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
86+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
87+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
9089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
9191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
9292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
93-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
9494
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
95-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/library_assets" />
96-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
9798
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged_res" />
9899
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/public_res" />
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
102102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
103103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
104104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />

‎ZBLibrary/build.gradle‎

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

33
android {
44
compileSdkVersion 27
5-
buildToolsVersion '28.0.3'
5+
buildToolsVersion '27.0.3'
66
defaultConfig {
77
minSdkVersion 15
8-
targetSdkVersion 27
8+
targetSdkVersion 22
99
versionCode 1
1010
versionName "1.0"
1111
}
@@ -27,12 +27,11 @@ android {
2727
dependencies {
2828
//TODO 如果这些依赖和你项目中的依赖有冲突，则需要统一版本号，或者删除重复的依赖
2929
api fileTree(include: ['*.jar'], dir: 'libs')
30-
api 'com.squareup.okhttp3:okhttp:3.11.0'
3130
api 'com.android.support:appcompat-v7:27.1.1'
32-
//版本随意（必须）
33-
api 'com.android.support:design:27.1.1'
34-
//版本随意（非必须，引用可以解决无法预览问题）
35-
api 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.4-4'
31+
api 'com.squareup.okhttp3:okhttp:3.11.0'
3632
api 'com.alibaba:fastjson:1.2.54'
3733
api 'com.github.bumptech.glide:glide:4.8.0'
34+
35+
api 'com.android.support:design:27.1.1' //版本随意（必须）
36+
api 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.4-4' //版本随意（非必须，引用可以解决无法预览问题）
3837
}

‎ZBLibrary/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources>
33

44
<string name="app_name">ZBLibrary</string>
5-
<string name="app_version">18.3</string>
5+
<string name="app_version">19.2</string>
66
<string name="share_app">我发现了一款很好用的Android快速开发框架，叫 Android－ZBLibrary ，快去GitHub上看看吧~</string>
77
<string name="page_return">返回</string>
88
<string name="remind">提示</string>

0 commit comments

Comments
 (0)