发布1.1.1到jcenter

liyujiang-gzu · liyujiang-gzu · commit dd9dc2a692a9 · 2016-04-23T23:49:15.000+08:00
diff --git a/README.md b/README.md
@@ -1,10 +1,12 @@
 # Summary
 [![API](https://img.shields.io/badge/API-9%2B-green.svg)](https://github.com/gzu-liyujiang/AndroidPicker)
-[![Download](https://api.bintray.com/packages/gzu-liyujiang/maven/AndroidPicker/images/download.svg)](http://jcenter.bintray.com/cn/qqtheme/framework/AndroidPicker)   
+[![Download](https://api.bintray.com/packages/gzu-liyujiang/maven/WheelPicker/images/download.svg)](http://jcenter.bintray.com/cn/qqtheme/framework/)   
 安卓选择器类库，包括日期选择器、时间选择器、单项选择器、城市选择器、颜色选择器、文件选择器、目录选择器、数字选择器、星座选择器、生肖选择器等，可自定义顶部及底部界面，可自定义窗口动画。   
 欢迎大伙儿在[Issues](https://github.com/gzu-liyujiang/AndroidPicker/issues)提交你的意见或建议。欢迎Fork & Pull requests贡献您的代码。     
 
-# Change Log   
+# Change Log
+- v1.1.1 - 2016.4.23
++ 合并@Wastrel及@lutas2000贡献的代码，地址选择器支持只选择省和市、不能混淆某些类；
 - v1.1.0 - 2016.01.29
 + 添加注解约束，如“setOffset()”只能是1至4；
 + 所有枚举类改为常量来表示，据说这样可以节约内存；
@@ -23,13 +25,27 @@
 # Install
 “app”是测试用例；“library”包括WheelPicker、ColorPicker、FilePicker，   
 WheelPicker包括DatePicker、TimePicker、OptionPicker、AddressPicker、NumberPicker等，   
-建议手动下载本项目，导入“library”下的相关module，然后依赖，如：
+可下载本项目手动进行源代码集成，导入“library”下的相关module，然后依赖，如：
 ```groovy
 dependencies {
-    compile project(':library:WheelPicker')
+    compile project(':WheelPicker')
+    compile project(':FilePicker')
 }
 ```
-*注：本项目使用gradle来构建，Eclipse用户建议换为Android Studio或Intellij IDEA。*   
+也可以直接远程懒加载jcenter里的，如：
+```groovy
+dependencies {
+    compile project('cn.qqtheme.framework:WheelPicker:1.1.1')
+    compile project('cn.qqtheme.framework:FilePicker:1.1.0')
+}
+```
+*注：*
+本项目使用gradle来构建，迁移到Eclipse比较麻烦，建议换为Android Studio或Intellij IDEA。
+由于地址选择器使用了FastJson来解析，混淆时候需要加入以下类似的规则，不混淆Province、City等实体类。
+```
+-keep class cn.qqtheme.framework.entity.** { ;}
+-keep class cn.qqtheme.framework.picker.AddressPickerr$ { *;}
+```
 
 # Custom
 ### 自定义窗口进入退出动画(可选，默认动画为淡入淡出)
diff --git a/app/build.gradle b/app/build.gradle
@@ -19,11 +19,11 @@ android {
 
 dependencies {
     compile 'com.alibaba:fastjson:1.1.46.android'
-    compile 'com.github.florent37:viewanimator:1.0.2'
-    compile project(':library:WheelPicker')
-    compile project(':library:FilePicker')
-    compile project(':library:ColorPicker')
-//    compile 'cn.qqtheme.framework:WheelPicker:1.1.0'
-//    compile 'cn.qqtheme.framework:FilePicker:1.1.0'
-//    compile 'cn.qqtheme.framework:ColorPicker:1.1.0'
+    compile 'com.github.florent37:viewanimator:1.0.3'
+//    compile project(':library:WheelPicker')
+//    compile project(':library:FilePicker')
+//    compile project(':library:ColorPicker')
+    compile 'cn.qqtheme.framework:WheelPicker:1.1.1'
+    compile 'cn.qqtheme.framework:FilePicker:1.1.1'
+    compile 'cn.qqtheme.framework:ColorPicker:1.1.1'
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,8 +4,8 @@ com.android.build.gradle.overridePathCheck=true
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 
 #���涨��һЩ������gradle�ű�ʹ��
-VERSION_NAME=1.1.0
-VERSION_CODE=110
+VERSION_NAME=1.1.1
+VERSION_CODE=111
 COMPILE_SDK_VERSION=23
 MIN_SDK_VERSION=9
 BUILD_TOOL_VERSION=23.0.1
@@ -15,7 +15,7 @@ GRADLE_BINTRAY_VERSION=1.5
 
 #���涨��һЩ������gradle�ű�ʹ��
 PROJ_GROUP=cn.qqtheme.framework
-PROJ_VERSION=1.1.0
+PROJ_VERSION=1.1.1
 PROJ_WEBSITE_URL=https://github.com/gzu-liyujiang/AndroidPicker
 PROJ_ISSUE_URL=https://github.com/gzu-liyujiang/AndroidPicker/issues
 PROJ_GIT_URL=git@github.com/gzu-liyujiang/AndroidPicker.git
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
-#distributionUrl=http://127.0.0.1/php-develop/gradle-2.8-all.zip
+#distributionUrl=http://127.0.0.1/gradle-2.8-all.zip
diff --git a/publish.cmd b/publish.cmd
@@ -2,4 +2,4 @@
 gradlew publishToMavenLocal --info
 
 @rem http://jcenter.bintray.com
-@rem gradlew bintrayUpload --info
+@rem gradlew bintrayUpload --info
diff --git a/settings.gradle b/settings.gradle
@@ -1,4 +1,4 @@
-include ':app'
+include ':app', ':library'
 include ':library:Common'
 include ':library:WheelPicker'
 include ':library:FilePicker'

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include ':app'`
	`1`	`+include ':app', ':library'`
`2`	`2`	`include ':library:Common'`
`3`	`3`	`include ':library:WheelPicker'`
`4`	`4`	`include ':library:FilePicker'`