使用Android Studio3.1.4编译和测试通过；删除多余的文件

TommyLemon · Aug 19, 2018 · 04a3ba8 · 04a3ba8
1 parent 2498f26
commit 04a3ba8
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 133 deletions.
diff --git a/QRCodeLibrary/QRCodeLibrary.iml b/QRCodeLibrary/QRCodeLibrary.iml
@@ -86,13 +86,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
@@ -101,17 +101,13 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/QRCodeLibrary/libs/zxing.jar:unspecified@jar" level="project" />
   </component>
 </module>
diff --git a/QRCodeLibrary/build.gradle b/QRCodeLibrary/build.gradle
@@ -20,6 +20,5 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
+    api fileTree(include: ['*.jar'], dir: 'libs')
 }
diff --git a/QRCodeLibrary/src/androidTest/java/com/ericssonlabs/ApplicationTest.java b/QRCodeLibrary/src/androidTest/java/com/ericssonlabs/ApplicationTest.java
diff --git a/QRCodeLibrary/src/test/java/com/ericssonlabs/ExampleUnitTest.java b/QRCodeLibrary/src/test/java/com/ericssonlabs/ExampleUnitTest.java
diff --git a/ZBLibrary/ZBLibrary.iml b/ZBLibrary/ZBLibrary.iml
@@ -86,13 +86,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/attr" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/intermediate-jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packaged-aidl" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/packagedAssets" />
@@ -101,39 +101,35 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 27 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="com.android.support:animated-vector-drawable-27.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:appcompat-v7-27.0.1" level="project" />
-    <orderEntry type="library" name="com.squareup.okio:okio:1.14.0@jar" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/fastjson-1.2.24.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:design-27.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
-    <orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-compat-27.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:transition-27.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-core-utils-27.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-core-ui-27.0.1" level="project" />
-    <orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
-    <orderEntry type="library" name="com.android.support:recyclerview-v7-27.0.1" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/glide-full-4.1.1.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="com.scwang.smartrefresh:SmartRefreshLayout-1.0.4-4" level="project" />
-    <orderEntry type="library" name="com.android.support:support-media-compat-27.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-annotations:27.0.1@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-fragment-27.0.1" level="project" />
-    <orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
-    <orderEntry type="library" name="__local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/universal-image-loader-1.9.4.jar:unspecified@jar" level="project" />
-    <orderEntry type="library" name="com.android.support:support-v4-27.0.1" level="project" />
-    <orderEntry type="library" name="com.android.support:support-vector-drawable-27.0.1" level="project" />
-    <orderEntry type="library" name="org.apache.http.legacy-android-27" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:transition-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.14.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-fragment-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/universal-image-loader-1.9.4.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:design-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/fastjson-1.2.24.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:common:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.11.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:animated-vector-drawable-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-compat-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-v4-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-annotations:27.0.1@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.core:common:1.0.0@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: __local_aars__:/Users/Tommy/Documents/Android-ZBLibrary/ZBLibrary/libs/glide-full-4.1.1.jar:unspecified@jar" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.0.1" level="project" />
+    <orderEntry type="library" name="Gradle: com.scwang.smartrefresh:SmartRefreshLayout-1.0.4-4" level="project" />
+    <orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
+    <orderEntry type="library" name="Gradle: org.apache.http.legacy-android-27" level="project" />
   </component>
 </module>
diff --git a/ZBLibrary/build.gradle b/ZBLibrary/build.gradle
@@ -21,15 +21,14 @@ android {
 }
 
 dependencies { //TODO 如果这些依赖和你项目中的依赖有冲突，则需要统一版本号，或者删除重复的依赖
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile files('libs/fastjson-1.2.24.jar')
-    compile files('libs/glide-full-4.1.1.jar')
-    compile files('libs/universal-image-loader-1.9.4.jar') //TODO 只为兼容老用户的项目，建议删除这行，对应的jar包和ImageLoaderUtil.java
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api files('libs/fastjson-1.2.24.jar')
+    api files('libs/glide-full-4.1.1.jar')
+    api files('libs/universal-image-loader-1.9.4.jar') //TODO 只为兼容老用户的项目，建议删除这行，对应的jar包和ImageLoaderUtil.java
 
-    compile 'com.squareup.okhttp3:okhttp:3.11.0'
-    compile 'com.android.support:appcompat-v7:27.0.1'//版本随意（必须）
-    compile 'com.android.support:design:27.0.1'//版本随意（非必须，引用可以解决无法预览问题）
-    compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.4-4'
+    api 'com.squareup.okhttp3:okhttp:3.11.0'
+    api 'com.android.support:appcompat-v7:27.0.1'//版本随意（必须）
+    api 'com.android.support:design:27.0.1'//版本随意（非必须，引用可以解决无法预览问题）
+    api 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.4-4'
 
 }
diff --git a/ZBLibrary/src/androidTest/java/zuo/biao/library/ApplicationTest.java b/ZBLibrary/src/androidTest/java/zuo/biao/library/ApplicationTest.java
diff --git a/ZBLibrary/src/main/res/values/strings.xml b/ZBLibrary/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">坐标标准库</string>
+    <string name="app_name">ZBLibrary</string>
     <string name="app_version">18.3</string>
     <string name="share_app">我发现了一款很好用的Android快速开发框架，叫 Android－ZBLibrary ，快去GitHub上看看吧~</string>
     <string name="page_return">返回</string>

diff --git a/ZBLibrary/src/test/java/zuo/biao/library/ExampleUnitTest.java b/ZBLibrary/src/test/java/zuo/biao/library/ExampleUnitTest.java