From cd772360db98e393e1ae083f4ccff32340588137 Mon Sep 17 00:00:00 2001 From: Michael Eden Date: Fri, 6 Jan 2017 12:09:42 -0500 Subject: [PATCH] updated travis and trust manager --- .travis.yml | 7 ++++--- libs/MemorizingTrustManager/build.gradle | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45227d224..cb3a5bcfb 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 89678c77d..f09fdb6c5 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 {