diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2017-01-06 20:46:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 20:46:27 +0100 |
| commit | 1269123816e0d7b17626dc5f0b4e8728578edefb (patch) | |
| tree | d1d43187db0e44457632f031473b709b4782ce9e | |
| parent | 4a299920dc10d35cd1292b93b26f619d39bfa16e (diff) | |
| parent | cd772360db98e393e1ae083f4ccff32340588137 (diff) | |
Merge pull request #2224 from illegalprime/fix-travis-android-25
Updated travis and Trust Manager to fix build
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | libs/MemorizingTrustManager/build.gradle | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 45227d22..cb3a5bcf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,12 @@ language: android +jdk: + - oraclejdk8 android: components: - platform-tools - tools - - build-tools-23.0.3 - - build-tools-19.1.0 - - android-24 + - build-tools-25.0.2 + - android-25 - extra-android-m2repository - extra-google-m2repository - extra-google-google_play_services diff --git a/libs/MemorizingTrustManager/build.gradle b/libs/MemorizingTrustManager/build.gradle index 89678c77..f09fdb6c 100644 --- a/libs/MemorizingTrustManager/build.gradle +++ b/libs/MemorizingTrustManager/build.gradle @@ -10,11 +10,11 @@ buildscript { apply plugin: 'com.android.library' android { - compileSdkVersion 24 - buildToolsVersion "23.0.3" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { minSdkVersion 14 - targetSdkVersion 24 + targetSdkVersion 25 } sourceSets { |