Skip to content

Commit

Permalink
update travis
Browse files Browse the repository at this point in the history
  • Loading branch information
liyujiang-gzu committed Mar 8, 2017
1 parent 7f79a4a commit 32ca3ea
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7,184 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ jdk:
- oraclejdk8
android:
components:
- build-tools-23.0.1
- android-23
- build-tools-25.0.0
- android-25
- extra-android-support
- extra-android-m2repository
script:
Expand Down
10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ android {
}

dependencies {
// compile fileTree(dir: 'libs', include: ['AndroidPicker-1.4.3.jar'])
// compile fileTree(dir: 'libs', include: ['WheelPicker-1.4.3.jar'])
// compile fileTree(dir: 'libs', include: ['AndroidPicker-1.4.4.jar'])
// compile fileTree(dir: 'libs', include: ['WheelPicker-1.4.4.jar'])
compile 'com.alibaba:fastjson:1.1.55.android'
compile 'com.github.florent37:viewanimator:1.0.3'
compile project(':library:WheelPicker')
Expand All @@ -32,7 +32,7 @@ dependencies {
// compile 'cn.qqtheme.framework:WheelPicker:latest.release'
// compile 'cn.qqtheme.framework:FilePicker:latest.release'
// compile 'cn.qqtheme.framework:ColorPicker:latest.release'
// compile 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.4.3'
// compile 'com.github.gzu-liyujiang.AndroidPicker:FilePicker:1.4.3'
// compile 'com.github.gzu-liyujiang.AndroidPicker:ColorPicker:1.4.3'
// compile 'com.github.gzu-liyujiang.AndroidPicker:WheelPicker:1.4.4'
// compile 'com.github.gzu-liyujiang.AndroidPicker:FilePicker:1.4.4'
// compile 'com.github.gzu-liyujiang.AndroidPicker:ColorPicker:1.4.4'
}
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ com.android.build.gradle.overridePathCheck=true
#android.useDeprecatedNdk=true

#下面定义一些常量供gradle脚本使用
VERSION_NAME=1.4.3
VERSION_CODE=143
COMPILE_SDK_VERSION=23
VERSION_NAME=1.4.4
VERSION_CODE=144
COMPILE_SDK_VERSION=25
MIN_SDK_VERSION=14
#安卓6.0开始(API23+),需要动态申请权限
TARGET_SDK_VERSION=23
Expand Down
4 changes: 0 additions & 4 deletions library/ColorPicker/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,3 @@ ext {
dependencies {
compile project(":library:Common")
}

android {
buildToolsVersion '25.0.0'
}
Loading

0 comments on commit 32ca3ea

Please sign in to comment.