Skip to content

Commit

Permalink
restore android build tools version and fix travis android release
Browse files Browse the repository at this point in the history
  • Loading branch information
Richard-Cao committed Jan 3, 2017
1 parent 8f89044 commit edd9900
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ script:
# been resolved.
- if [[ $TEST_TYPE == 'ios' ]]; then xcodebuild -project ios/$PROJECT_MOBILE.xcodeproj
-scheme $PROJECT_MOBILE -sdk iphonesimulator9.3 -configuration Debug CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO clean build ; fi
- if [ $TEST_TYPE == 'android' ] && [ $TRAVIS_PULL_REQUEST == 'false' ]; then cd android && ./gradlew clean && ./gradlew resguard --stacktrace ; fi
- if [ $TEST_TYPE == 'android' ] && [ $TRAVIS_PULL_REQUEST == 'false' ]; then cd android && ./gradlew clean && ./gradlew resguardRelease --stacktrace ; fi
- if [ $TEST_TYPE == 'android' ] && [ $TRAVIS_PULL_REQUEST != 'false' ]; then cd android && ./gradlew clean && ./gradlew assembleDebug --stacktrace ; fi
after_success:
- if [ $TEST_TYPE == 'android' ] && [ $TRAVIS_PULL_REQUEST == 'false' ]; then fir p
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def enableProguardInReleaseBuilds = true

android {
compileSdkVersion 23
buildToolsVersion "23.0.3"
buildToolsVersion "23.0.1"
useLibrary 'org.apache.http.legacy'

defaultConfig {
Expand Down Expand Up @@ -147,7 +147,7 @@ android {
}
}

andResGuard { // ./gradlew resguard
andResGuard { // ./gradlew resguard[BuildType | Flavor]
mappingFile = null
use7zip = true
useSign = true
Expand Down

0 comments on commit edd9900

Please sign in to comment.