更新版本v0.2.7 是否显示gif可配置，修复bug

donglua · Aug 27, 2015 · 86ffc07 · 86ffc07
1 parent a92049b
commit 86ffc07
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 25 deletions.
diff --git a/PhotoPicker/build.gradle b/PhotoPicker/build.gradle
@@ -8,8 +8,8 @@ android {
   defaultConfig {
     minSdkVersion 10
     targetSdkVersion 22
-    versionCode 9
-    versionName "0.2.6"
+    versionCode 10
+    versionName "0.2.7"
   }
 
   buildTypes {

diff --git a/PhotoPicker/src/androidTest/java/me/iwf/photopicker/ApplicationTest.java b/PhotoPicker/src/androidTest/java/me/iwf/photopicker/ApplicationTest.java
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@
 
 ```groovy
 dependencies {
-    compile 'me.iwf.photopicker:PhotoPicker:0.2.6@aar'
+    compile 'me.iwf.photopicker:PhotoPicker:0.2.7@aar'
     
     compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'com.android.support:recyclerview-v7:22.2.0'

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:1.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/photopickerdemo/build.gradle b/photopickerdemo/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "me.iwf.PhotoPickerDemo"
         minSdkVersion 10
         targetSdkVersion 22
-        versionCode 6
-        versionName "0.2.5"
+        versionCode 7
+        versionName "0.2.7"
     }
     buildTypes {
         release {
@@ -23,8 +23,8 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':PhotoPicker')
 
-//    compile 'me.iwf.photopicker:PhotoPicker:0.2.6@aar'
-
+//    compile 'me.iwf.photopicker:PhotoPicker:0.2.7@aar'
+//
 //    compile 'com.android.support:appcompat-v7:22.2.0'
 //    compile 'com.android.support:recyclerview-v7:22.2.0'
 //    compile 'com.nineoldandroids:library:2.4.0'

diff --git a/photopickerdemo/photopickerdemo.iml b/photopickerdemo/photopickerdemo.iml
@@ -36,13 +36,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -71,6 +71,11 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.iwf.photopicker/PhotoPicker/0.2.7/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -88,10 +93,13 @@
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="glide-3.6.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="PhotoPicker-0.2.7" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="library-2.4.0" level="project" />
-    <orderEntry type="module" module-name="PhotoPicker-PhotoPicker" exported="" />
   </component>
 </module>