Skip to content

Commit

Permalink
gradle改为2.10
Browse files Browse the repository at this point in the history
  • Loading branch information
liyujiang-gzu committed May 6, 2016
1 parent dd9dc2a commit 1c0544f
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ android {
dependencies {
compile 'com.alibaba:fastjson:1.1.46.android'
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'
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'
}
4 changes: 2 additions & 2 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
-keep class cn.qqtheme.framework.entity.** { ;}
-keep class cn.qqtheme.framework.picker.AddressPickerr$ { *;}
-keep class cn.qqtheme.framework.entity.** { *;}
-keep class cn.qqtheme.framework.picker.AddressPickerr$* { *;}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ com.android.build.gradle.overridePathCheck=true
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

#下面定义一些常量供gradle脚本使用
VERSION_NAME=1.1.1
VERSION_CODE=111
VERSION_NAME=1.1.2
VERSION_CODE=112
COMPILE_SDK_VERSION=23
MIN_SDK_VERSION=9
BUILD_TOOL_VERSION=23.0.1
ANDROID_SUPPORT_VERSION=23.1.1
GRADLE_BUILD_VERSION=1.5.0
GRADLE_BUILD_VERSION=2.1.0
GRADLE_BINTRAY_VERSION=1.5

#下面定义一些常量供gradle脚本使用
PROJ_GROUP=cn.qqtheme.framework
PROJ_VERSION=1.1.1
PROJ_VERSION=1.1.2
PROJ_WEBSITE_URL=https://github.com/gzu-liyujiang/AndroidPicker
PROJ_ISSUE_URL=https://github.com/gzu-liyujiang/AndroidPicker/issues
PROJ_GIT_URL=[email protected]/gzu-liyujiang/AndroidPicker.git
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
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/gradle-2.8-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
#distributionUrl=http://127.0.0.1/gradle-2.10-all.zip

0 comments on commit 1c0544f

Please sign in to comment.