aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Eden <themichaeleden@gmail.com>2017-01-06 12:09:42 -0500
committerMichael Eden <themichaeleden@gmail.com>2017-01-06 14:28:57 -0500
commitcd772360db98e393e1ae083f4ccff32340588137 (patch)
treed1d43187db0e44457632f031473b709b4782ce9e
parent4a299920dc10d35cd1292b93b26f619d39bfa16e (diff)
updated travis and trust manager
Diffstat (limited to '')
-rw-r--r--.travis.yml7
-rw-r--r--libs/MemorizingTrustManager/build.gradle6
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 {